commit d051d1153ca3f8b41a194cd76c77c386d4970d77
Author: Derek Hulley <derek.hulley@alfresco.com>
Date:   Thu Dec 8 07:13:07 2005 +0000

    Moving to root below branch label
    
    git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000000..d86c837f55
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="source/java"/>
+	<classpathentry kind="src" path="config"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/Repository"/>
+	<classpathentry kind="src" path="/Core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Remote API"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000000..645114745a
--- /dev/null
+++ b/.project
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Web-Client</name>
+	<comment></comment>
+	<projects>
+		<project>3rd Party</project>
+		<project>Repository</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
+ 
\ No newline at end of file
diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
new file mode 100644
index 0000000000..17f07b18a4
--- /dev/null
+++ b/config/alfresco/messages/webclient.properties
@@ -0,0 +1,906 @@
+# I18N message properties
+
+# Date Pattern
+date_pattern=MMMM, d yyyy
+date_time_pattern=MMMM, d yyyy HH:mm
+time_pattern=HH:mm
+
+# General UI
+product_name=Alfresco
+view_description=This view allows you to browse the items in your space.
+search_description=This view allows you to see the results from your search.
+checkinfile_description=Check in your working copy for other team members to work with.
+checkoutfilelink_description=Edit the checked out file, undo the check out or carry on working.
+checkoutfile_description=Enter information about the check out.
+documentdetails_description=View the details about the content.
+previewdocument_description=Preview the content or space within a Template.
+spacedetails_description=View the details about the space.
+undocheckoutfile_description=Cancel the check out of a document and discard any changes.
+updatefile_description=Update a document on the repository with content from your computer.
+editfile_description=Edit the content of the file.
+editfileinline_description=Edit the content of the document, then click Save.
+createfile_description=Enter new content.
+manageusers_description=Manage the users of the repository.
+manage_invited_users_description=Manage the permissions you have granted to users who access your space.
+modify_user_roles_description=Modify the permissions granted to a user for accessing your space.
+advancedsearch_description=Perform a more detailed search of the repository.
+editdocument_description=Modify the document properties then click OK.
+editcategory_description=Set the category for the document then click OK.
+editworkflow_description=Modify the simple workflow properties then click OK.
+editspace_description=Modify the space properties then click OK.
+newspace_description=Enter information about the new space then click Create Space.
+space_rules_description=This view shows you all the rules to be applied to content in this space.
+warning_inline=This is only recommended for HTML or plain text documents.
+categories_description=This view allows you to browse and modify the categories hiearchy.
+new_category_description=Enter information about the new Category then click Create Category.
+status_message_default=No messages.
+
+# UI Component messages
+yes=Yes
+no=No
+kilobyte=KB
+megabyte=MB
+gigabyte=GB
+locked_you=Item locked by you
+locked_user=Item locked by user
+wizard_errors=Please correct the errors below.
+last_page=Last Page
+next_page=Next Page
+prev_page=Previous Page
+first_page=First Page
+page_info=Page {0} of {1}
+go_up=Go Up
+ok=OK
+go=Go
+to=To
+from=From
+options=Options
+other_options=Other Options
+local=Local
+inherited=Inherited
+search=Search
+advanced_search=Advanced Search
+value_not_set=not set
+clear=Clear Results
+results_contains=Results for ''{0}''.
+results_contains_filter=Results for ''{0}'' in ''{1}''.
+details_view=Details View
+view_icon=Icon View
+view_browse=Browse View
+more_options=More...
+more_actions=More Actions
+more_options_space=More Actions for this Space
+more_options_file=More Actions for this Document
+select_space_prompt=Click here to select a Space
+select_existing_space_prompt=Click here to select an existing Space
+select_home_space_prompt=Click here to select the Home Space location
+select_category_prompt=Click here to select a Category
+select_destination_prompt=Click here to select the destination
+add_new=Add New
+change=Change
+set=Set
+no_categories_applied=This document does not yet have any categories applied.
+has_following_categories=This document has the following categories applied...
+moved=moved
+copied=copied
+document_action=The document will be {0} to ''{1}'' if the ''{2}'' action is taken.
+clipboard=Clipboard
+recent_spaces=Recent Spaces
+shortcuts=Shortcuts
+company_home=Company Home
+my_home=My Home
+advanced_search=Advanced Search
+new_search=New Search
+search_results=Search Results
+search_detail=Search for \"{0}\" results shown below
+close_search=Close Search
+browse_spaces=Browse Spaces
+browse_content=Content items
+items=item(s)
+location=Item Location
+toggle_shelf=Hide or Show the Shelf
+shelf=Shelf
+actions=Actions
+view=View
+view_details=View Details
+view_details_file=View Details for file
+change_details=Change Details
+view_details=View Details
+update=Update
+cut=Cut
+copy=Copy
+paste=Paste
+remove=Remove
+change_roles=Change Roles
+change_user_roles=Change User Roles
+paste_item=Paste Item
+paste_all=Paste All
+remove_item=Remove Item
+remove_all=Remove All
+close=Close
+invite=Invite
+invite_user=Invite User
+filter_contents=Filter Contents
+users=Users
+groups=Groups
+resetall=Reset All
+content_rules=Content Rules
+view_in_browser=View In Browser
+view_in_webdav=View in WebDAV
+view_in_cifs=View in CIFS 
+download_content=Download Content
+details_page_bookmark=External Access URL
+links=Links
+create_shortcut=Create Shortcut
+navigation=Navigation
+next_item=Next Item
+previous_item=Previous Item
+cancel=Cancel
+upload=Upload
+homespace=Home Space
+network_folder=Open Network Folder
+other_action=Run Action
+information=Information
+move=Move
+copy=Copy
+type=Type
+aspect=Aspect
+workflow=Workflow
+rules=Rules
+system_error=System Error
+login=Login
+templates=Templates
+template=Template
+local=Local
+select_button=Select...
+select_items=Select items
+select_an_item=Select an item
+selected_items=Selected Items
+add_to_list_button=Add to List
+none=None
+no_selected_items=No selected items.
+search_select_item=Search for and select an item.
+search_select_items=Search for and select items.
+search_minimum=Please enter a minimum of {0} characters to perform a search.
+filter=Filter
+choose_icon=Choose icon
+security=Security
+all_formats=All Formats
+
+# Properties
+username=User Name
+joindate=Join Date
+roles=Roles
+help=Help
+name=Name
+password=Password
+confirm=Confirm
+path=Path
+description=Description
+created=Created
+modified=Modified
+created_date=Created Date
+modified_date=Modified Date
+size=Size
+title=Title
+author=Author
+date=Date
+mimetype=Format
+
+# Repo permission display labels
+# Note - these come from the server, the english translation is generally the same
+Administrator=Administrator
+Guest=Guest
+Coordinator=Coordinator
+Contributor=Contributor
+Editor=Editor
+All=All
+
+# Actions
+delete=Delete
+edit=Edit
+checkin=Check In
+checkout=Check Out
+checkout_document=Check out this document
+undocheckout=Undo Check Out
+delete_space=Delete Space
+delete_file=Delete File
+delete_rule=Delete Rule
+delete_user=Delete User
+remove_user=Remove User
+new_space=Create Space
+add_content=Add Content
+create_content=Create Content
+add_multiple_files=Add Multiple Files
+import_directory=Import Directory
+advanced_space_wizard=Advanced Space Wizard
+create_rule=Create Rule
+manage_rules=Manage Content Rules
+manage_users=Manage System Users
+manage_groups=Manage User Groups
+manage_invited_users=Manage Space Users
+modify_user_roles=Modify User Roles for
+modify=Modify
+view=View
+logout=Logout
+add=Add
+system_info=System Information
+node_browser=Node Browser
+reset_config=Reset Config Service
+save=Save
+user_details=User Details
+language=Language
+export=Export
+import=Import
+take_ownership=Take Ownership
+create_forums=Create Forum Space
+create_forum=Create Forum
+create_topic=Create Topic
+create_post=Create Post
+create_reply=Post Reply
+delete_forums=Delete Forum Space
+delete_forum=Delete Forum
+delete_topic=Delete Topic
+delete_post=Delete Post
+post_to_topic=Post to Topic
+reply=Reply
+edit_post=Edit Post
+reply_to=Reply to
+post_reply=Post Reply
+
+# Login page message
+login_details=Enter Login details
+login_err_password_length=Password must be between {0} and {1} characters in length.
+login_err_password_chars=Password can only contain characters or digits.
+login_err_username_length=Username must be between {0} and {1} characters in length.
+login_err_username_chars=Username can only contain characters or digits.
+loggedout_details=You have been logged out of Alfresco.
+relogin=Re-login to Alfresco
+
+# Browse list messages
+no_space_items=No items to display. Click the ''{0}'' action to create a space.
+no_content_items=No items to display. To add an existing document click ''{0}'' action. To create an HTML or Plain Text file click ''{1}'' action.
+
+# Advanced Search messages
+look_in=Look in location
+look_for=Look for
+all_spaces=All Spaces
+specify_space=Specify Space
+include_child_spaces=Include child spaces
+show_results_for=Show me results for
+all_items=All Items
+file_names_contents=File names and contents
+file_names=File names only
+space_names=Space names only
+show_results_categories=Show me results in the categories
+include_sub_categories=Include sub-categories
+also_search_results=More search options
+additional_options=Additional options
+
+# Forum messages
+forums=Forum Space
+forum=Forum
+browse_forums=Browse Forum Spaces and Forums
+browse_topics=Browse Topics
+browse_posts=Browse Posts
+forums_info=This view allows you to browse forum spaces and forums.
+forum_info=This view allows you to browse topics in this forum.
+topic_info=This view allows you to browse posts in this topic.
+no_forums=No forum spaces or forums to display. Click the ''Create Forum Space'' action to create a forum space or ''Create Forum'' action to create a forum. 
+no_topics=No topics to display. Click the ''Create Topic'' action to create a topic.
+no_posts=No posts to display. Click the ''Post to Topic'' action to create a post.
+topic=Topic
+topics=Topics
+post=Post
+posted=Posted
+create_forums_description=Enter information about the new forum space then click Create Forum Space.
+create_forum_description=Enter information about the new forum then click Create Forum.
+create_topic_description=Enter information about the new topic then click Create Topic.
+create_post_description=Enter the content of the message then click Post.
+create_reply_description=Enter message text to reply then click Reply.
+forums_props=Forum Space Properties
+forum_props=Forum Properties
+topic_props=Topic Properties
+create_forums_finish=To create the forum space click Create Forum Space.
+create_forum_finish=To create the forum click Create Forum.
+create_topic_finish=To create the topic click Create Topic.
+create_post_finish=To create the post click Post.
+create_reply_finish=To create the reply click Reply.
+forums_details_description=View details about the forum space.
+forum_details_description=View details about the forum.
+topic_details_description=View details about the topic.
+bubble_view=Bubble View
+replies=Replies
+on=On
+reply_message=Reply Message
+
+# Common Wizard messages
+steps=Steps
+summary=Summary
+summary_desc=The information you entered is shown below.
+default_instruction=To continue click Next.
+next_button=Next
+back_button=Back
+finish_button=Finish
+cancel_button=Cancel
+clear_button=Clear
+title=Title
+description=Description
+you_may_want=You may want to
+
+# Category Management messages
+title_categories_list=Categories
+add_category=Add Category
+edit_category=Edit Category
+delete_category=Delete Category
+category_icons=Categories
+category_details=Details
+category_management=Category Management
+title_create_category=Create New Category
+new_category=New Category
+category_props=Category Properties
+items=Items
+title_delete_category=Delete Category
+delete_category=Delete Category
+delete_category_warning=This category has {0} existing document(s) linked to it.
+delete_category_info=To remove this category and all it's sub-categories, click Delete.
+delete_category_confirm=Are you sure you want to delete category \"{0}\" and all sub-categories?
+title_edit_category=Edit Category
+edit_category_description=Edit the information for this category.
+
+# Groups Management messages
+title_groups_list=Groups Management
+groups_management=Groups Management
+groups_description=Manage the members of a group, create new groups or remove existing groups.
+new_group=Create Group
+new_sub_group=Create Sub-Group
+edit_group=Edit Group
+delete_group=Delete Group
+add_user=Add User
+group_icons=Groups
+group_details=Details
+root_groups=Root Groups
+group_filter_children=Children
+group_filter_all=All
+title_create_group=Create Group
+new_group_description=Enter information about the new Group then click Create Group.
+group_props=Group Properties
+identifier=Identifier
+create_group_warning=The Identifier for a Group cannot be changed once it has been set.
+title_delete_group=Delete Group
+delete_group_warning=This group has {0} sub-group(s) or user(s) attached to it.
+delete_group_info=To delete this Group from the system and remove all members from it, click Delete.
+delete_group_confirm=Once the group is removed from the system it will no longer be accessable. Are you sure you want to delete Group \"{0}\" and remove all users from it?
+title_add_user_group=Add User to Group
+add_user_group_description=Add an existing User to a Group
+select_users=Select Users to add to this Group
+selected_users=Selected Users
+
+# Invite Users Wizard messages
+invite_title=Invite Users Wizard
+invite_desc=This wizard helps you to give other users access to your space.
+invite_step1_title=Step One - Invite Users
+invite_step1_desc=Select the users and roles they will play in this space.
+invite_step2_title=Step Two - Notify Users
+invite_step2_desc=Notify the selected users.
+i_want_to=I want to...
+invite_step_1=Invite Users
+invite_step_2=Notify Users
+invite_all=Invite All users as guests
+invite_users=Specify Users/Groups and their roles
+specify_usersgroups=Specify Users/Groups
+select_usersgroups=Select user/group and their role(s)
+select_role=Select role
+selected_usersgroups=Selected users/groups and their role(s)
+selected_roles=Selected roles
+click_add=Click Add
+role=Role
+send_email=Do you want to send an email to notify the invited users?
+subject=Subject
+body=Body
+automatic_text=Automatic text
+invite_space=You have been invited to ''{0}'' by {1}.
+invite_role=You will have the role of: {0}
+invite_finish_instruction=To close this wizard and apply your changes click Finish. To review or change your selections click Back.
+remove_invited_user_info=Remove an invited user from this space.
+add_role=Add Role
+space_owner=User ''{0}'' is the current owner of this space.
+users_and_groups=Users and Groups
+authority=Username
+
+# System Users messages
+create_user=Create User
+change_password=Change Password
+title_change_password=Change User Password
+change_password_description=Use this view to change an existing user password.
+change_password_instructions=Enter the new password for this user.
+
+# Check-in messages
+check_in=Check In
+checkin_options=Check In options
+checkin_changes_info=Check in changes and keep file checked out
+workingcopy_location=Working copy location
+which_copy_checkin=Which copy do you want to check in?
+which_copy_current=Use copy in current space
+which_copy_other=Use copy uploaded from my computer
+locate_doc_upload=Locate document to upload
+file_location=Location
+click_upload=Click upload
+minor_change=Minor Change
+major_change=Major Change
+notes=Notes
+
+# Check-out messages
+check_out=Check Out
+copy_work_with=A copy of the file ''{0}'' will be made for you to work with.
+copy_checkin_changes=When you have completed your changes you need to check in the file to allow others to view the changes.
+copy_store_prompt=Where do you want to keep the copy of this file?
+store_space_current=In the current space
+store_space_selected=In the space selected
+check_out_of=Check Out of
+copy_file_checkedout=A copy of the file ''{0}'' is now checked out to you for editing.
+edit_workingcopy_title=Edit the working copy now
+edit_workingcopy_info=To edit the working copy of the file, click the link below and if asked select Save.
+continue_working_title=Continue working
+continue_working_info1=If you do not want to edit the file now click OK to close the page.
+continue_working_info2=To edit the file in the future click the Edit action
+download_complete=When the download is complete, click OK.
+undo_checkout_for=Undo Check Out for
+undo_checkout=Undo Check Out
+undo_checkout_info=If you undo the check out of a document, the associated working copy will be deleted and all changes to it since the Check Out will be lost.
+
+# Document and Space details messages
+details_of=Details of
+preview_of=Preview of
+modify_props_of=Modify Properties of
+preview=Preview in Template
+dashboard_view=Dashboard View
+dashboard=Dashboard
+view_links=Links
+not_inline_editable=This document is not inline editable.
+allow_inline_editing=Allow Inline Editing
+not_in_workflow=This document is not part of any workflow.
+not_in_category=This document is not categorized.
+not_versioned=This document has no version history.
+allow_categorization=Allow Categorization
+allow_versioning=Allow Versioning
+version_history=Version History
+version=Version
+document_properties=Document Properties
+other_properties=Other Properties
+no_other_properties=This document does not have any other properties to show.
+modify_categories_of=Modify categories of
+space_props=Space Properties
+choose_space_icon=Choose space icon
+create_space_finish=To create your space click Create Space.
+select_category=Select a category
+selected_categories=Selected categories
+no_selected_categories=No categories selected.
+success_ownership=Successfully took ownership of the document.
+inherit_permissions=Inherit Parent Space Permissions
+success_inherit_permissions=Successfully changed Inherit Parent Permissions to 'Yes'
+success_not_inherit_permissions=Successfully changed Inherit Parent Permissions to 'No'
+apply_dashboard=Apply Dashboard
+apply_dashboard_info=Select a template to be applied to the Space as a Dashboard view.
+
+# Export messages
+export_info=Exports metadata and content from this or all Spaces.
+export_from=Export From
+package_name=Package Name
+all_spaces=Repository Root
+current_space=Current Space
+include_children=Include Children
+include_self=Include this Space
+run_export_in_background=Run export in background
+export_error_info=If this option is selected the export will be performed in the background so the results may not appear immediately. You may also want to monitor the server console and log files for errors.
+
+# Import messages
+import_info=Imports an Alfresco content package file into the repository.
+import_package_description=Alfresco content package
+run_import_in_background=Run import in background
+import_error_info=If this option is selected the import will be performed in the background so the results may not appear immediately. You may also want to monitor the server console and log files for errors.
+
+# Edit Content messages
+edit_file_title=Edit file
+edit_file_prompt=To edit the file ''{0}'', click the link below and if asked select Save.
+edit_download_complete=When the download is complete, click Close.
+checkout_file_title=Check out file
+checkout_you_may_want=You may want to check out this file to lock it and prevent other users from editing it.
+checkout_hint1=Hint: When you check out a file a copy is made for you to work with.
+checkout_hint2=When you have finished editing the copy you need to check it in to release the lock and allow others to work with the modified document.
+checkout_want_to=to prevent the possibility of other users overwriting your changes.
+checkout_warn=Note: You will lose any changes already made to this document.
+local_copy_location=Local copy location
+locate_content_upload=Locate and upload your document to the repository.
+
+# Edit Workflow messages
+modify_workflow_props=Modify Properties of Simple Workflow
+approve_flow=Approve Flow
+reject_flow=Reject Flow
+name_approve_step=Name for approve step
+name_reject_step=Name for reject step
+select_reject_step=Do you want to provide a reject step?
+choose_copy_move_location=Choose whether you want to move or copy the content and also the location.
+
+# System Information and admin page messages
+system_info=System Information
+current_user=Current User
+http_app_state=HTTP Application State
+http_session_state=HTTP Session State
+http_request_state=HTTP Request State
+http_request_params=HTTP Request Parameters
+http_request_headers=HTTP Request Headers
+system_props=System Properties
+hide_details=Hide Details
+show_details=Show Details
+
+# Content Wizard messages
+add_content_title=Add Content Wizard
+add_content_desc=This wizard helps you to add a document to a space.
+add_conent_step1_title=Step One - Upload Document
+add_conent_step1_desc=Locate and upload your document to the repository.
+add_conent_step2_title=Step Two - Properties
+add_conent_step2_desc=Enter information about this content.
+upload_document=Upload Document
+properties=Properties
+general=General
+file_name=File Name
+content_type=Content Type
+content_format=Content Format
+author=Author
+inline_editable=Inline Editable
+locate_document=Locate document to upload
+location=Location
+click_upload=Click upload
+file_upload_success=The file ''{0}'' was uploaded successfully. If the file you uploaded does not exist, then an empty file will be created with the name you specified.
+content_finish_instruction=To add the content to this space click Finish. To review or change your selections click Back.
+create_content_title=Create Content Wizard
+create_content_desc=This wizard helps you to create a new document in a space.
+create_content_step1_title=Step One - Select Type
+create_content_step1_desc=Select the type of content you wish to create.
+create_content_step2_title=Step Two - Enter Content
+create_content_step2_desc=Enter your document content into the repository.
+create_content_step3_title=Step Three - Properties
+create_content_step3_desc=Enter information about this content.
+enter_content=Enter Content
+select_type=Select Type
+content=Content
+text_content=Plain Text Content
+html_content=HTML Content
+
+# Rule and Action Wizard messages
+create_action_title=Custom Action Wizard
+create_action_desc=This wizard helps you create a custom action for
+create_action_step1_title=Step One - Select Action
+create_action_step2_title=Step Two - Action Settings
+create_action_finish_instruction=To execute the action click Finish. To review or change your selections click Back.
+new_rule_title=New Rule Wizard
+new_rule_title_edit=Edit Rule Wizard
+new_rule_desc=This wizard helps you create a new rule.
+new_rule_desc_edit=This wizard helps you modify a rule.
+new_rule_step1_title=Step One - Enter Details
+new_rule_step2_title=Step Two - Select Conditions
+new_rule_step3_title=Step Three - Select Actions
+new_rule_finish_instruction=To create the rule click Finish. To review or change your selections click Back.
+new_rule_finish_instruction_edit=To update the rule click Finish. To review or change your selections click Back.
+select_action=Select Action
+select_an_action=Select an action...
+action=Action
+actions=Actions
+action_settings=Action Settings
+set_action_values=Set action values
+select_feature=Select required feature
+version_notes=Version Notes
+checkout_location=Check out location
+destination=Destination
+subject=Subject
+message=Message
+category=Category
+categories=Categories
+change_category=Change Category
+approve_flow=Approve Flow
+approve_step_name=Name for approve step
+move_or_copy=Choose whether you want to move or copy the content and also the location.
+reject_flow=Reject Flow
+want_reject_step=Do you want to provide a reject step?
+reject_step_name=Name for reject step
+required_format=Required format
+details=Details
+select_condition=Select Condition
+select_a_condition=Select a condition...
+condition=Condition
+conditions=Conditions
+condition_settings=Condition Settings
+set_condition_values=Set condition values
+select_checkout_prompt=Click here to select the check out location
+condition_contains_desc=Enter the text pattern required, including any wildcards. The file name includes the file type extension when matching.
+file_name_pattern=File name pattern
+condition_contains_hints=Hints
+condition_contains_hints_desc=Use zz* to match any name that begins with zz; use *.txt to match any text file; use *zz* to match any file name that contains zz anywhere including the beginning or end.
+apply_to_sub_spaces=Apply rule to sub spaces
+run_in_background=Run rule in background
+not=Not
+click_set_and_add=Click to set values and add to list
+click_add=Click to add to list
+set_and_add_button=Set Values and Add
+selected_conditions=Selected Rule Conditions
+selected_actions=Selected Rule Actions
+condition_no_condition=Match any item
+condition_has_aspect=Item has aspect
+condition_has_aspect_not=Item does not have aspect
+condition_is_subtype=Item is a subtype of
+condition_is_subtype_not=Item is not a subtype of
+condition_compare_mime_type=Item has a mimetype of
+condition_compare_mime_type_not=Item does not have a mimetype of
+condition_in_category=Item is in category
+condition_in_category_not=Item is not in category
+condition_compare_property_value=Name property matches
+condition_compare_property_value_not=Name property does not match
+action_add_features=Add aspect
+action_specialise_type=Item is specialised to type
+action_simple_workflow={0} item to ''{1}'' if ''{2}'' action is taken.
+action_link_category=Link to category
+action_transform=Copies content to ''{0}'' and transforms to ''{1}'' 
+action_transform_image=Copies image to ''{0}'' and transforms to ''{1}'' using option ''{2}''
+action_copy=Copy to
+action_extract_metadata=Extract metadata from content
+action_move=Move to
+action_mail=Send email to
+action_check_in=Check in content as ''{0}'' with comment ''{1}''
+action_check_out=Check out content to
+action_set_property_value=Sets property
+action_import=Imports to
+not_condition_result=Check the item does not match the criteria above
+space=Space
+import_to=Import To
+encoding=Encoding
+encoding_utf8=UTF-8
+rule_type=Rule Type
+rule_background_info=If this option is selected the rule will execute in the background so the results may not appear immediately.
+
+# New Space Wizard messages
+new_space_title=New Space Wizard
+new_space_desc=This wizard helps you to create a new space.
+new_space_step1_title=Step One - Starting Space
+new_space_step1_desc=Choose how you want to create your space.
+new_space_step2_title=Step Two - Space Options
+new_space_step2_desc=Select space options.
+new_space_step3_title=Step Three - Space Details
+new_space_step3_desc=Enter information about the space.
+new_space_finish_instruction=To close this wizard and create your space click Finish. To review or change your selections click Back.
+scratch=Scratch
+an_existing_space=An existing space
+a_template=A template
+creating_from=Creating From
+save_as_template=Save As Template
+template_name=Template Name
+select_a_template=Select a template...
+starting_space=Starting Space
+space_options=Space Options
+space_details=Space Details
+how_to_create_space=How do you want to create your space?
+from_scratch=From scratch
+based_on_existing_space=Based on an existing space
+using_a_template=Using a template
+choose_space_icon=Choose space icon
+existing_space=Existing Space
+copy_existing_space=Copy existing space
+structure=Structure
+structure_contents=Structure and contents
+space_copy_note=Note: Any content rules for spaces will also be copied.
+space_type=Space Type
+space_type_create=Select the type of space you want to create.
+container=Folder Space
+container_desc=A place for keeping and organizing documents and other spaces.
+forums_desc=A place to discuss content with other users.
+space_type_note=Note: If you can only see one type of space then other space types may not be enabled. See your System Administrator for further help.
+template_space=Template Space
+select_template=Select the template you want to use.
+
+# New User Wizard messages
+new_user_title=New User Wizard
+new_user_title_edit=Edit User Wizard
+new_user_desc=This wizard helps you to add a user to the repository.
+new_user_desc_edit=This wizard helps you modify a user in the repository.
+new_user_step1_title=Step One - Person Properties
+new_user_step1_desc=Enter information about this person.
+new_user_step2_title=Step Two - User Properties
+new_user_step2_desc=Enter information about this user.
+new_user_finish_instruction=To add the user to this space click Finish. To review or change your selections click Back.
+person_properties=Person Properties
+user_properties=User Properties
+first_name=First Name
+last_name=Last Name
+email=Email
+company_id=Company ID
+home_space_location=Home Space Location
+home_space_name=Home Space Name
+
+# Admin Console messages
+title_admin_console=Administration Console
+admin_console=Administration Console
+admin_description=Use this view to perform system administration functions.
+
+# UI Page Titles
+title_about=About Alfresco
+title_login=Alfresco Web Client - Login
+title_relogin=Alfresco Web Client - Logged Out
+title_error=Alfresco Web Client - System Error
+title_browse=Alfresco Web Client
+title_create_space=Create Space
+title_inviteusers_invite=Invite Users - Invite
+title_inviteusers_notify=Invite Users - Notify
+title_change_user_roles=Change User Roles
+title_remove_invited_user=Remove Invited User
+title_advanced_search=Advanced Search
+title_checkin_file=Check In File
+title_checkout_file=Check Out File
+title_checkout_file_link=Check Out File Download
+title_delete_file=Delete File
+title_delete_rule=Delete Rule
+title_delete_user=Delete User
+title_delete_space=Delete Space
+title_file_details=Document Details
+title_file_preview=Preview In Template
+title_edit_categories=Edit Categories
+title_edit_doc_props=Edit Document Properties
+title_edit_file=Edit File
+title_edit_html_inline=Edit HTML File Inline
+title_edit_text_inline=Edit Text File Inline
+title_edit_simple_workflow=Edit Simple Workflow
+title_edit_space=Edit Space Details
+title_rules=Space Rules
+title_space_details=Space Details
+title_system_info=System Information
+title_undo_checkout=Undo Check Out
+title_update_file=Update File Content
+title_users=User Management
+title_invited_users=Manage Invited Users
+title_add_content_props=Add Content - Properties
+title_add_content_summary=Add Content - Summary
+title_add_content_upload=Add Content - Upload
+title_create_content=Create New Content
+title_create_content_props=Create New Content - Properties
+title_create_content_summary=Create New Content - Summary
+title_create_action_action=Create Action - Select Action
+title_create_action_add_feature=Create Action - Add Feature
+title_create_action_checkin=Create Action - Check In
+title_create_action_checkout=Create Action - Check Out
+title_create_action_copy=Create Action - Copy
+title_create_action_import=Create Action - Import
+title_create_action_email=Create Action - Email
+title_create_action_link_category=Create Action - Link Category
+title_create_action_move=Create Action - Move
+title_create_action_simple_workflow=Create Action - Simple Workflow
+title_create_action_transform=Create Action - Transform
+title_create_action_transform_image=Create Action - Transform Image
+title_create_specialise_action=Create Action - Specialise Type
+title_create_action_summary=Create Action - Summary
+title_new_rule_action=New Rule - Select Action
+title_new_rule_add_feature=New Rule - Add Feature
+title_specialise_type_action=New Rule - Specialise Type
+title_new_rule_checkin=New Rule - Check In
+title_new_rule_checkout=New Rule - Check Out
+title_new_rule_copy=New Rule - Copy
+title_new_rule_email=New Rule - Email
+title_new_rule_link_category=New Rule - Link Category
+title_new_rule_move=New Rule - Move
+title_new_rule_simple_workflow=New Rule - Simple Workflow
+title_new_rule_transform=New Rule - Transform
+title_new_rule_transform_image=New Rule - Transform Image
+title_new_rule_import=New Rule - Import
+title_new_rule_condition=New Rule - Conditions
+title_new_rule_cond_contains=New Rule - Contains Text
+title_new_rule_cond_mimetype=New Rule - Has Mimetype
+title_new_rule_cond_category=New Rule - In Category
+title_new_rule_cond_subtype=New Rule - Is Subtype
+title_new_rule_cond_aspect=New Rule - Has Subtype
+title_new_rule_details=New Rule - Details
+title_new_rule_summary=New Rule - Summary
+title_new_space_create-from=New Space - Create From
+title_new_space_details=New Space - Details
+title_new_space_existing=New Space - From Existing
+title_new_space_scratch=New Space - From Scratch
+title_new_space_template=New Space - From Template
+title_new_space_summary=New Space - Summary
+title_new_user_person_props=User - Person Properties
+title_new_user_user_props=User - User Properties
+title_new_user_summary=User - Summary
+title_export=Export
+title_import=Import
+title_admin_store_browser=Alfresco Store Browser
+title_admin_node_browser=Alfresco Node Browser
+title_admin_search_results=Node Browser Search Results
+title_forums=Forum Space
+title_forum=Forum
+title_topic=Topic
+title_delete_forums_space=Delete Forum Space
+title_delete_forum_space=Delete Forum
+title_delete_topic_space=Delete Topic
+title_delete_post=Delete Post
+title_create_forums=Create Forum Space
+title_create_forum=Create Forum
+title_forums_details=Forum Space Details
+title_forum_details=Forum Details
+title_create_topic=Create Topic
+title_topic_details=Topic Details
+title_create_post=Post Message
+title_create_reply=Create Reply
+
+# UI Error messages
+error_generic=A system error happened during the operation: {0}
+error_noderef=Unable to find the repository item referenced by Id: {0} - the record has probably been deleted from the database.
+error_deleted_folder=The folder item referenced by Id: {0} - has been deleted from the database. The system has changed your folder location as the folder you were in no longer exists.
+error_homespace=The Home Space node referenced by Id: {0} cannot be found. It may have been deleted from the database. Please contact your system administrator.
+error_search=Search failed due to system error: {0}
+error_exists=A Space or File with that name already exists: {0}
+error_delete_space=Unable to delete Space due to system error:
+error_delete_file=Unable to delete File due to system error: 
+error_checkout=Unable to check out Content Node due to system error:
+error_update=Unable to update Content Node due to system error: 
+error_cancel_checkout=Unable to cancel check out of Content Node due to system error:
+error_checkin=Unable to check in Content Node due to system error:
+error_paste=Unable to paste item due to system error: 
+error_login_user=Unable to login - unknown username/password.
+error_login_missing=Must specify username and password.
+error_delete_rule=Unable to delete Rule due to system error: 
+error_action=Failed to run Action due to error: {0}
+error_rule=Failed to create Rule due to error: {0}
+error_space=Failed to create new space due to error: {0}
+error_person=Failed to create Person due to error: {0}
+error_delete_user=Failed to delete User due to error: {0}
+error_remove_user=Failed to remove User due to error: {0}
+error_password_match=Please ensure that both password fields contain the same value.
+error_property=Property ''{0}'' is not available for this node
+error_child_association=Child association ''{0}'' is not available for this node
+error_not_child_association=The association named ''{0}'' is not a child association
+error_association=Association ''{0}'' is not available for this node
+error_not_association=The association named ''{0}'' is not an association
+error_create_space_dialog=Please correct the errors below then click Create Space.
+error_create_forums_dialog=Please correct the errors below then click Create Forum Space.
+error_create_forum_dialog=Please correct the errors below then click Create Forum.
+error_create_topic_dialog=Please correct the errors below then click Create Topic.
+error_create_post_dialog=Please correct the errors below then click Post.
+error_create_reply_dialog=Please correct the errors below then click Reply.
+error_create_category_dialog=Please correct the errors below then click New Category.
+error_create_group_dialog=Please correct the errors below then click Create Group.
+error_wizard=Please correct the errors below then click Finish.
+error_update_category=Failed to update category due to system error: {0}
+error_update_simpleworkflow=Failed to update simple workflow due to system error: {0}
+error_workflow_approve=Failed to approve the document due to system error: {0}
+error_workflow_reject=Failed to reject the document due to system error: {0}
+error_aspect_classify=Failed to apply the ''classifiable'' aspect to the document due to system error: {0}
+error_aspect_versioning=Failed to apply the ''versionable'' aspect to the document due to system error: {0}
+error_aspect_inlineeditable=Failed to apply the ''inlineeditable'' aspect to the document due to system error: {0}
+error_content_missing=The node''s content is missing: \n   node: {0} \n   reader: {1}  \nPlease contact your system administrator.
+error_export=Failed to execute export: {0}
+error_import=Failed to execute import: {0}
+error_import_no_file=Can not find an ACP file to import!
+error_import_empty_file=You can not import an empty ACP file!
+error_import_all=Please correct the import errors below then click OK.
+error_export_all=Please correct the export errors below then click OK.
+
+# Confirmations
+return_to_application=Return to application
+delete_space_info=To remove this space and all of its contents, click Delete.
+delete_space_confirm=Are you sure you want to delete \"{0}\" and all its contents?
+delete_forums_info=To remove this forum space and its contents, click Delete.
+delete_forum_info=To remove this forum and its topics, click Delete.
+delete_forum_confirm=Are you sure you want to delete \"{0}\" and all its topics?
+delete_topic_info=To remove this topic and its posts, click Delete.
+delete_topic_confirm=Are you sure you want to delete \"{0}\" and all its posts?
+delete_post_info=To remove this post, click Delete.
+delete_post_confirm=Are you sure you want to delete \"{0}\"?
+delete_file_info=To remove this file and any previous versions, click Delete.
+delete_file_confirm=Are you sure you want to delete \"{0}\" and all previous versions?
+delete_rule_info=To remove this rule, click Delete.
+delete_user_info=To delete this user, click Delete.
+delete_rule_confirm=Are you sure you want to delete \"{0}\"?
+delete_user_confirm=Are you sure you want to delete user \"{0}\"? The User will no longer be able to access the system.
+remove_invited_user_confirm=Are you sure you want to remove user \"{0}\"? The User will no longer be able to access the documents and folders in this space.
+delete_companyroot_confirm=WARNING: This folder is a special folder accessed by all Users! Please be sure that you wish to delete this folder. It may cause System Errors if you remove it.
+
+# Status Messages
+status_space_created=Successfully created space ''{0}''.
+status_space_deleted=Successfully deleted space ''{0}''.
+status_space_updated=Successfully updated space ''{0}''.
diff --git a/config/alfresco/templates/company_logos.ftl b/config/alfresco/templates/company_logos.ftl
new file mode 100644
index 0000000000..51befa00b1
--- /dev/null
+++ b/config/alfresco/templates/company_logos.ftl
@@ -0,0 +1,20 @@
+<#-- Table of the images found in a folder under Company Home called "Company Logos" -->
+<#-- Shows each image found as inline content -->
+<table>
+   <#list companyhome.children as child>
+      <#if child.isContainer && child.name = "Company Logos">
+         <#list child.children as image>
+            <#switch image.mimetype>
+              <#case "image/jpeg">
+              <#case "image/gif">
+              <#case "image/png">
+                  <tr>
+                     <td><img src="/alfresco${image.url}"></td>
+                  </tr>
+                  <#break>
+               <#default>
+            </#switch>
+         </#list>
+      </#if>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/doc_info.ftl b/config/alfresco/templates/doc_info.ftl
new file mode 100644
index 0000000000..859ba73dd7
--- /dev/null
+++ b/config/alfresco/templates/doc_info.ftl
@@ -0,0 +1,17 @@
+<#-- Shows some general info about the current document, including NodeRef and aspects applied -->
+<h3>=====Template Start=====</h3>
+
+<h4>Current Document Info:</h4>
+<b>Name:</b> ${document.name}<br>
+<b>Ref:</b> ${document.nodeRef}<br>
+<b>Type:</b> ${document.type}<br>
+<b>Content URL:</b> <a href="/alfresco${document.url}">/alfresco${document.url}</a><br>
+<b>Locked:</b> <#if document.isLocked>Yes<#else>No</#if><br>
+<b>Aspects:</b>
+<table>
+<#list document.aspects as aspect>
+   <tr><td>${aspect}</td></tr>
+</#list>
+</table>
+
+<h3>=====Template End=====</h3>
diff --git a/config/alfresco/templates/example.ftl b/config/alfresco/templates/example.ftl
new file mode 100644
index 0000000000..28628aa543
--- /dev/null
+++ b/config/alfresco/templates/example.ftl
@@ -0,0 +1,47 @@
+<h3>=====Example Template Start=====</h3>
+
+<b>Company Home Space:</b> ${companyhome.properties.name}
+<br>
+<b>My Home Space:</b> ${userhome.properties.name}
+<br>
+<b>Company Home children count:</b> ${companyhome.children?size}
+<br>
+<b>Company Home first child node name:</b> ${companyhome.children[0].properties.name}
+<br>
+<b>Current Document Name:</b> ${document.name}
+<br>
+<b>Current Space Name:</b> ${space.name}
+
+<h4>List of child spaces in my Home Space:</h4>
+<table>
+<#list userhome.children as child>
+   <#if child.isContainer>
+      <tr>
+         <td><img src="/alfresco${child.icon32}"></td>
+         <td><b>${child.properties.name}</b> (${child.children?size})</td>
+         <td><b>Path:</b> ${child.displayPath}</td>
+      </tr>
+   </#if>
+</#list>
+</table>
+
+<h4>List of docs in my Home Space (text only content shown inline, JPG images shown as thumbnails):</h4>
+<table>
+<#list userhome.children as child>
+   <#if child.isDocument>
+      <tr><td><img src="/alfresco${child.icon16}"></td><td><a href="/alfresco${child.url}">${child.properties.name}</a></td></tr>
+      <#if child.mimetype = "text/plain">
+         <tr><td></td><td>${child.content}</td></tr>
+      <#elseif child.mimetype = "image/jpeg">
+         <tr><td></td><td><img width=100 height=65 src="/alfresco${child.url}"></td></tr>
+      </#if>
+   </#if>
+</#list>
+</table>
+
+<h4>Assoc example:</h4>
+<#if userhome.children[0].assocs["cm:contains"]?exists>
+   ${userhome.children[0].assocs["cm:contains"][0].name}
+</#if>
+
+<h3>=====Example Template End=====</h3>
diff --git a/config/alfresco/templates/localizable.ftl b/config/alfresco/templates/localizable.ftl
new file mode 100644
index 0000000000..12cf233a83
--- /dev/null
+++ b/config/alfresco/templates/localizable.ftl
@@ -0,0 +1,10 @@
+<#-- Shows if a document is localizable and the locale if set -->
+<b>Localisable:</b>
+<#if hasAspect(document, "cm:localizable") = 1>
+   Yes<br>
+   <#if document.properties.locale?exists>
+      Locale: ${document.properties.locale.properties.name}
+   </#if>
+<#else>
+   No<br>
+</#if>
diff --git a/config/alfresco/templates/my_docs.ftl b/config/alfresco/templates/my_docs.ftl
new file mode 100644
index 0000000000..1a31125b52
--- /dev/null
+++ b/config/alfresco/templates/my_docs.ftl
@@ -0,0 +1,20 @@
+<#-- Table of the documents in my Home Space -->
+<#-- Shows the Icon and link to the content for the doc, also the size in KB and lock status -->
+<table>
+   <tr>
+      <td></td>
+      <td><b>Name</b></td>
+      <td><b>Size</b></td>
+      <td><b>Locked</b></td>
+   </tr>
+   <#list userhome.children as child>
+      <#if child.isDocument>
+         <tr>
+            <td><a href="/alfresco${child.url}" target="new"><img src="/alfresco${child.icon16}" border=0></a></td>
+            <td><a href="/alfresco${child.url}" target="new">${child.properties.name}</a></td>
+            <td>${(child.size / 1000)?string("0.##")} KB</td>
+            <td>&nbsp;<#if child.isLocked>Yes</#if></td>
+         </tr>
+      </#if>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/my_pressreleases.ftl b/config/alfresco/templates/my_pressreleases.ftl
new file mode 100644
index 0000000000..f4c4af2157
--- /dev/null
+++ b/config/alfresco/templates/my_pressreleases.ftl
@@ -0,0 +1,28 @@
+<#-- Displays a table of all the documents from a "Press Releases" folder under Company Home -->
+<#-- Obviously this folder needs to exist and the docs in it should have the title and description fields set -->
+<table>
+   <#list companyhome.children as child>
+      <#if child.isContainer && child.name = "Press Releases">
+         <#list child.children as doc>
+            <#if doc.isDocument>
+               <tr>
+                   <td><a class="title" href="/alfresco/${doc.url}">${doc.properties.title}</a></td>
+               </tr>
+               <tr>
+                   <td style="padding-left:4px"><b>${doc.properties.description}</b></td>
+               </tr>
+               <tr>
+                   <td style="padding-left:8px">
+                     <#if (doc.content?length > 500)>
+                        <small>${doc.content[0..500]}...</small>
+                     <#else>
+                        <small>${doc.content}</small>
+                     </#if>
+                   </td>
+               </tr>
+               <tr><td><div style="padding:6px"></div></td></tr>
+            </#if>
+         </#list>
+      </#if>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/my_spaces.ftl b/config/alfresco/templates/my_spaces.ftl
new file mode 100644
index 0000000000..f83005cab4
--- /dev/null
+++ b/config/alfresco/templates/my_spaces.ftl
@@ -0,0 +1,15 @@
+<#-- Table of the Spaces in my Home Folder -->
+<#-- Shows the large 32x32 pixel icon, and generates an external access servlet URL to the space -->
+<table>
+   <#list userhome.children as child>
+      <#if child.isContainer>
+         <tr>
+             <td><img src="/alfresco${child.icon32}"></td>
+             <#assign ref=child.nodeRef>
+             <#assign workspace=ref[0..ref?index_of("://")-1]>
+             <#assign storenode=ref[ref?index_of("://")+3..]>
+             <td><a href="/alfresco/navigate/showSpaceDetails/${workspace}/${storenode}"><b>${child.properties.name}</b></a> (${child.children?size})</td>
+         </tr>
+      </#if>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/my_summary.ftl b/config/alfresco/templates/my_summary.ftl
new file mode 100644
index 0000000000..c2803041f9
--- /dev/null
+++ b/config/alfresco/templates/my_summary.ftl
@@ -0,0 +1,8 @@
+<#-- Table of some summary details about the current user -->
+<table>
+   <tr><td><b>Name:</b></td> <td>${person.properties.firstName} ${person.properties.lastName}</td></tr>
+   <tr><td><b>User:</b></td> <td>${person.properties.userName}</td></tr>
+   <tr><td><b>Home Space location:</b></td> <td>${userhome.displayPath}/${userhome.name}</td></tr>
+   <tr><td><b>Items in Home Space:</b></td> <td>${userhome.children?size}</td></tr>
+   <tr><td><b>Items in Company Space:</b></td> <td>${companyhome.children?size}</td></tr>
+</table>
diff --git a/config/alfresco/templates/namepath_xpath.ftl b/config/alfresco/templates/namepath_xpath.ftl
new file mode 100644
index 0000000000..0aace9cd38
--- /dev/null
+++ b/config/alfresco/templates/namepath_xpath.ftl
@@ -0,0 +1,19 @@
+<#-- Shows use of the childByNamePath and childrenByXPath API -->
+
+<h3>Template Documents in 'Company Home/Data Dictionary/Content Templates':</h3>
+<table>
+<#list companyhome.childByNamePath["Data Dictionary/Content Templates"].children as child>
+   <#if child.isDocument>
+      <tr><td><a href="/alfresco${child.url}" target="new">${child.properties.name}</a></td></tr>
+   </#if>
+</#list>
+</table>
+
+<h3>Folders in 'Company Home/Data Dictionary/Space Templates/Software Engineering Project':</h3>
+<table>
+<#list companyhome.childrenByXPath["*[@cm:name='Data Dictionary']/*[@cm:name='Space Templates']/*[@cm:name='Software Engineering Project']/*"] as child>
+   <#if child.isContainer>
+      <tr><td><img src="/alfresco${child.icon32}"> ${child.properties.name}</td></tr>
+   </#if>
+</#list>
+</table>
diff --git a/config/alfresco/templates/recent_docs.ftl b/config/alfresco/templates/recent_docs.ftl
new file mode 100644
index 0000000000..698bd2af20
--- /dev/null
+++ b/config/alfresco/templates/recent_docs.ftl
@@ -0,0 +1,20 @@
+<#-- Table of docs in a specific folder, that have been created or modified in the last week -->
+<h3>Documents created or modified in the last week</h3>
+<table cellpadding=2>
+   <tr>
+      <td></td>
+      <td><b>Name</b></td>
+      <td><b>Created Date</b></td>
+      <td><b>Modified Date</b></td>
+   </tr>
+   <#list space.childrenByXPath[".//*[subtypeOf('cm:content')]"] as child>
+      <#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)>
+         <tr>
+            <td><a href="/alfresco${child.url}" target="new"><img src="/alfresco${child.icon16}" border=0></a></td>
+            <td><a href="/alfresco${child.url}" target="new">${child.properties.name}</a></td>
+            <td>${child.properties["cm:created"]?datetime}</td>
+            <td>${child.properties["cm:modified"]?datetime}</td>
+         </tr>
+      </#if>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/system_users.ftl b/config/alfresco/templates/system_users.ftl
new file mode 100644
index 0000000000..da73637c95
--- /dev/null
+++ b/config/alfresco/templates/system_users.ftl
@@ -0,0 +1,17 @@
+<h3>System users, company Ids and home space information</h3>
+<table cellpadding=2>
+   <tr>
+      <td><b>Company ID</b></td>
+      <td><b>Username</b></td>
+      <td><b>Home Space Path</b></td>
+      <td><b>Creation Date</b></td>
+   </tr>
+   <#list space.childrenByXPath["/sys:system/sys:people/*[subtypeOf('cm:person')]"] as child>
+         <tr>
+            <td>${child.properties["cm:organizationId"]}</td>
+            <td>${child.properties["cm:userName"]}</td>
+            <td>${child.properties["cm:homeFolder"].displayPath}</td>
+            <td>${child.properties["cm:homeFolder"].properties["cm:created"]?date}</td>
+         </tr>
+   </#list>
+</table>
diff --git a/config/alfresco/templates/translatable.ftl b/config/alfresco/templates/translatable.ftl
new file mode 100644
index 0000000000..f47dc69d98
--- /dev/null
+++ b/config/alfresco/templates/translatable.ftl
@@ -0,0 +1,12 @@
+<#-- Shows the translations applied to a doc through the translatable aspect -->
+<b>Translatable:</b>
+<#if hasAspect(document, "cm:translatable") = 1>
+   Yes<br>
+   <table>
+   <#list document.assocs["cm:translations"] as t>
+      <tr><td>${t.content}</td></tr>
+   </#list>
+   </table>
+<#else>
+   No<br>
+</#if>
diff --git a/config/alfresco/templates/userhome_docs.ftl b/config/alfresco/templates/userhome_docs.ftl
new file mode 100644
index 0000000000..180fb92aa7
--- /dev/null
+++ b/config/alfresco/templates/userhome_docs.ftl
@@ -0,0 +1,15 @@
+<#-- List of docs in the Home Space for current user -->
+<#-- If the doc mimetype is plain/text then the content is shown inline -->
+<#-- If the doc mimetype is JPEG then the image is shown inline as a small thumbnail image -->
+<table>
+<#list userhome.children as child>
+  <#if child.isDocument>
+    <tr><td>${child.properties.name}</td></tr>
+    <#if child.mimetype = "text/plain">
+       <tr><td style='padding-left:16px'>${child.content}</td></tr>
+    <#elseif child.mimetype = "image/jpeg">
+       <tr><td style='padding-left:16px'><img width=100 height=65 src="/alfresco${child.url}"><td></tr>
+    </#if>
+  </#if>
+</#list>
+</table>
diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
new file mode 100644
index 0000000000..c047252535
--- /dev/null
+++ b/config/alfresco/web-client-application-context.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+   
+   <bean id="configSource" class="org.alfresco.config.source.ClassPathConfigSource">
+      <constructor-arg>
+         <list>
+            <value>alfresco/web-client-config.xml</value>
+            <value>alfresco/web-client-config-edit-properties.xml</value>
+         </list>
+      </constructor-arg>
+   </bean>
+   
+   <bean id="configService" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
+      <constructor-arg>
+         <ref bean="configSource"/>
+      </constructor-arg>
+   </bean>
+   
+   <!-- NOTE: This references a bean in the repository Spring configuration -->
+   <bean id="dataDictionary" class="org.alfresco.web.bean.repository.DataDictionary">
+      <constructor-arg>
+         <ref bean="DictionaryService"/>
+      </constructor-arg>
+   </bean>
+   
+</beans>
diff --git a/config/alfresco/web-client-config-edit-properties.xml b/config/alfresco/web-client-config-edit-properties.xml
new file mode 100644
index 0000000000..86e4810caf
--- /dev/null
+++ b/config/alfresco/web-client-config-edit-properties.xml
@@ -0,0 +1,86 @@
+<alfresco-config area="edit-properties">
+   
+   <!-- Example Client Configuration for exposing Types in exampleModel.xml -->
+   <config evaluator="node-type" condition="my:sop">
+      <property-sheet>
+         <show-property name="my:publishedDate"/>
+         <show-association name="my:signOff"/>
+         <show-property name="my:authorisedBy"/>
+         <show-child-association name="my:processSteps"/>
+      </property-sheet>
+   </config>
+   <!-- End Example -->
+   
+   <config evaluator="node-type" condition="dictionaryModel">
+      <property-sheet>      
+		<show-property name="modelActive"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="complianceable">
+      <property-sheet>
+         <show-property name="removeAfter"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="dublincore">
+      <property-sheet>
+         <show-property name="publisher"/>
+         <show-property name="contributor"/>
+         <show-property name="type"/>
+         <show-property name="identifier"/>
+         <show-property name="dcsource"/>
+         <show-property name="coverage"/>
+         <show-property name="rights"/>
+         <show-property name="subject"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="effectivity">
+      <property-sheet>
+         <show-property name="from"/>
+         <show-property name="to"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="summarizable">
+      <property-sheet>
+         <show-property name="summary"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="versionable">
+      <property-sheet>
+         <show-property name="autoVersion" converter="org.alfresco.faces.BooleanLabelConverter"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="translatable">
+      <property-sheet>
+         <show-association name="translations"/>
+      </property-sheet>
+   </config>
+
+   <config evaluator="aspect-name" condition="localizable">
+      <property-sheet>
+         <show-property name="locale"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="app:inlineeditable">
+      <property-sheet>
+         <show-property name="app:editInline"/>
+      </property-sheet>
+   </config>
+
+   <!-- Example Client Configuration for exposing Aspects in exampleModel.xml -->
+   <config evaluator="aspect-name" condition="my:imageClassification">
+      <property-sheet>
+         <show-property name="my:width"/>
+         <show-property name="my:height"/>
+         <show-property name="my:resolution"/>
+      </property-sheet>
+   </config>   
+   <!-- End Example -->
+      
+</alfresco-config>
diff --git a/config/alfresco/web-client-config-zoo.xml b/config/alfresco/web-client-config-zoo.xml
new file mode 100644
index 0000000000..0b55b77eec
--- /dev/null
+++ b/config/alfresco/web-client-config-zoo.xml
@@ -0,0 +1,10 @@
+<alfresco-config>
+   
+   <plug-ins>
+      <evaluators>
+         <evaluator id="type-name" class="jsftest.repository.TypeNameEvaluator"/>
+         <evaluator id="aspect" class="org.alfresco.web.config.AspectEvaluator"/>
+      </evaluators>
+   </plug-ins>
+
+</alfresco-config>
\ No newline at end of file
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
new file mode 100644
index 0000000000..f9fa193ad9
--- /dev/null
+++ b/config/alfresco/web-client-config.xml
@@ -0,0 +1,325 @@
+<alfresco-config>
+   
+   <plug-ins>
+      <evaluators>
+         <evaluator id="node-type" class="org.alfresco.web.config.NodeTypeEvaluator" />
+         <evaluator id="aspect-name" class="org.alfresco.web.config.AspectEvaluator" />
+      </evaluators>
+      <element-readers>
+         <element-reader element-name="server" class="org.alfresco.web.config.ServerElementReader"/>
+         <element-reader element-name="client" class="org.alfresco.web.config.ClientElementReader"/>
+         <element-reader element-name="property-sheet" class="org.alfresco.web.config.PropertySheetElementReader"/>
+         <element-reader element-name="navigation" class="org.alfresco.web.config.NavigationElementReader" />
+      </element-readers>
+   </plug-ins>
+   
+   <config>
+      <server>
+         <error-page>/jsp/error.jsp</error-page>
+         <error-pages>
+            <error-page>/jsp/error.jsp</error-page>
+            <error-page type="org.alfresco.service.cmr.repository.InvalidNodeRefException">
+               /jsp/error_missing.jsp
+            </error-page>
+         </error-pages>
+         <login-page>/jsp/login.jsp</login-page>
+      </server>
+      <admin>
+         <initial-password>admin</initial-password>
+      </admin>
+      <client>
+         <!-- the list of available language files -->
+         <languages>
+            <language locale="en_US">English</language>
+            <!-- <language locale="fr_FR">French</language> -->
+            <!-- <language locale="de_DE">German</language> -->
+            <!-- <language locale="ja_JP">Japanese</language> -->
+         </languages>
+         
+         <!-- advanced search custom attribute config -->
+         <advanced-search>
+            <!-- type constraint drop-down -->
+            <content-types>
+               <!-- cm:content type is implicit in this list -->
+               <!-- types must extend cm:content for the Alfresco web-client -->
+               <type name="cm:dictionaryModel" />
+               <type name="fm:post" />
+            </content-types>
+            <!-- custom properties to be shown in the More Options panel -->
+            <custom-properties>
+            </custom-properties>
+         </advanced-search>
+         
+         <!-- the views available in the client -->
+         <views>
+            <view>org.alfresco.web.ui.common.renderer.data.RichListRenderer$DetailsViewRenderer</view>
+            <view>org.alfresco.web.ui.common.renderer.data.RichListRenderer$IconViewRenderer</view>
+            <view>org.alfresco.web.ui.common.renderer.data.RichListRenderer$ListViewRenderer</view>
+            <view>org.alfresco.web.bean.ForumsBean$TopicBubbleViewRenderer</view>
+         </views>
+         
+         <!-- default values for the views available in the client -->
+         <view-defaults>
+            <browse>
+               <!-- allowable values: list|details|icons -->
+               <view>icons</view>
+               <page-size>
+                  <list>10</list>
+                  <details>10</details>
+                  <icons>9</icons>
+               </page-size>
+            </browse>
+            <forums>
+               <!-- allowable values: list|details|icons -->
+               <view>list</view>
+               <page-size>
+                  <list>20</list>
+                  <details>20</details>
+                  <icons>20</icons>
+               </page-size>
+            </forums>
+            <forum>
+               <!-- allowable values: details -->
+               <view>details</view>
+               <page-size>
+                  <details>20</details>
+               </page-size>
+            </forum>
+            <topic>
+               <!-- allowable values: details|bubble -->
+               <view>bubble</view>
+               <sort-column>created</sort-column>
+               <sort-descending>true</sort-descending>
+               <page-size>
+                  <bubble>5</bubble>
+                  <details>20</details>
+               </page-size>
+            </topic>
+         </view-defaults>
+         
+         <!-- the maximum number of items to show in the recent spaces shelf component -->
+         <recent-spaces-items>6</recent-spaces-items>
+         
+         <!-- the minimum number of characters required for a valid search string -->
+         <search-minimum>3</search-minimum>
+         
+         <!-- The default permissions to apply to a new users Home Space when first created -->
+         <!-- this permission is for other users attempting to access that Home Space -->
+         <!-- generally set to "Guest" or empty value to indicate a private hidden space. -->
+         <!-- see org.alfresco.service.cmr.security.PermissionService for allowed values -->
+         <home-space-permission>Guest</home-space-permission>
+         
+         <!-- the URL to the client Help file -->
+         <help-url>http://www.alfresco.org/mediawiki/index.php/Client_Help</help-url>
+         
+         <!-- the type of edit link to use, NOTE: inline editable will always take precedence -->
+         <!-- can be: http|webdav|cifs -->
+         <edit-link-type>http</edit-link-type>
+      </client>
+   </config>
+   
+   <config evaluator="node-type" condition="content">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="mimetype" displayLabelId="mimetype" converter="org.alfresco.faces.MimeTypeConverter"/>
+         <show-property name="title"/>
+         <show-property name="description"/>
+         <show-property name="size" displayLabelId="size" converter="org.alfresco.faces.ByteSizeConverter"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="node-type" condition="folder">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="description"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:forums">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="description"/>
+      </property-sheet>
+
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forums.jsp" />
+         <override from-outcome="browse" to-view-id="/jsp/forums/forums.jsp" />
+         <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/forums-details.jsp" />
+         <override from-outcome="deleteSpace" to-view-id="/jsp/forums/delete-forums.jsp" />
+      </navigation>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:forum">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="description"/>
+         <show-property name="fm:status"/>
+      </property-sheet>
+
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forum.jsp" />
+         <override from-outcome="browse" to-view-id="/jsp/forums/forum.jsp" />
+         <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/forum-details.jsp" />
+         <override from-outcome="deleteSpace" to-view-id="/jsp/forums/delete-forum.jsp" />
+      </navigation>
+   </config>
+   
+   <config evaluator="node-type" condition="fm:topic">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="fm:type"/>
+      </property-sheet>
+
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/topic.jsp" />
+         <override from-outcome="browse" to-view-id="/jsp/forums/topic.jsp" />
+         <override from-outcome="showSpaceDetails" to-view-id="/jsp/forums/topic-details.jsp" />
+      </navigation>
+   </config>
+   
+   <config evaluator="node-type" condition="dictionaryModel">
+      <property-sheet>      
+	     <show-property name="modelActive"/>
+      </property-sheet>
+   </config>
+
+   <!-- Example client config for type defined in exampleModel.xml -->   
+   <config evaluator="node-type" condition="my:sop">
+      <property-sheet>
+         <show-property name="name"/>
+         <show-property name="mimetype" displayLabelId="mimetype" converter="org.alfresco.faces.MimeTypeConverter"/>
+         <show-property name="title"/>
+         <show-property name="description"/>
+         <show-property name="size" displayLabelId="size" converter="org.alfresco.faces.ByteSizeConverter"/>
+         <show-property name="my:publishedDate"/>
+         <show-association name="my:signOff"/>
+         <show-property name="my:authorisedBy"/>
+         <show-child-association name="my:processSteps"/>
+      </property-sheet>
+   </config>
+   <!-- End Example -->   
+   
+   <config evaluator="aspect-name" condition="complianceable">
+      <property-sheet>
+         <show-property name="removeAfter"/>
+      </property-sheet>
+   </config>
+
+   <config evaluator="aspect-name" condition="dublincore">
+      <property-sheet>
+         <show-property name="publisher"/>
+         <show-property name="contributor"/>
+         <show-property name="type"/>
+         <show-property name="identifier"/>
+         <show-property name="dcsource"/>
+         <show-property name="coverage"/>
+         <show-property name="rights"/>
+         <show-property name="subject"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="effectivity">
+      <property-sheet>
+         <show-property name="from"/>
+         <show-property name="to"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="summarizable">
+      <property-sheet>
+         <show-property name="summary"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="versionable">
+      <property-sheet>
+         <show-property name="versionLabel"/>
+         <show-property name="autoVersion" converter="org.alfresco.faces.BooleanLabelConverter"/>         
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="translatable">
+      <property-sheet>
+         <show-association name="translations"/>
+      </property-sheet>
+   </config>
+
+   <config evaluator="aspect-name" condition="localizable">
+      <property-sheet>
+         <show-property name="locale"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="auditable">
+      <property-sheet>
+         <show-property name="creator"/>
+         <show-property name="created" readOnly="true"/>
+         <show-property name="modifier"/>
+         <show-property name="modified" readOnly="true"/>
+      </property-sheet>
+   </config>
+   
+   <config evaluator="aspect-name" condition="app:inlineeditable">
+      <property-sheet>
+         <show-property name="app:editInline" converter="org.alfresco.faces.BooleanLabelConverter" />
+      </property-sheet>
+   </config>
+   
+   <!-- Example Client Configuration for exposing aspects defined in exampleModel.xml -->
+   <config evaluator="aspect-name" condition="my:imageClassification">
+      <property-sheet>
+         <show-property name="my:width"/>
+         <show-property name="my:height"/>
+         <show-property name="my:resolution"/>
+      </property-sheet>
+   </config>
+   <!-- End Example -->
+
+   <config evaluator="string-compare" condition="Action Wizards">
+      <types>
+         <type name="folder" displayLabelId="space"/>
+         <type name="content"/>
+      </types>
+      <aspects>
+         <aspect name="generalclassifiable"/>
+         <aspect name="complianceable"/>
+         <aspect name="dublincore"/>
+         <aspect name="effectivity"/>
+         <aspect name="summarizable"/>
+         <aspect name="versionable"/>
+<!--         <aspect name="templatable"/> -->
+         <aspect name="translatable"/>
+         <aspect name="localizable"/>
+         <!-- Example configuration to demonstrate how to expose aspect from exampleModel.xml -->
+         <!-- <aspect name="my:imageClassification"/> -->
+      </aspects>
+      <transformers>
+         <transformer name="text/html"/>
+         <transformer name="application/pdf"/>
+         <transformer name="text/plain"/>
+         <transformer name="text/xml"/>
+         <transformer name="application/x-shockwave-flash"/>
+         <transformer name="image/gif"/>
+         <transformer name="image/jpeg"/>
+      </transformers>
+      <image-transformers>
+         <transformer name="image/gif"/>
+         <transformer name="image/jpeg"/>
+         <transformer name="image/png"/>
+      </image-transformers>
+   </config>
+   
+   <config evaluator="string-compare" condition="Custom Content Types">
+      <content-types>
+         <!-- <type name="my:sop" /> -->
+      	<type name="cm:dictionaryModel"/>
+      </content-types>
+   </config>
+   
+   <config evaluator="string-compare" condition="Custom Folder Types">
+      <folder-types>
+         <type name="fm:forums" icon="/images/icons/forums_large.gif" descriptionMsgId="forums_desc" />
+      </folder-types>
+   </config>
+      
+</alfresco-config>
diff --git a/project-build.xml b/project-build.xml
new file mode 100644
index 0000000000..e03427694f
--- /dev/null
+++ b/project-build.xml
@@ -0,0 +1,93 @@
+<project name="web-client" default="build">
+
+   <path id="path.common" path="${basedir}/../../common"/>
+   <property name="dir.common" refid="path.common"/>
+   <import file="${dir.common}/common.xml"/>
+
+   <!-- we want to build a WAR file in this project -->
+   <target name="package" depends="package-war" />
+
+   <!-- copy the template web.xml and replace the "@facesconfig@" token with list of faces config files -->
+   <target name="generate-web-xml" depends="init">
+      <copy file="${dir.src.webinf}/${file.name.war.template}" tofile="${dir.src.webinf}/web.xml" overwrite="yes" />
+      <replace file="${dir.src.webinf}/web.xml" token="@facesconfig@" value="${files.faces.config}" />
+   </target>
+
+   <!-- override the common assemble-war target -->
+   <target name="assemble-war" depends="common.assemble-war, generate-web-xml">
+      <fail unless="server" message="You must supply a value for the 'server' property to indicate which WAR to build" />
+      
+      <condition property="isTomcat">
+         <equals arg1="${server}" arg2="tomcat" casesensitive="false" trim="yes"/>
+      </condition>
+      <condition property="isJBoss">
+         <equals arg1="${server}" arg2="jboss" casesensitive="false" trim="yes"/>
+      </condition>
+      
+      <echo level="info">isTomcat = ${isTomcat}</echo>
+      <echo level="info">isJBoss = ${isJBoss}</echo>
+      
+      <antcall target="assemble-war-common" />
+      <antcall target="assemble-war-tomcat" />
+      <antcall target="assemble-war-jboss" />
+   </target>
+   
+   <target name="assemble-war-common">
+      <copy todir="${dir.assemble}/WEB-INF">
+         <fileset dir="${dir.project.installer}" includes="licenses/**" />
+         <fileset dir="${dir.project.remoteapi}/source/web/WEB-INF"/>
+      </copy>
+      
+      <copy todir="${dir.assemble}/WEB-INF/lib">
+         <fileset dir="${dir.common.lib}/jibx" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/openoffice" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/jmagick" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/commons" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/jgroups" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/treecache" includes="*.jar" />
+         <fileset dir="${dir.common.lib}/swarmcache" includes="*.jar" />
+         <fileset dir="${dir.project.core}/build/dist" includes="${dir.name.core}.jar" />
+         <fileset dir="${dir.project.repository}/build/dist" includes="${dir.name.repository}.jar" />
+         <fileset dir="${dir.project.remoteapi}/build/dist" includes="${dir.name.remoteapi}.jar" />
+      </copy>
+      
+      <copy todir="${dir.assemble}/wsdl">
+         <fileset dir="${dir.project.remoteapi}/source/wsdl" />
+      </copy>
+   </target>
+ 
+   <target name="assemble-war-tomcat" if="isTomcat">
+      <!-- remove the jboss specific stuff from WEB-INF -->
+      <delete>
+         <fileset dir="${dir.assemble}/WEB-INF" includes="${webinf.delete.tomcat}" />
+      </delete>
+      
+      <!-- add config files to WEB-INF/classes -->
+      <copy todir="${dir.assemble}/WEB-INF/classes">
+         <fileset dir="${dir.config.repository}"/>
+         <fileset dir="${dir.config.webclient}"/>
+      </copy>
+      <copy todir="${dir.assemble}/WEB-INF/classes" file="${dir.project.core}/source/java/log4j.properties" />
+   </target>
+   
+   <target name="assemble-war-jboss" if="isJBoss">
+      <!-- remove the JARs that cause problems in JBoss -->
+      <delete>
+         <fileset dir="${dir.assemble}/WEB-INF/lib" includes="${webinf.lib.delete.jboss}" />
+      </delete>
+
+      <!-- remove existing config files -->
+      <delete dir="${dir.deploy.jboss}/../conf/alfresco" quiet="yes"/>
+         
+      <!-- push externally visible config files into conf directory -->
+      <copy todir="${dir.deploy.jboss}/../conf" >
+         <fileset dir="${dir.config.repository}"/>
+         <fileset dir="${dir.config.webclient}"/>
+      </copy>
+   </target>
+   
+   <target name="clean" depends="common.clean" description="Cleans all the normal files plus web.xml">
+      <delete file="${dir.src.webinf}/web.xml" />
+   </target>
+  
+</project>
diff --git a/project-override.properties b/project-override.properties
new file mode 100644
index 0000000000..2c25b41451
--- /dev/null
+++ b/project-override.properties
@@ -0,0 +1,4 @@
+file.name.war=alfresco.war
+
+javadoc.title.window=Alfresco Web Client API
+javadoc.title.document=Alfresco Web Client API Specification
diff --git a/project.properties b/project.properties
new file mode 100644
index 0000000000..7e67da7136
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,4 @@
+webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-pages.xml
+webinf.lib.delete.jboss=log4j-1.2.8.jar,portlet-api-lib.jar
+
+files.faces.config=/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-zoo.xml
diff --git a/source/java/jsftest/DummyBean.java b/source/java/jsftest/DummyBean.java
new file mode 100644
index 0000000000..27f983121c
--- /dev/null
+++ b/source/java/jsftest/DummyBean.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Object that can be used as a backing bean for components in the zoo
+ * 
+ * @author gavinc
+ */
+public class DummyBean
+{
+   private static Log logger = LogFactory.getLog(DummyBean.class);
+   
+   private String name;
+   private Properties properties;
+   
+   public DummyBean()
+   {
+      this.properties = new Properties();
+      this.properties.put("one", "This is 1");
+      this.properties.put("two", "This is 2");
+      this.properties.put("three", "This is 3");
+      this.properties.put("four", "This is 4");
+   }
+   
+   public Properties getProperties()
+   {
+      return this.properties;
+   }
+
+   /**
+    * @return Returns the name.
+    */
+   public String getName()
+   {
+      return name;
+   }
+   
+   /**
+    * @param name The name to set.
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   /**
+    * @see java.lang.Object#toString()
+    */
+   public String toString()
+   {
+      StringBuilder builder = new StringBuilder(super.toString());
+      builder.append(" (name=").append(this.name);
+      builder.append(" properties=").append(this.properties).append(")");
+      return builder.toString();
+   }
+
+   /**
+    * Method to call on form submit buttons 
+    */
+   public void submit()
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Submit called on DummyBean, state = " + toString());
+   }
+}
diff --git a/source/java/jsftest/TestList.java b/source/java/jsftest/TestList.java
new file mode 100644
index 0000000000..f7fba1669b
--- /dev/null
+++ b/source/java/jsftest/TestList.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIBreadcrumb;
+import org.apache.log4j.Logger;
+
+/**
+ * @author kevinr
+ */
+public class TestList
+{
+   /**
+    * Constructor
+    */
+   public TestList()
+   {
+      // Create test data rows
+      
+      Calendar date = new GregorianCalendar(1999, 1, 5);
+      rows.add(new TestRow("monkey", 5, true, 0.1f, date.getTime()));
+      date = new GregorianCalendar(2000, 12, 5);
+      rows.add(new TestRow("biscuit", 15, true, 0.2f, date.getTime()));
+      date = new GregorianCalendar(1999, 11, 15);
+      rows.add(new TestRow("HORSEY", 23, false, 0.333f, date.getTime()));
+      date = new GregorianCalendar(2003, 11, 11);
+      rows.add(new TestRow("thing go here", 5123, true, 0.999f, date.getTime()));
+      date = new GregorianCalendar(1999, 2, 3);
+      rows.add(new TestRow("I like docs", -5, false, 0.333f, date.getTime()));
+      date = new GregorianCalendar(2005, 1, 1);
+      rows.add(new TestRow("Document", 1235, false, 12.0f, date.getTime()));
+      date = new GregorianCalendar(1998, 8, 8);
+      rows.add(new TestRow("1234567890", 52, false, 5.0f, date.getTime()));
+      date = new GregorianCalendar(1997, 9, 30);
+      rows.add(new TestRow("space", 77, true, 17.5f, date.getTime()));
+      date = new GregorianCalendar(2001, 7, 15);
+      rows.add(new TestRow("House", 12, true, 0.4f, date.getTime()));
+      date = new GregorianCalendar(2002, 5, 28);
+      rows.add(new TestRow("Baboon", 14, true, -0.888f, date.getTime()));
+      date = new GregorianCalendar(2003, 11, 11);
+      rows.add(new TestRow("Woof", 0, true, 0.0f, date.getTime()));
+   }
+   
+   public List getRows()
+   {
+      return this.rows;
+   }
+   
+   public void clickBreadcrumb(ActionEvent event)
+   {
+      if (event.getComponent() instanceof UIBreadcrumb)
+      {
+         s_logger.debug("clickBreadcrumb action listener called, path now: " + ((UIBreadcrumb)event.getComponent()).getValue());
+      }
+   }
+   
+   public void clickActionLink(ActionEvent event)
+   {
+      s_logger.debug("clickActionLink");
+   }
+   
+   public void clickNameLink(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String value = params.get("name");
+      if (value != null)
+      {
+         s_logger.debug("clicked item in list: " + value);
+      }
+   }
+
+
+   private final static Logger s_logger = Logger.getLogger(TestList.class);
+   
+   private List<TestRow> rows = new ArrayList<TestRow>();;
+}
diff --git a/source/java/jsftest/TestRow.java b/source/java/jsftest/TestRow.java
new file mode 100644
index 0000000000..612a977913
--- /dev/null
+++ b/source/java/jsftest/TestRow.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+import java.util.Date;
+
+/**
+ * @author kevinr
+ */
+public class TestRow
+{
+   /**
+    * Test a row bean with various data types
+    */
+   public TestRow(String name, int count, boolean valid, float relevance, Date created)
+   {
+      this.name = name;
+      this.count = count;
+      this.valid = valid;
+      this.relevance = relevance;
+      this.created = created;
+   }
+   
+   public String getName()
+   {
+      return name;
+   }
+   
+   public int getCount()
+   {
+      return count;
+   }
+   
+   public boolean getValid()
+   {
+      return valid;
+   }
+   
+   public float getRelevance()
+   {
+      return relevance;
+   }
+
+   public Date getCreated()
+   {
+      return created;
+   }
+   
+   public void setCreated(Date date)
+   {
+      this.created = date;
+   }
+   
+   public TestRow getObject()
+   {
+      return this;
+   }
+   
+   
+   private String name;
+   private int count;
+   private boolean valid;
+   private float relevance;
+   private Date created;
+}
diff --git a/source/java/jsftest/User.java b/source/java/jsftest/User.java
new file mode 100644
index 0000000000..9f0daa8c49
--- /dev/null
+++ b/source/java/jsftest/User.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.faces.model.SelectItem;
+
+
+/**
+ * Class representing a single User bean instance.
+ * 
+ * @author kevinr
+ */
+public class User implements Cloneable
+{
+   public User()
+   {
+      setRoles(new ArrayList<String>(4));
+   }
+   
+   public User(String username, String password, String name, String[] roles, Date joined)
+   {
+      setUsername(username);
+      setPassword(password);
+      setName(name);
+      setDateJoined(joined);
+      List<String> rolesList = new ArrayList<String>(roles.length);
+      for (int i=0; i<roles.length; i++)
+      {
+         rolesList.add(roles[i]);
+      }
+      setRoles(rolesList);
+   }
+   
+   /**
+    * Private copy constructor
+    * 
+    * @param u    User to clone
+    */
+   private User(User u)
+   {
+      setUsername(u.getUsername());
+      setPassword(u.getPassword());
+      setName(u.getName());
+      setDateJoined(u.getDateJoined());
+      setRoles(new ArrayList<String>(u.getRoles()));
+   }
+   
+   /**
+    * @see java.lang.Object#clone()
+    */
+   protected Object clone() throws CloneNotSupportedException
+   {
+      // invoke copy constructor
+      return new User(this);
+   }
+   
+   /**
+    * Get the username
+    *
+    * @return the username
+    */
+   public String getUsername()
+   {
+      return m_username;
+   }
+
+   /**
+    * Set the username
+    *
+    * @param username      the username
+    */
+   public void setUsername(String username)
+   {
+      m_username = username;
+   }
+
+   /**
+    * Get the name
+    *
+    * @return the name
+    */
+   public String getName()
+   {
+      return m_name;
+   }
+
+   /**
+    * Set the name
+    *
+    * @param name     the name
+    */
+   public void setName(String name)
+   {
+      m_name = name;
+   }
+
+   /**
+    * Get the roles
+    *
+    * @return the roles
+    */
+   public List<String> getRoles()
+   {
+      return m_roles;
+   }
+
+   /**
+    * Set the roles
+    *
+    * @param roles     the roles
+    */
+   public void setRoles(List<String> roles)
+   {
+      m_roles = roles;
+   }
+   
+   /**
+    * Get the password
+    *
+    * @return the password
+    */
+   public String getPassword()
+   {
+      return m_password;
+   }
+
+   /**
+    * Set the password
+    *
+    * @param password     the password
+    */
+   public void setPassword(String password)
+   {
+      m_password = password;
+   }
+   
+   /**
+    * Get the All Roles List
+    *
+    * @return the allRolesList
+    */
+   public List getAllRolesList()
+   {
+      return m_allRolesList;
+   }
+
+   /**
+    * Set the allRolesList
+    *
+    * @param allRolesList     the allRolesList
+    */
+   public void setAllRolesList(List<SelectItem> allRolesList)
+   {
+      m_allRolesList = allRolesList;
+   }
+   
+   /**
+    * Get the dateJoined
+    *
+    * @return the dateJoined
+    */
+   public Date getDateJoined()
+   {
+      return m_dateJoined;
+   }
+
+   /**
+    * Set the dateJoined
+    *
+    * @param dateJoined     the dateJoined
+    */
+   public void setDateJoined(Date dateJoined)
+   {
+      m_dateJoined = dateJoined;
+   }
+
+
+   /** the allRolesList enum list */
+   private static List<SelectItem> m_allRolesList = new ArrayList<SelectItem>(8);
+   static
+   {
+      m_allRolesList.add(new SelectItem("admin", "Administrator"));
+      m_allRolesList.add(new SelectItem("superuser", "Super User"));
+      m_allRolesList.add(new SelectItem("dev", "Developer"));
+      m_allRolesList.add(new SelectItem("qa", "QA"));
+      m_allRolesList.add(new SelectItem("standard", "Basic User"));
+   }
+
+
+   /** the password */
+   private String m_password;
+
+   /** the username */
+   private String m_username;
+
+   /** the name */
+   private String m_name;
+
+   /** the roles */
+   private List<String> m_roles;
+   
+   /** the date joined */
+   private Date m_dateJoined;
+}
\ No newline at end of file
diff --git a/source/java/jsftest/UserListBean.java b/source/java/jsftest/UserListBean.java
new file mode 100644
index 0000000000..d3921e3ff3
--- /dev/null
+++ b/source/java/jsftest/UserListBean.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIParameter;
+import javax.faces.component.html.HtmlOutputText;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.validator.ValidatorException;
+
+import org.apache.log4j.Logger;
+
+/**
+ * JSF Managed Bean. Provides the backing for the userlist.jsp view. The view uses
+ * the datatable control to bind to the List of User bean objects. Implements the
+ * action events called by the view when the user clicks the Edit link or Add button.
+ * 
+ * @author kevinr
+ */
+public class UserListBean
+{
+   // ===========================================================================
+   // Construction
+   
+   public UserListBean()
+   {
+      Calendar date = new GregorianCalendar(2002, 5, 10);
+      m_users.add(new User("admin", "admin", "Administrator", new String[] {"admin","superuser"}, date.getTime()));
+      date = new GregorianCalendar(2001, 7, 10);
+      m_users.add(new User("kevinr", "kevinr", "Kevin Roast", new String[] {"admin","superuser","dev"}, date.getTime()));
+      date = new GregorianCalendar(2003, 8, 15);
+      m_users.add(new User("gavinc", "gavinc", "Gavin Cornwell", new String[] {"superuser","dev"}, date.getTime()));
+      date = new GregorianCalendar(2003, 1, 1);
+      m_users.add(new User("stever", "stever", "Steve Rigby", new String[] {"superuser","qa"}, date.getTime()));
+   }
+   
+   
+   // ===========================================================================
+   // Bean methods
+   
+   public List getUsers()
+   {
+      return m_users;
+   }
+   
+   public void setUsers(List<User> users)
+   {
+      m_users = users;
+   }
+   
+   /**
+    * Get the users list as a wrapped DataModel object
+    * 
+    * @return DataModel for use by the data-table components
+    */
+   public DataModel getUsersModel()
+   {
+      if (m_usersModel == null)
+      {
+         m_usersModel = new ListDataModel();
+         m_usersModel.setWrappedData(m_users);
+      }
+      
+      return m_usersModel;
+   }
+   
+   public User getUser()
+   {
+      return m_currentUser;
+   }
+   
+   public void setUser(User user)
+   {
+      m_currentUser = user;
+   }
+   
+   /**
+    * Get the isNewUser
+    *
+    * @return the isNewUser
+    */
+   public boolean getIsNewUser()
+   {
+      return m_isNewUser;
+   }
+
+   /**
+    * Set the isNewUser
+    *
+    * @param isNewUser     the isNewUser
+    */
+   public void setIsNewUser(boolean isNewUser)
+   {
+      m_isNewUser = isNewUser;
+   }
+   
+   /**
+    * Get the rolesOutputText
+    *
+    * @return the rolesOutputText
+    */
+   public HtmlOutputText getRolesOutputText()
+   {
+      return m_rolesOutputText;
+   }
+
+   /**
+    * Set the rolesOutputText
+    *
+    * @param rolesOutputText     the rolesOutputText component
+    */
+   public void setRolesOutputText(HtmlOutputText rolesOutputText)
+   {
+      m_rolesOutputText = rolesOutputText;
+   }
+
+   
+   
+   // ===========================================================================
+   // Action event methods
+   
+   /**
+    * Edit user action event listener
+    * 
+    * Specified directly on the appropriate tag such as commandLink or commandButton
+    * e.g. actionListener="#{UserListBean.editUser}"
+    * 
+    * This listener cannot directly affect the navigation of the page - the command
+    * tag has an "action" attribute of which the default handler will use the outcome
+    * from the faces-config.xml by default or call a specifid controller method
+    * returning the String outcome as usual.
+    */
+   public void editUser(ActionEvent event)
+   {
+      s_logger.debug("*****USERLIST: " + ((UIParameter)event.getComponent().findComponent("userId")).getValue().toString());
+      
+      // Get the username from the "param" tag component we added as a nested tag
+      // to the command tag that fired this event.
+      // So we can have a key to work out which item was clicked in the data table
+      String usernameId = ((UIParameter)event.getComponent().findComponent("userId")).getValue().toString();
+      
+      // It is also possible to get the relevent row from the DataModel we created
+      // wrapping our users list. But this is a weak solution as models which then
+      // potentially sort or page data may not provide the correct row index.
+      // e.g.
+      //    m_usersModel.getWrappedData().get(m_usersModel.getRowIndex());
+      
+      for (Iterator i=m_users.iterator(); i.hasNext(); /**/)
+      {
+         User user = (User)i.next();
+         if (user.getUsername().equals(usernameId))
+         {
+            // set the user as current so we know which one to edit etc.
+            try
+            {
+               setUser((User)user.clone());
+               setIsNewUser(false);
+            }
+            catch (CloneNotSupportedException e)
+            {
+               // will not happen - clone is supported for our own types
+            }
+         }
+      }
+   }
+   
+   /**
+    * OK button action handler
+    * 
+    * @return outcome view name
+    */
+   public void editUserOK(ActionEvent event)
+   {
+      s_logger.debug("*****USERLIST: persisting user: " + getUser().getUsername());
+      for (int i=0; i<m_users.size(); i++)
+      {
+         User user = (User)m_users.get(i);
+         if (user.getUsername().equals(getUser().getUsername()))
+         {
+            // found modified user - persist changes
+            m_users.set(i, getUser());
+            m_usersModel = null;
+            break;
+         }
+      }
+   }
+   
+   /**
+    * Add user action event listener
+    */
+   public void addUser(ActionEvent event)
+   {
+      // create a blank user template
+      setUser(new User());
+      setIsNewUser(true);
+   }
+   
+   /**
+    * OK button action handler
+    * 
+    * @return outcome view name
+    */
+   public void addUserOK(ActionEvent event)
+   {
+      // persist new user details
+      s_logger.debug("*****USERLIST: creating user: " + getUser().getUsername());
+      m_users.add(getUser());
+      m_usersModel = null;
+   }
+   
+   /**
+    * Example of a value changed event handler
+    * NOTE: Value changed events do not submit the form directly, either a command
+    *       button or link submits the form or can be done manually with Javascript
+    */
+   public void roleValueChanged(ValueChangeEvent event)
+   {
+      s_logger.debug("*****USERLIST: Value change from: " + event.getOldValue() + " to: " + event.getNewValue());
+      
+      // example of the use of a direct component binding
+      // in the JSP page, a outputText tag has used binding='beanmethod' so we
+      // can now programatically modify the component as required
+      if (m_rolesOutputText != null)
+      {
+         m_rolesOutputText.setValue(getUser().getRoles().toString());
+      }
+      
+      // An alternative to using the component binding would be to lookup the
+      // component via it's component Id:
+      //    HtmlOutputText comp = (HtmlOutputText)event.getComponent().findComponent("roles-text");
+      //    comp.setValue(...);
+      
+      // The attributes of a component are all stored in a Map, the Map features
+      // attribute-property transparency which means typed attributes can be get/set
+      // directly without using casts as the appropriate getters/setters will be
+      // called for you by the framework.
+      //    comp.getAttributes().put("style", "color:red");
+   }
+   
+   
+   // ===========================================================================
+   // Validator methods 
+   
+   /**
+    * Example of a specific validation method. Required as the basic validator
+    * child tags are not sufficient for anything beyond very simple length checks etc.
+    */
+   public void validateUsername(FacesContext context, UIComponent component, Object value)
+      throws ValidatorException
+   {
+      String username = (String)value;
+      if (username.length() < 5 || username.length() > 12)
+      {
+         String err = "Username must be between 5 and 12 characters in length.";
+         throw new ValidatorException(new FacesMessage(err));
+      }
+      else if (username.indexOf(' ') != -1 || username.indexOf('\t') != -1)
+      {
+         String err = "Username cannot contain space or whitespace characters.";
+         throw new ValidatorException(new FacesMessage(err));
+      }
+   }
+   
+   
+   // ===========================================================================
+   // Private data
+   
+   private List<User> m_users = new ArrayList<User>();
+   private DataModel m_usersModel = null;
+   private User m_currentUser = null;
+   private boolean m_isNewUser = false;
+   
+   /** the HTMLOutputText component */
+   private HtmlOutputText m_rolesOutputText = null;
+   
+   protected final static Logger s_logger = Logger.getLogger(UserListBean.class);
+}
\ No newline at end of file
diff --git a/source/java/jsftest/ZooService.java b/source/java/jsftest/ZooService.java
new file mode 100644
index 0000000000..e50d6f3780
--- /dev/null
+++ b/source/java/jsftest/ZooService.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest;
+
+/**
+ * Managed bean that provides action handlers to navigate around the component zoo
+ * 
+ * @author gavinc
+ */
+public class ZooService
+{
+   public String showPropertyZoo()
+   {
+      return "showPropertyZoo";
+   }
+   
+   public String showPropertyZoo2()
+   {
+      return "showPropertyZoo2";
+   }
+}
diff --git a/source/java/jsftest/repository/DataDictionary.java b/source/java/jsftest/repository/DataDictionary.java
new file mode 100644
index 0000000000..4a01f57095
--- /dev/null
+++ b/source/java/jsftest/repository/DataDictionary.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest.repository;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Class to represent a basic data dictionary service
+ * 
+ * @author gavinc
+ */
+public class DataDictionary
+{
+   private Map types;
+   
+   public DataDictionary()
+   {
+      this.types = new HashMap();
+      
+      // setup the dictionary
+      Property name = new Property("name", "string", "Name", false);
+      Property desc = new Property("description", "string", "Description" , false);
+      Property created = new Property("created", "datetime", "Created Date", true);
+      Property modified = new Property("modified", "datetime", "Modified Date", false);
+      Property keywords = new Property("keywords", "string[]", "Keywords", false);
+      
+      MetaData base = new MetaData("base");
+      base.addProperty(name);
+      base.addProperty(desc);
+      base.addProperty(created);
+      base.addProperty(modified);
+      base.addProperty(keywords);
+      
+      Property sopid = new Property("sopId", "string", "SOP ID", true);
+      Property effective = new Property("effective", "datetime", "Effective Date", false);
+      Property approved = new Property("approved", "boolean", "Approved", false);
+      Property latestVersion = new Property("latestversion", "string", "Latest Version", true);
+      
+      MetaData sop = new MetaData("SOP");
+      sop.setProperties(base.getProperties());
+      sop.addProperty(sopid);
+      sop.addProperty(effective);
+      sop.addProperty(approved);
+      // add an aspect and the associated property
+      sop.addAspect("versionable");
+      sop.addProperty(latestVersion);
+      
+      this.types.put(base.getTypeName(), base);
+      this.types.put(sop.getTypeName(), sop);
+   }
+   
+   public MetaData getMetaData(String type)
+   {
+      return (MetaData)this.types.get(type);
+   }
+   
+   /**
+    * @return Returns the types.
+    */
+   public Map getTypes()
+   {
+      return this.types;
+   }
+   
+   
+   // *********************
+   // *** Inner classes ***
+   // *********************
+   
+   /**
+    * Represents the meta data of an object
+    * @author gavinc
+    */
+	public class MetaData
+	{
+      private Map propertiesMap;
+	   private List properties;
+	   private String typeName;
+      private List aspects;
+	   
+	   public MetaData(String typeName)
+	   {
+	      this.properties = new ArrayList();
+         this.propertiesMap = new HashMap();
+         this.aspects = new ArrayList();
+	      this.typeName = typeName;
+	   }
+	   
+	   /**
+	    * Adds a property to the meta data object
+	    * 
+	    * @author gavinc
+	    */
+	   public void addProperty(Property property)
+	   {
+	      this.properties.add(property);
+         this.propertiesMap.put(property.getName(), property);
+	   }
+	   
+      /**
+       * @return Returns the properties.
+       */
+      public List getProperties()
+      {
+         return this.properties;
+      }
+      
+      /**
+       * @param properties The properties to set.
+       */
+      public void setProperties(List properties)
+      {
+         this.properties.clear();
+         this.propertiesMap.clear();
+         
+         Iterator iter = properties.iterator();
+         while (iter.hasNext())
+         {
+            Property prop = (Property)iter.next();
+            this.properties.add(prop);
+            this.propertiesMap.put(prop.getName(), prop);
+         }
+      }
+      
+      public Map getPropertiesMap()
+      {
+         return this.propertiesMap;
+      }
+      
+      public List getAspects()
+      {
+         return this.aspects;
+      }
+      
+      public void addAspect(String aspect)
+      {
+         this.aspects.add(aspect);
+      }
+      
+      /**
+       * @return Returns the typeName.
+       */
+      public String getTypeName()
+      {
+         return this.typeName;
+      }
+	}
+	
+	/**
+	 * Represents a property on an object
+	 * @author gavinc
+	 */
+	public class Property
+	{
+	   private String name;
+	   private String type;
+	   private String displayName;
+	   private boolean readOnly;
+	   
+      /**
+       * @param name
+       * @param type
+       * @param readOnly
+       */
+      public Property(String name, String type, String displayName, boolean readOnly)
+      {
+         this.name = name;
+         this.type = type;
+         this.displayName = displayName;
+         this.readOnly = readOnly;
+      }
+      
+	   /**
+	    * @return Returns the name.
+	    */
+	   public String getName()
+	   {
+	      return this.name;
+	   }
+	   
+	   /**
+	    * @param name The name to set.
+	    */
+	   public void setName(String name)
+	   {
+	      this.name = name;
+	   }
+	   
+	   /**
+	    * @return Returns the type.
+	    */
+	   public String getType()
+	   {
+	      return this.type;
+	   }
+	   
+	   /**
+	    * @param type The type to set.
+	    */
+	   public void setType(String type)
+	   {
+	      this.type = type;
+	   }
+	   
+      /**
+       * @return Returns the displayName.
+       */
+      public String getDisplayName()
+      {
+         return this.displayName;
+      }
+      
+      /**
+       * @param displayName The displayName to set.
+       */
+      public void setDisplayName(String displayName)
+      {
+         this.displayName = displayName;
+      }
+      
+	   /**
+	    * @return Returns the readOnly.
+	    */
+	   public boolean isReadOnly()
+	   {
+	      return this.readOnly;
+	   }
+	   
+	   /**
+	    * @param readOnly The readOnly to set.
+	    */
+	   public void setReadOnly(boolean readOnly)
+	   {
+	      this.readOnly = readOnly;
+	   }
+	}
+	
+}
\ No newline at end of file
diff --git a/source/java/jsftest/repository/NodeRef.java b/source/java/jsftest/repository/NodeRef.java
new file mode 100644
index 0000000000..388ee4258b
--- /dev/null
+++ b/source/java/jsftest/repository/NodeRef.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest.repository;
+
+import java.io.Serializable;
+
+/**
+ * Mock NodeRef object that comes from the Mock NodeService API.
+ * 
+ * @author gavinc
+ */
+public class NodeRef implements Serializable
+{
+   private static final long serialVersionUID = 3833183614468175153L;
+
+   private String id;
+   
+   public NodeRef(String id)
+   {
+      this.id = id;
+   }
+
+   /**
+    * @return Returns the id.
+    */
+   public String getId()
+   {
+      return id;
+   }
+}
diff --git a/source/java/jsftest/repository/NodeService.java b/source/java/jsftest/repository/NodeService.java
new file mode 100644
index 0000000000..b558580336
--- /dev/null
+++ b/source/java/jsftest/repository/NodeService.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package jsftest.repository;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Mock NodeService API
+ * 
+ * @author gavinc
+ */
+public class NodeService
+{
+   private static Log logger = LogFactory.getLog(NodeService.class);
+   
+   public static NodeRef getNodeRef(String path)
+   {
+      return new NodeRef(path);
+   }
+   
+   public static String getType(NodeRef nodeRef)
+   {
+      String id = nodeRef.getId();
+      String type = null;
+      
+      if (id.equalsIgnoreCase("/gav.doc") || 
+          id.equalsIgnoreCase("/kev.txt"))
+      {
+         type = "base"; 
+      }
+      else if (id.equalsIgnoreCase("/sop.txt"))
+      {
+         type = "SOP";
+      }
+      
+      return type;
+   }
+   
+   public static Map getProperties(NodeRef nodeRef)
+   {
+      String id = nodeRef.getId();
+      Map properties = null;
+      
+      if (id.equalsIgnoreCase("/gav.doc"))
+      {
+         properties = createProperties("Gav", "Gavs Object", 
+               new String[] {"gav", "gadget", "gibbon"}, null);
+      }
+      else if (id.equalsIgnoreCase("/kev.txt"))
+      {
+         properties = createProperties("Kev", "Kevs Object", 
+              new String[] {"kev", "monkey"}, null);
+      }
+      else if (id.equalsIgnoreCase("/sop.txt"))
+      {
+         properties = createProperties("SOP", "A manufacturing SOP", 
+               new String[] {"sop", "manufacturing"}, "sop1");
+      }
+      
+      return properties;
+   }
+
+   private static Map createProperties(String name, String desc, 
+         String[] keywords, String sop)
+   {
+      HashMap props = new HashMap();
+      
+      Date date = new Date();
+      props.put("name", name);
+      props.put("description", desc);
+      props.put("keywords", keywords);
+      props.put("created", date);
+      props.put("modified", date);
+      
+      if (sop != null)
+      {
+         props.put("sopId", sop);
+         props.put("effective", date);
+         props.put("approved", new Boolean(true));
+         props.put("latestversion", "1.6");
+      }
+      
+      return props; 
+   }
+}
diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
new file mode 100644
index 0000000000..26d1b6e81e
--- /dev/null
+++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app;
+
+import javax.faces.application.NavigationHandler;
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigService;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.config.NavigationConfigElement;
+import org.alfresco.web.config.NavigationElementReader;
+import org.alfresco.web.config.NavigationResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * @author gavinc
+ */
+public class AlfrescoNavigationHandler extends NavigationHandler
+{
+   private final static Log logger = LogFactory.getLog(AlfrescoNavigationHandler.class);
+   
+   // The original navigation handler
+   private NavigationHandler origHandler;
+   
+   /**
+    * Default constructor
+    * 
+    * @param origHandler The original navigation handler
+    */
+   public AlfrescoNavigationHandler(NavigationHandler origHandler)
+   {
+      super();
+      this.origHandler = origHandler;
+   }
+
+   /**
+    * @see javax.faces.application.NavigationHandler#handleNavigation(javax.faces.context.FacesContext, java.lang.String, java.lang.String)
+    */
+   @Override
+   public void handleNavigation(FacesContext context, String fromAction, String outcome)
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("handleNavigation (fromAction=" + fromAction + ", outcome=" + outcome + ")");
+      
+      boolean useOriginalNavHandler = true;
+      String finalOutcome = outcome;
+      String viewId = context.getViewRoot().getViewId();
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Current view id: " + viewId);
+      
+      NavigationBean navBean = (NavigationBean)context.getExternalContext().
+         getSessionMap().get("NavigationBean");
+      
+      // only continue if we have some dispatching context
+      if (navBean != null && navBean.getDispatchContextNode() != null)
+      {
+         Node node = navBean.getDispatchContextNode();
+               
+         if (logger.isDebugEnabled())
+            logger.debug("Found node in dispatch context: " + node);
+
+         // see if there is any navigation config for the node type
+         ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               context).getBean(Application.BEAN_CONFIG_SERVICE);
+         
+         Config nodeConfig = configSvc.getConfig(node);
+         NavigationConfigElement navigationCfg = (NavigationConfigElement)nodeConfig.
+               getConfigElement(NavigationElementReader.ELEMENT_NAVIGATION);
+         
+         if (navigationCfg != null)
+         {
+            // see if there is config for the current view state
+            NavigationResult navResult = navigationCfg.getOverride(viewId, outcome);
+            
+            if (navResult != null)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Found navigation config: " + navResult);
+               
+               if (navResult.isOutcome())
+               {
+                  finalOutcome = navResult.getResult();
+               }
+               else
+               {
+                  String newViewId = navResult.getResult();
+                  
+                  if (newViewId.equals(viewId) == false)
+                  {
+                     useOriginalNavHandler = false;
+                     
+                     if (logger.isDebugEnabled())
+                        logger.debug("Dispatching to new view id: " + newViewId);
+                  
+                     ViewHandler viewHandler = context.getApplication().getViewHandler();
+                     UIViewRoot viewRoot = viewHandler.createView(context, newViewId);
+                     viewRoot.setViewId(newViewId);
+                     context.setViewRoot(viewRoot);
+                     context.renderResponse();
+                  }
+                  else
+                  {
+                     if (logger.isDebugEnabled())
+                        logger.debug("New view id is the same as the current one so setting outcome to null");
+                     
+                     finalOutcome = null;
+                  }
+               }
+            }
+            else if (logger.isDebugEnabled())
+            {
+               logger.debug("No override configuration found for current view or outcome");
+            }
+         }
+         else if (logger.isDebugEnabled())
+         {
+            logger.debug("No navigation configuration found for node");
+         }
+         
+         // reset the dispatch context
+         navBean.resetDispatchContext();
+      }
+      else if (logger.isDebugEnabled())
+      {
+         logger.debug("No dispatch context found");
+      }
+      
+      // do the appropriate navigation handling
+      if (useOriginalNavHandler)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Passing outcome '" + finalOutcome + "' to original navigation handler");
+         
+         this.origHandler.handleNavigation(context, fromAction, finalOutcome);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
new file mode 100644
index 0000000000..ff05b39b55
--- /dev/null
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -0,0 +1,662 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import javax.faces.context.FacesContext;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletSession;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.importer.ImporterBootstrap;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.web.app.servlet.AuthenticationHelper;
+import org.alfresco.web.bean.ErrorBean;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.config.ServerConfigElement;
+import org.apache.commons.logging.Log;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Utilities class
+ * 
+ * @author gavinc
+ */
+public class Application
+{
+   private static final String LOCALE = "locale";
+   
+   public static final String BEAN_CONFIG_SERVICE = "configService";
+   public static final String BEAN_DATA_DICTIONARY = "dataDictionary";
+   public static final String BEAN_IMPORTER_BOOTSTRAP = "importerBootstrap";
+   
+   public static final String MESSAGE_BUNDLE = "alfresco.messages.webclient";
+   
+   private static boolean inPortalServer = true;
+   private static StoreRef repoStoreRef;
+   private static String rootPath;
+   private static String companyRootId;
+   private static String companyRootDescription;
+   private static String glossaryFolderName;
+   private static String spaceTemplatesFolderName;
+   private static String contentTemplatesFolderName;
+   
+   /**
+    * Private constructor to prevent instantiation of this class 
+    */
+   private Application()
+   {
+   }
+   
+   /**
+    * Sets whether this application is running inside a portal server
+    * 
+    * @param inPortal true to indicate the application is running as a portlet 
+    */
+   public static void setInPortalServer(boolean inPortal)
+   {
+      inPortalServer = inPortal;
+   }
+   
+   /**
+    * Determines whether the server is running in a portal
+    * 
+    * @return true if we are running inside a portal server
+    */
+   public static boolean inPortalServer()
+   {
+      return inPortalServer;
+   }
+   
+   /**
+    * Handles errors thrown from servlets
+    * 
+    * @param servletContext The servlet context
+    * @param request The HTTP request
+    * @param response The HTTP response
+    * @param error The exception
+    * @param logger The logger
+    */
+   public static void handleServletError(ServletContext servletContext, HttpServletRequest request,
+         HttpServletResponse response, Throwable error, Log logger, String returnPage)
+      throws IOException, ServletException
+   {
+      // get the error bean from the session and set the error that occurred.
+      HttpSession session = request.getSession();
+      ErrorBean errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME);
+      if (errorBean == null)
+      {
+         errorBean = new ErrorBean();
+         session.setAttribute(ErrorBean.ERROR_BEAN_NAME, errorBean);
+      }
+      errorBean.setLastError(error);
+      errorBean.setReturnPage(returnPage);
+      
+      // try and find the configured error page
+      boolean errorShown = false;
+      String errorPage = getErrorPage(servletContext);
+      
+      if (errorPage != null)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("An error has occurred, redirecting to error page: " + errorPage);
+         
+         if (response.isCommitted() == false)
+         {
+            errorShown = true;
+            response.sendRedirect(request.getContextPath() + errorPage);
+         }
+         else
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("Response is already committed, re-throwing error");
+         }
+      }
+      else
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("No error page defined, re-throwing error");
+      }
+      
+      // if we could not show the error page for whatever reason, re-throw the error
+      if (!errorShown)
+      {
+         if (error instanceof IOException)
+         {
+            throw (IOException)error;
+         }
+         else if (error instanceof ServletException)
+         {
+            throw (ServletException)error;
+         }
+         else
+         {
+            throw new ServletException(error);
+         }
+      }
+   }
+   
+   /**
+    * Retrieves the configured error page for the application
+    * 
+    * @param servletContext The servlet context
+    * @return The configured error page or null if the configuration is missing
+    */
+   public static String getErrorPage(ServletContext servletContext)
+   {
+      return getErrorPage(WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext));
+   }
+   
+   /**
+    * Retrieves the configured error page for the application
+    * 
+    * @param portletContext The portlet context
+    * @return
+    */
+   public static String getErrorPage(PortletContext portletContext)
+   {
+      return getErrorPage((WebApplicationContext)portletContext.getAttribute(
+            WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE));
+   }
+   
+   /**
+    * Retrieves the configured login page for the application
+    * 
+    * @param servletContext The servlet context
+    * @return The configured login page or null if the configuration is missing
+    */
+   public static String getLoginPage(ServletContext servletContext)
+   {
+      return getLoginPage(WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext));
+   }
+   
+   /**
+    * Retrieves the configured login page for the application
+    * 
+    * @param portletContext The portlet context
+    * @return
+    */
+   public static String getLoginPage(PortletContext portletContext)
+   {
+      return getLoginPage((WebApplicationContext)portletContext.getAttribute(
+            WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE));
+   }
+   
+   /**
+    * @return Returns the User object representing the currently logged in user
+    */
+   public static User getCurrentUser(HttpSession session)
+   {
+      return (User)session.getAttribute(AuthenticationHelper.AUTHENTICATION_USER);
+   }
+   
+   /**
+    * @return Returns the User object representing the currently logged in user
+    */
+   public static User getCurrentUser(FacesContext context)
+   {
+      return (User)context.getExternalContext().getSessionMap().get(AuthenticationHelper.AUTHENTICATION_USER);
+   }
+   
+   /**
+    * @return Returns the repository store URL (retrieved from config service)
+    */
+   public static StoreRef getRepositoryStoreRef(ServletContext context)
+   {
+      return getRepositoryStoreRef(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the repository store URL (retrieved from config service)
+    */
+   public static StoreRef getRepositoryStoreRef(FacesContext context)
+   {
+      return getRepositoryStoreRef(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns id of the company root 
+    */
+   public static String getCompanyRootId()
+   {
+      return companyRootId;
+   }
+   
+   /**
+    * Sets the company root id. This is setup by the ContextListener.
+    * 
+    * @param id The company root id
+    */
+   public static void setCompanyRootId(String id)
+   {
+      companyRootId = id;
+   }
+   
+   /**
+    * @return Returns the root path for the application (retrieved from config service)
+    */
+   public static String getRootPath(ServletContext context)
+   {
+      return getRootPath(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the root path for the application (retrieved from config service)
+    */
+   public static String getRootPath(FacesContext context)
+   {
+      return getRootPath(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the glossary folder name (retrieved from config service)
+    */
+   public static String getGlossaryFolderName(ServletContext context)
+   {
+      return getGlossaryFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the glossary folder name (retrieved from config service)
+    */
+   public static String getGlossaryFolderName(FacesContext context)
+   {
+      return getGlossaryFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the Space templates folder name (retrieved from config service)
+    */
+   public static String getSpaceTemplatesFolderName(ServletContext context)
+   {
+      return getSpaceTemplatesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the Space templates folder name (retrieved from config service)
+    */
+   public static String getSpaceTemplatesFolderName(FacesContext context)
+   {
+      return getSpaceTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the Content templates folder name (retrieved from config service)
+    */
+   public static String getContentTemplatesFolderName(ServletContext context)
+   {
+      return getContentTemplatesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * @return Returns the Content templates folder name (retrieved from config service)
+    */
+   public static String getContentTemplatesFolderName(FacesContext context)
+   {
+      return getContentTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
+   }
+   
+   /**
+    * Set the language locale for the current user context
+    * 
+    * @param context        FacesContext for current user
+    * @param code           The ISO locale code to set
+    */
+   public static void setLanguage(FacesContext context, String code)
+   {
+      Locale locale = parseLocale(code);
+      
+      // set locale for JSF framework usage
+      context.getViewRoot().setLocale(locale);
+      
+      // set locale for our framework usage
+      context.getExternalContext().getSessionMap().put(LOCALE, locale);
+      
+      // clear the current message bundle - so it's reloaded with new locale
+      context.getExternalContext().getSessionMap().remove(MESSAGE_BUNDLE);
+   }
+   
+   /**
+    * Set the language locale for the current user session
+    * 
+    * @param session        HttpSession for current user
+    * @param code           The ISO locale code to set
+    */
+   public static void setLanguage(HttpSession session, String code)
+   {
+      Locale locale = parseLocale(code);
+      
+      session.putValue(LOCALE, locale);
+      session.removeAttribute(MESSAGE_BUNDLE);
+   }
+   
+   /**
+    * @param code    Locale code (java format with underscores) to parse
+    * @return Locale object or default if unable to parse
+    */
+   private static Locale parseLocale(String code)
+   {
+      Locale locale = Locale.getDefault();
+      
+      StringTokenizer t = new StringTokenizer(code, "_");
+      int tokens = t.countTokens();
+      if (tokens == 1)
+      {
+         locale = new Locale(code);
+      }
+      else if (tokens == 2)
+      {
+         locale = new Locale(t.nextToken(), t.nextToken());
+      }
+      else if (tokens == 3)
+      {
+         locale = new Locale(t.nextToken(), t.nextToken(), t.nextToken());
+      }
+      
+      return locale;
+   }
+   
+   /**
+    * Return the language Locale for the current user context
+    * 
+    * @param context        FacesContext for the current user
+    * 
+    * @return Current language Locale set or null if none set 
+    */
+   public static Locale getLanguage(FacesContext context)
+   {
+      return (Locale)context.getExternalContext().getSessionMap().get(LOCALE);
+   }
+   
+   /**
+    * Return the language Locale for the current user Session.
+    * 
+    * @param session        HttpSession for the current user
+    * 
+    * @return Current language Locale set or null if none set 
+    */
+   public static Locale getLanguage(HttpSession session)
+   {
+      return (Locale)session.getAttribute(LOCALE);
+   }
+   
+   /**
+    * Return the language Locale for the current user PortletSession.
+    * 
+    * @param session        PortletSession for the current user
+    * 
+    * @return Current language Locale set or null if none set 
+    */
+   public static Locale getLanguage(PortletSession session)
+   {
+      return (Locale)session.getAttribute(LOCALE);
+   }
+   
+   /**
+    * Get the specified I18N message string from the default message bundle for this user
+    * 
+    * @param context        FacesContext
+    * @param msg            Message ID
+    * 
+    * @return String from message bundle or $$msg$$ if not found
+    */
+   public static String getMessage(FacesContext context, String msg)
+   {
+      return getBundle(context).getString(msg);
+   }
+   
+   /**
+    * Get the specified I18N message string from the default message bundle for this user
+    * 
+    * @param session        HttpSession
+    * @param msg            Message ID
+    * 
+    * @return String from message bundle or $$msg$$ if not found
+    */
+   public static String getMessage(HttpSession session, String msg)
+   {
+      return getBundle(session).getString(msg);
+   }
+   
+   /**
+    * Get the specified the default message bundle for this user
+    * 
+    * @param session        HttpSession
+    * 
+    * @return ResourceBundle for this user
+    */
+   public static ResourceBundle getBundle(HttpSession session)
+   {
+      ResourceBundle bundle = (ResourceBundle)session.getAttribute(MESSAGE_BUNDLE);
+      if (bundle == null)
+      {
+         // get Locale from language selected by each user on login
+         Locale locale = (Locale)session.getAttribute(LOCALE);
+         if (locale == null)
+         {
+            locale = Locale.getDefault();
+         }
+         bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, locale);
+         if (bundle == null)
+         {
+            throw new AlfrescoRuntimeException("Unable to load Alfresco messages bundle: " + MESSAGE_BUNDLE);
+         }
+         
+         // apply our wrapper to catch MissingResourceException
+         bundle = new ResourceBundleWrapper(bundle);
+         
+         session.setAttribute(MESSAGE_BUNDLE, bundle);
+      }
+      
+      return bundle;
+   }
+   
+   /**
+    * Get the specified the default message bundle for this user
+    * 
+    * @param context        FacesContext
+    * 
+    * @return ResourceBundle for this user
+    */
+   public static ResourceBundle getBundle(FacesContext context)
+   {
+      // get the resource bundle for the current locale
+      // we store the bundle in the users session
+      // this makes it easy to add a locale per user support later
+      Map session = context.getExternalContext().getSessionMap();
+      ResourceBundle bundle = (ResourceBundle)session.get(MESSAGE_BUNDLE);
+      if (bundle == null)
+      {
+         // get Locale from language selected by each user on login
+         Locale locale = (Locale)session.get(LOCALE);
+         if (locale == null)
+         {
+            locale = Locale.getDefault();
+         }
+         bundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, locale);
+         if (bundle == null)
+         {
+            throw new AlfrescoRuntimeException("Unable to load Alfresco messages bundle: " + MESSAGE_BUNDLE);
+         }
+         
+         // apply our wrapper to catch MissingResourceException
+         bundle = new ResourceBundleWrapper(bundle);
+         
+         session.put(MESSAGE_BUNDLE, bundle);
+      }
+      
+      return bundle;
+   }
+   
+   /**
+    * Helper to get the ConfigService instance
+    * 
+    * @param context        FacesContext
+    * 
+    * @return ConfigService
+    */
+   public static ConfigService getConfigService(FacesContext context)
+   {
+      return (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(context).getBean(
+            Application.BEAN_CONFIG_SERVICE);
+   }
+   
+   /**
+    * Returns the repository store URL (retrieved from config service)
+    * 
+    * @param context The spring context
+    * @return The repository store URL to use
+    */
+   private static StoreRef getRepositoryStoreRef(WebApplicationContext context)
+   {
+      if (repoStoreRef == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         repoStoreRef = bootstrap.getStoreRef();
+      }
+      
+      return repoStoreRef;
+   }
+   
+   /**
+    * Returns the root path for the application (retrieved from config service)
+    * 
+    * @param context The spring context
+    * @return The application root path
+    */
+   private static String getRootPath(WebApplicationContext context)
+   {
+      if (rootPath == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         rootPath = configuration.getProperty("spaces.company_home.childname");
+      }
+      
+      return rootPath;
+   }
+   
+   /**
+    * Returns the glossary folder name (retrieved from config service)
+    * 
+    * @param context The spring context
+    * @return The glossary folder name
+    */
+   private static String getGlossaryFolderName(WebApplicationContext context)
+   {
+      if (glossaryFolderName == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         glossaryFolderName = configuration.getProperty("spaces.dictionary.childname");
+      }
+      
+      return glossaryFolderName;
+   }
+   
+   /**
+    * Returns the Space Templates folder name (retrieved from config service)
+    * 
+    * @param context The spring context
+    * @return The templates folder name
+    */
+   private static String getSpaceTemplatesFolderName(WebApplicationContext context)
+   {
+      if (spaceTemplatesFolderName == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         spaceTemplatesFolderName = configuration.getProperty("spaces.templates.childname");
+      }
+      
+      return spaceTemplatesFolderName;
+   }
+   
+   /**
+    * Returns the Content Templates folder name (retrieved from config service)
+    * 
+    * @param context The spring context
+    * @return The templates folder name
+    */
+   private static String getContentTemplatesFolderName(WebApplicationContext context)
+   {
+      if (contentTemplatesFolderName == null)
+      {
+         ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
+         Properties configuration = bootstrap.getConfiguration();
+         contentTemplatesFolderName = configuration.getProperty("spaces.templates.content.childname");
+      }
+      
+      return contentTemplatesFolderName;
+   }
+   
+   /**
+    * Retrieves the configured error page for the application
+    * 
+    * @param context The Spring contexr
+    * @return The configured error page or null if the configuration is missing
+    */
+   private static String getErrorPage(WebApplicationContext context)
+   {
+      String errorPage = null;
+      
+      ConfigService svc = (ConfigService)context.getBean(BEAN_CONFIG_SERVICE);
+      ServerConfigElement serverConfig = (ServerConfigElement)svc.getGlobalConfig().getConfigElement("server");
+      
+      if (serverConfig != null)
+      {
+         errorPage = serverConfig.getErrorPage();
+      }
+      
+      return errorPage;
+   }
+   
+   /**
+    * Retrieves the configured login page for the application
+    * 
+    * @param context The Spring contexr
+    * @return The configured login page or null if the configuration is missing
+    */
+   private static String getLoginPage(WebApplicationContext context)
+   {
+      String loginPage = null;
+      
+      ConfigService svc = (ConfigService)context.getBean(BEAN_CONFIG_SERVICE);
+      ServerConfigElement serverConfig = (ServerConfigElement)svc.getGlobalConfig().getConfigElement("server");
+      
+      if (serverConfig != null)
+      {
+         loginPage = serverConfig.getLoginPage();
+      }
+      
+      return loginPage;
+   }
+}
diff --git a/source/java/org/alfresco/web/app/ContextListener.java b/source/java/org/alfresco/web/app/ContextListener.java
new file mode 100644
index 0000000000..7d73f05010
--- /dev/null
+++ b/source/java/org/alfresco/web/app/ContextListener.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.web.app.portlet.AlfrescoFacesPortlet;
+import org.alfresco.web.app.servlet.AuthenticationHelper;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * ServletContextListener implementation that initialises the application.
+ * 
+ * NOTE: This class must appear after the Spring context loader listener
+ * 
+ * @author gavinc
+ */
+public class ContextListener implements ServletContextListener, HttpSessionListener
+{
+   private static Log logger = LogFactory.getLog(ContextListener.class);
+
+   private static final String ADMIN = "admin";
+   private static final String ADMIN_FIRSTNAME = "Repository";
+   private static final String ADMIN_LASTNAME = "Administrator";
+
+   private ServletContext servletContext;
+
+   /**
+    * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
+    */
+   public void contextInitialized(ServletContextEvent event)
+   {
+      // make sure that the spaces store in the repository exists
+      this.servletContext = event.getServletContext();
+      WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+      ServiceRegistry registry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
+      TransactionService transactionService = registry.getTransactionService();
+      NodeService nodeService = registry.getNodeService();
+      SearchService searchService = registry.getSearchService();
+      NamespaceService namespaceService = registry.getNamespaceService();
+      AuthenticationComponent authenticationComponent = (AuthenticationComponent) ctx
+            .getBean("authenticationComponent");
+
+      // repo bootstrap code for our client
+      UserTransaction tx = null;
+      NodeRef companySpaceNodeRef = null;
+      try
+      {
+         tx = transactionService.getUserTransaction();
+         tx.begin();
+         authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName());
+
+         // get and setup the initial store ref from config
+         StoreRef storeRef = Repository.getStoreRef(servletContext);
+
+         // check the repository exists, create if it doesn't
+         if (nodeService.exists(storeRef) == false)
+         {
+            throw new AlfrescoRuntimeException("Store not created prior to application startup: " + storeRef);
+         }
+
+         // get hold of the root node
+         NodeRef rootNodeRef = nodeService.getRootNode(storeRef);
+
+         // see if the company home space is present
+         String rootPath = Application.getRootPath(servletContext);
+         if (rootPath == null)
+         {
+            throw new AlfrescoRuntimeException("Root path has not been configured");
+         }
+
+         List<NodeRef> nodes = searchService.selectNodes(rootNodeRef, rootPath, null, namespaceService, false);
+         if (nodes.size() == 0)
+         {
+            throw new AlfrescoRuntimeException("Root path not created prior to application startup: " + rootPath);
+         }
+
+         // Extract company space id and store it in the Application object
+         companySpaceNodeRef = nodes.get(0);
+         Application.setCompanyRootId(companySpaceNodeRef.getId());
+
+         // check the admin user exists, create if it doesn't
+         MutableAuthenticationDao dao = (MutableAuthenticationDao) ctx.getBean("alfDaoImpl");
+
+         // this is required to setup the ACEGI context before we can check
+         // for the user
+         if (!dao.userExists(ADMIN))
+         {
+            ConfigService configService = (ConfigService) ctx.getBean(Application.BEAN_CONFIG_SERVICE);
+            // default to password of "admin" if we don't find config for it
+            String password = ADMIN;
+            ConfigElement adminConfig = configService.getGlobalConfig().getConfigElement("admin");
+            if (adminConfig != null)
+            {
+               List<ConfigElement> children = adminConfig.getChildren();
+               if (children.size() != 0)
+               {
+                  // try to find the config element for the initial
+                  // password
+                  ConfigElement passElement = children.get(0);
+                  if (passElement.getName().equals("initial-password"))
+                  {
+                     password = passElement.getValue();
+                  }
+               }
+            }
+
+            // create the Authentication instance for the "admin" user
+            AuthenticationService authService = (AuthenticationService) ctx.getBean("authenticationService");
+            authService.createAuthentication(ADMIN, password.toCharArray());
+         }
+         
+         PersonService personService = (PersonService) ctx.getBean("personService");
+         if (!personService.personExists(ADMIN))
+         {
+             // create the node to represent the Person instance for the
+             // admin user
+            Map<QName, Serializable> props = new HashMap<QName, Serializable>(7, 1.0f);
+            props.put(ContentModel.PROP_USERNAME, ADMIN);
+            props.put(ContentModel.PROP_FIRSTNAME, ADMIN_FIRSTNAME);
+            props.put(ContentModel.PROP_LASTNAME, ADMIN_LASTNAME);
+            props.put(ContentModel.PROP_HOMEFOLDER, companySpaceNodeRef);
+            props.put(ContentModel.PROP_EMAIL, "");
+            props.put(ContentModel.PROP_ORGID, "");
+          
+            personService.createPerson(props);
+         }
+         // set the store's GUEST access if we are allowed to modify permissions
+         if (!transactionService.isReadOnly())
+         {
+             PermissionService permissionService = (PermissionService) ctx.getBean("permissionService");
+             permissionService.setPermission(rootNodeRef, permissionService.getAllAuthorities(), PermissionService.GUEST, true);
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Throwable e)
+      {
+         // rollback the transaction
+         try
+         {
+            if (tx != null)
+            {
+               tx.rollback();
+            }
+         }
+         catch (Exception ex) {}
+         
+         logger.error("Failed to initialise ", e);
+         throw new AlfrescoRuntimeException("Failed to initialise ", e);
+      }
+      finally
+      {
+          try
+          {
+             authenticationComponent.clearCurrentSecurityContext();
+          }
+          catch (Exception ex) {}
+      }
+   }
+
+   /**
+    * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
+    */
+   public void contextDestroyed(ServletContextEvent event)
+   {
+      WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+      Scheduler quartz = (Scheduler) ctx.getBean("schedulerFactory");
+      try
+      {
+         quartz.shutdown(true);
+      }
+      catch (SchedulerException e)
+      {
+         // TODO Auto-generated catch block
+         e.printStackTrace();
+      }
+   }
+
+   /**
+    * Session created listener
+    */
+   public void sessionCreated(HttpSessionEvent event)
+   {
+      if (logger.isDebugEnabled()) logger.debug("HTTP session created: " + event.getSession().getId());
+   }
+
+   /**
+    * Session destroyed listener
+    */
+   public void sessionDestroyed(HttpSessionEvent event)
+   {
+      if (logger.isDebugEnabled()) logger.debug("HTTP session destroyed: " + event.getSession().getId());
+
+      User user;
+      if (Application.inPortalServer() == false)
+      {
+         user = (User)event.getSession().getAttribute(AuthenticationHelper.AUTHENTICATION_USER);
+      }
+      else
+      {
+         user = (User)event.getSession().getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + AuthenticationHelper.AUTHENTICATION_USER);
+      }
+      
+      if (user != null)
+      {
+         // invalidate ticket
+         WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+         AuthenticationService authService = (AuthenticationService) ctx.getBean("authenticationService");
+         authService.invalidateTicket(user.getTicket());
+         event.getSession().removeAttribute(AuthenticationHelper.AUTHENTICATION_USER);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/app/DebugPhaseListener.java b/source/java/org/alfresco/web/app/DebugPhaseListener.java
new file mode 100644
index 0000000000..bf76fc5600
--- /dev/null
+++ b/source/java/org/alfresco/web/app/DebugPhaseListener.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Debug phase listener that simply logs when each phase is entered and exited.
+ * 
+ * @author gavinc
+ */
+public class DebugPhaseListener implements PhaseListener
+{
+   private static final Log logger = LogFactory.getLog(DebugPhaseListener.class);
+   
+   /**
+    * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent)
+    */
+   public void afterPhase(PhaseEvent event)
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("********** Exiting phase: " + event.getPhaseId().toString());
+   }
+
+   /**
+    * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent)
+    */
+   public void beforePhase(PhaseEvent event)
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("********** Entering phase: " + event.getPhaseId().toString());
+   }
+
+   /**
+    * @see javax.faces.event.PhaseListener#getPhaseId()
+    */
+   public PhaseId getPhaseId()
+   {
+      return PhaseId.ANY_PHASE;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java
new file mode 100644
index 0000000000..7bef0b82c9
--- /dev/null
+++ b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app;
+
+import java.util.Enumeration;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
+
+/**
+ * Wrapper around Alfresco Resource Bundle objects. Used to catch and handle missing
+ * resource exception to help identify missing I18N strings in client apps.
+ * 
+ * @author Kevin Roast
+ */
+public final class ResourceBundleWrapper extends ResourceBundle
+{
+   private static Logger logger = Logger.getLogger(ResourceBundleWrapper.class);
+   private ResourceBundle delegate;
+   
+   /**
+    * Constructor
+    * 
+    * @param bundle     The ResourceBundle to route calls too
+    */
+   public ResourceBundleWrapper(ResourceBundle bundle)
+   {
+      this.delegate = bundle;
+   }
+   
+   /**
+    * @see java.util.ResourceBundle#getKeys()
+    */
+   public Enumeration<String> getKeys()
+   {
+      return this.delegate.getKeys();
+   }
+   
+   /**
+    * @see java.util.ResourceBundle#handleGetObject(java.lang.String)
+    */
+   protected Object handleGetObject(String key)
+   {
+      try
+      {
+         return this.delegate.getObject(key);
+      }
+      catch (MissingResourceException err)
+      {
+         if (logger.isEnabledFor(Priority.WARN))
+            logger.warn("Failed to find I18N message string key: " + key);
+         
+         return "$$" + key + "$$";
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/app/context/IContextListener.java b/source/java/org/alfresco/web/app/context/IContextListener.java
new file mode 100644
index 0000000000..effb091079
--- /dev/null
+++ b/source/java/org/alfresco/web/app/context/IContextListener.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.context;
+
+/**
+ * Interface used to allow Beans to register themselves as interested in UI context events.
+ * <p>
+ * Beans supporting this interface should be register against the UIContextService. Then Beans
+ * which wish to indicate that the UI should refresh itself i.e. dump all cached data and settings,
+ * call the UIContextService.notifyBeans() to inform all registered instances of the change. 
+ * 
+ * @author Kevin Roast
+ */
+public interface IContextListener
+{
+   /**
+    * Method called by UIContextService.notifyBeans() to inform all registered beans that
+    * all UI Beans should refresh dump all cached data and settings. 
+    */
+   public void contextUpdated();
+}
diff --git a/source/java/org/alfresco/web/app/context/UIContextService.java b/source/java/org/alfresco/web/app/context/UIContextService.java
new file mode 100644
index 0000000000..4335462df6
--- /dev/null
+++ b/source/java/org/alfresco/web/app/context/UIContextService.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.context;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Beans supporting the IContextListener interface are registered against this class. Then Beans
+ * which wish to indicate that the UI should refresh itself i.e. dump all cached data and settings,
+ * call the UIContextService.notifyBeans() to inform all registered instances of the change. 
+ * 
+ * @author Kevin Roast
+ */
+public final class UIContextService
+{
+   /**
+    * Private constructor
+    */
+   private UIContextService()
+   {
+   }
+   
+   /**
+    * Returns a Session local instance of the UIContextService
+    * 
+    * @return UIContextService for this Thread
+    */
+   public static UIContextService getInstance(FacesContext fc)
+   {
+      Map session = fc.getExternalContext().getSessionMap();
+      UIContextService service = (UIContextService)session.get(CONTEXT_KEY);
+      if (service == null)
+      {
+         service = new UIContextService();
+         session.put(CONTEXT_KEY, service);
+      }
+      
+      return service;
+   }
+   
+   /**
+    * Register a bean to be informed of context events
+    * 
+    * @param bean    Conforming to the IContextListener interface
+    */
+   public void registerBean(IContextListener bean)
+   {
+      if (bean == null)
+      {
+         throw new IllegalArgumentException("Bean reference specified cannot be null!");
+      }
+      
+      this.registeredBeans.put(bean.getClass(), bean);
+   }
+   
+   /**
+    * Remove a bean reference from those notified of changes
+    * 
+    * @param bean    Conforming to the IContextListener interface
+    */
+   public void unregisterBean(IContextListener bean)
+   {
+      if (bean == null)
+      {
+         throw new IllegalArgumentException("Bean reference specified cannot be null!");
+      }
+      
+      this.registeredBeans.remove(bean);
+   }
+   
+   /**
+    * Call to notify all register beans that the UI context has changed and they should
+    * refresh themselves as appropriate.
+    */
+   public void notifyBeans()
+   {
+      for (IContextListener listener: this.registeredBeans.values())
+      {
+         listener.contextUpdated();
+      }
+   }
+   
+   
+   /** key for the UI context service in the session */
+   private final static String CONTEXT_KEY = "__uiContextService";
+   
+   /** Map of bean registered against the context service */
+   private Map<Class, IContextListener> registeredBeans = new HashMap<Class, IContextListener>(7, 1.0f);
+}
diff --git a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
new file mode 100644
index 0000000000..ee8ed65ea3
--- /dev/null
+++ b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.portlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.alfresco.i18n.I18NUtil;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.AuthenticationHelper;
+import org.alfresco.web.bean.ErrorBean;
+import org.alfresco.web.bean.FileUploadBean;
+import org.alfresco.web.bean.repository.User;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+import org.apache.myfaces.portlet.PortletUtil;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * Class to extend the MyFacesGenericPortlet to provide behaviour specific to Alfresco web client.
+ * Handles upload of multi-part forms through a JSR-168 Portlet, generic error handling and session
+ * login authentication.
+ * 
+ * @author Gavin Cornwell, Kevin Roast
+ */
+public class AlfrescoFacesPortlet extends MyFacesGenericPortlet
+{
+   public static final String INSTANCE_NAME = "AlfrescoClientInstance";
+   public static final String WINDOW_NAME = "AlfrescoClientWindow";
+   public static final String MANAGED_BEAN_PREFIX = "javax.portlet.p." + INSTANCE_NAME + 
+                                                    "." + WINDOW_NAME + "?";
+   
+   private static final String ERROR_PAGE_PARAM = "error-page";
+   private static final String ERROR_OCCURRED = "error-occurred";
+   
+   private static Log logger = LogFactory.getLog(AlfrescoFacesPortlet.class);
+
+   private String loginPage = null;
+   private String errorPage = null;
+   
+   
+   /**
+    * Called by the portlet container to allow the portlet to process an action request.
+    */
+   public void processAction(ActionRequest request, ActionResponse response) 
+      throws PortletException, IOException 
+   {      
+      boolean isMultipart = PortletFileUpload.isMultipartContent(request);
+      
+      try
+      {
+         // NOTE: Due to filters not being called within portlets we can not make use
+         //       of the MyFaces file upload support, therefore we are using a pure
+         //       portlet request/action to handle file uploads until there is a 
+         //       solution.
+         
+         if (isMultipart)
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("Handling multipart request...");
+            
+            PortletSession session = request.getPortletSession();
+            
+            // get the file from the request and put it in the session
+            DiskFileItemFactory factory = new DiskFileItemFactory();
+            PortletFileUpload upload = new PortletFileUpload(factory);
+            List<FileItem> fileItems = upload.parseRequest(request);
+            Iterator<FileItem> iter = fileItems.iterator();
+            FileUploadBean bean = new FileUploadBean();
+            while(iter.hasNext())
+            {
+               FileItem item = iter.next();
+               String filename = item.getName();
+               if(item.isFormField() == false)
+               {
+                  if (logger.isDebugEnabled())
+                     logger.debug("Processing uploaded file: " + filename);
+                  
+                  // workaround a bug in IE where the full path is returned
+                  // IE is only available for Windows so only check for the Windows path separator
+                  int idx = filename.lastIndexOf('\\');
+                  
+                  if (idx == -1)
+                  {
+                     // if there is no windows path separator check for *nix
+                     idx = filename.lastIndexOf('/');
+                  }
+                  
+                  if (idx != -1)
+                  {
+                     filename = filename.substring(idx + File.separator.length());
+                  }
+                  
+                  File tempFile = TempFileProvider.createTempFile("alfresco", ".upload");
+                  item.write(tempFile);
+                  bean.setFile(tempFile);
+                  bean.setFileName(filename);
+                  bean.setFilePath(tempFile.getAbsolutePath());
+                  session.setAttribute(FileUploadBean.FILE_UPLOAD_BEAN_NAME, bean, 
+                                       PortletSession.PORTLET_SCOPE);
+               }
+            }
+            
+            // it doesn't matter what the value is we just need the VIEW_ID parameter
+            // to tell the faces portlet bridge to treat the request as a JSF request,
+            // this will send us back to the same page we came from, which is fine for
+            // most scenarios.
+            response.setRenderParameter(VIEW_ID, "a-jsf-page");
+         }
+         else
+         {
+            // do the normal JSF processing
+            super.processAction(request, response);
+         }
+      }
+      catch (Throwable e)
+      {
+         if (getErrorPage() != null)
+         {
+            handleError(request, response, e);
+         }
+         else
+         {
+            logger.warn("No error page configured, re-throwing exception");
+            
+            if (e instanceof PortletException)
+            {
+               throw (PortletException)e;
+            }
+            else if (e instanceof IOException)
+            {
+               throw (IOException)e;
+            }
+            else
+            {
+               throw new PortletException(e);
+            }
+         }
+      }
+   }
+
+   /**
+    * @see org.apache.myfaces.portlet.MyFacesGenericPortlet#facesRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
+    */
+   protected void facesRender(RenderRequest request, RenderResponse response) 
+      throws PortletException, IOException
+   {
+      Application.setInPortalServer(true);
+      
+      if (request.getParameter(ERROR_OCCURRED) != null)
+      {
+         String errorPage = Application.getErrorPage(getPortletContext());
+         
+         if (logger.isDebugEnabled())
+            logger.debug("An error has occurred, redirecting to error page: " + errorPage);
+         
+         response.setContentType("text/html");
+         PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(errorPage);
+         dispatcher.include(request, response);
+      }
+      else
+      {
+         // if we have no User object in the session then a timeout must have occured
+         // use the viewId to check that we are not already on the login page
+         String viewId = request.getParameter(VIEW_ID);
+         User user = (User)request.getPortletSession().getAttribute(AuthenticationHelper.AUTHENTICATION_USER);
+         if (user == null && (viewId == null || viewId.equals(getLoginPage()) == false))
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("No valid login, requesting login page. ViewId: " + viewId);
+            
+            // login page redirect
+            response.setContentType("text/html");
+            request.getPortletSession().setAttribute(PortletUtil.PORTLET_REQUEST_FLAG, "true");
+            nonFacesRequest(request, response);
+         }
+         else
+         {
+            try
+            {
+               if (user != null)
+               {
+                  // setup the authentication context
+                  WebApplicationContext ctx = (WebApplicationContext)getPortletContext().getAttribute(
+                        WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+                  AuthenticationService auth = (AuthenticationService)ctx.getBean("authenticationService");
+                  auth.validate(user.getTicket());
+               }
+               
+               // Set the current locale
+               I18NUtil.setLocale(Application.getLanguage(request.getPortletSession()));
+               
+               // do the normal JSF processing
+               super.facesRender(request, response);
+            }
+            catch (Throwable e)
+            {
+               if (getErrorPage() != null)
+               {
+                  handleError(request, response, e);
+               }
+               else
+               {
+                  logger.warn("No error page configured, re-throwing exception");
+                  
+                  if (e instanceof PortletException)
+                  {
+                     throw (PortletException)e;
+                  }
+                  else if (e instanceof IOException)
+                  {
+                     throw (IOException)e;
+                  }
+                  else
+                  {
+                     throw new PortletException(e);
+                  }
+               }
+            }
+         }
+      }
+   }
+   
+   /**
+    * Handles errors that occur during a process action request
+    */
+   private void handleError(ActionRequest request, ActionResponse response, Throwable error)
+      throws PortletException, IOException
+   {
+      // get the error bean from the session and set the error that occurred.
+      PortletSession session = request.getPortletSession();
+      ErrorBean errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME, 
+                             PortletSession.PORTLET_SCOPE);
+      if (errorBean == null)
+      {
+         errorBean = new ErrorBean();
+         session.setAttribute(ErrorBean.ERROR_BEAN_NAME, errorBean, PortletSession.PORTLET_SCOPE);
+      }
+      errorBean.setLastError(error);
+      
+      response.setRenderParameter(ERROR_OCCURRED, "true");
+   }
+   
+   /**
+    * Handles errors that occur during a render request
+    */
+   private void handleError(RenderRequest request, RenderResponse response, Throwable error)
+      throws PortletException, IOException
+   {
+      // get the error bean from the session and set the error that occurred.
+      PortletSession session = request.getPortletSession();
+      ErrorBean errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME, 
+                             PortletSession.PORTLET_SCOPE);
+      if (errorBean == null)
+      {
+         errorBean = new ErrorBean();
+         session.setAttribute(ErrorBean.ERROR_BEAN_NAME, errorBean, PortletSession.PORTLET_SCOPE);
+      }
+      errorBean.setLastError(error);
+
+      // if the faces context is available set the current view to the browse page
+      // so that the error page goes back to the application (rather than going back
+      // to the same page which just throws the error again meaning we can never leave
+      // the error page)
+      FacesContext context = FacesContext.getCurrentInstance();
+      if (context != null)
+      {
+         ViewHandler viewHandler = context.getApplication().getViewHandler();
+         // TODO: configure the portlet error return page
+         UIViewRoot view = viewHandler.createView(context, "/jsp/browse/browse.jsp");
+         context.setViewRoot(view);
+      }
+
+      // get the error page and include that instead
+      String errorPage = getErrorPage();
+      
+      if (logger.isDebugEnabled())
+         logger.debug("An error has occurred, redirecting to error page: " + errorPage);
+      
+      response.setContentType("text/html");
+      PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(errorPage);
+      dispatcher.include(request, response);
+   }
+   
+   /**
+    * @return Retrieves the configured login page
+    */
+   private String getLoginPage()
+   {
+      if (this.loginPage == null)
+      {
+         this.loginPage = Application.getLoginPage(getPortletContext());
+      }
+      
+      return this.loginPage;
+   }
+   
+   /**
+    * @return Retrieves the configured error page
+    */
+   private String getErrorPage()
+   {
+      if (this.errorPage == null)
+      {
+         this.errorPage = Application.getErrorPage(getPortletContext());
+      }
+      
+      return this.errorPage;
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/AlfrescoFacesServlet.java b/source/java/org/alfresco/web/app/servlet/AlfrescoFacesServlet.java
new file mode 100644
index 0000000000..a0cfba6b3c
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/AlfrescoFacesServlet.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.faces.webapp.FacesServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.web.app.Application;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Wrapper around standard faces servlet to provide error handling
+ * 
+ * @author gavinc
+ */
+public class AlfrescoFacesServlet extends FacesServlet
+{
+   private static Log logger = LogFactory.getLog(AlfrescoFacesServlet.class);
+   
+   /**
+    * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+    */
+   public void service(ServletRequest request, ServletResponse response) 
+      throws IOException, ServletException
+   {
+      try
+      {
+         super.service(request, response);
+      }
+      catch (Throwable error)
+      {
+         String returnPage = ((HttpServletRequest)request).getRequestURI();
+         
+         Application.handleServletError(getServletConfig().getServletContext(), (HttpServletRequest)request,
+               (HttpServletResponse)response, error, logger, returnPage);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
new file mode 100644
index 0000000000..280d681cce
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.LoginBean;
+
+/**
+ * @author Kevin Roast
+ * 
+ * Servlet filter responsible for redirecting to the login page for the Web Client if the user
+ * does not have a valid ticket.
+ * <p>
+ * The current ticker is validated for each page request and the login page is shown if the
+ * ticker has expired.
+ * <p>
+ * Note that this filter is only active when the system is running in a servlet container -
+ * the AlfrescoFacesPortlet will be used for a JSR-168 Portal environment.
+ */
+public class AuthenticationFilter implements Filter
+{
+   /**
+    * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+    */
+   public void init(FilterConfig config) throws ServletException
+   {
+      this.context = config.getServletContext();
+   }
+
+   /**
+    * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+    */
+   public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+         throws IOException, ServletException
+   {
+      HttpServletRequest httpReq = (HttpServletRequest)req;
+      
+      // allow the login page to proceed
+      if (httpReq.getRequestURI().endsWith(getLoginPage()) == false)
+      {
+         if (AuthenticationHelper.authenticate(this.context, httpReq, (HttpServletResponse)res))
+         {
+            // continue filter chaining
+            chain.doFilter(req, res);
+         }
+         else
+         {
+            // failed to authenticate - save redirect URL for after login process
+            httpReq.getSession().setAttribute(LoginBean.LOGIN_REDIRECT_KEY, httpReq.getRequestURI());
+         }
+      }
+      else
+      {
+         // continue filter chaining
+         chain.doFilter(req, res);
+      }
+   }
+
+   /**
+    * @see javax.servlet.Filter#destroy()
+    */
+   public void destroy()
+   {
+      // nothing to do
+   }
+   
+   /**
+    * @return The login page url
+    */
+   private String getLoginPage()
+   {
+      if (this.loginPage == null)
+      {
+         this.loginPage = Application.getLoginPage(this.context);
+      }
+      
+      return this.loginPage;
+   }
+   
+   
+   private String loginPage = null;
+   
+   private ServletContext context;
+}
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
new file mode 100644
index 0000000000..85b19289d1
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.i18n.I18NUtil;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.portlet.AlfrescoFacesPortlet;
+import org.alfresco.web.bean.repository.User;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author Kevin Roast
+ */
+public final class AuthenticationHelper
+{
+   public final static String AUTHENTICATION_USER = "_alfAuthTicket";
+   
+   public static boolean authenticate(ServletContext context, HttpServletRequest httpRequest, HttpServletResponse httpResponse)
+      throws IOException
+   {
+      // examine the appropriate session for our User object
+      User user;
+      if (Application.inPortalServer() == false)
+      {
+         user = (User)httpRequest.getSession().getAttribute(AUTHENTICATION_USER);
+      }
+      else
+      {
+         user = (User)httpRequest.getSession().getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + AUTHENTICATION_USER);
+      }
+      
+      if (user == null)
+      {
+         // no user/ticket - redirect to login page
+         httpResponse.sendRedirect(httpRequest.getContextPath() + "/faces" + Application.getLoginPage(context));
+         
+         return false;
+      }
+      else
+      {
+         // setup the authentication context
+         WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
+         AuthenticationService auth = (AuthenticationService)ctx.getBean("authenticationService");
+         auth.validate(user.getTicket());
+         
+         // Set the current locale
+         I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
+         
+         return true;
+      }
+   }
+   
+   public static boolean authenticate(ServletContext context, HttpServletRequest httpRequest, HttpServletResponse httpResponse, String ticket)
+      throws IOException
+   {
+      // setup the authentication context
+      WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
+      AuthenticationService auth = (AuthenticationService)ctx.getBean("authenticationService");
+      try
+      {
+         auth.validate(ticket);
+      }
+      catch (AuthenticationException authErr)
+      {
+         return false;
+      }
+      
+      // Set the current locale
+      I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
+      
+      return true;
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
new file mode 100644
index 0000000000..a9aeceb7f0
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.SocketException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.LoginBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Servlet responsible for streaming node content from the repo directly to the response stream.
+ * The appropriate mimetype is calculated based on filename extension.
+ * <p>
+ * The URL to the servlet should be generated thus:
+ * <pre>/alfresco/download/attach/workspace/SpacesStore/0000-0000-0000-0000/myfile.pdf</pre>
+ * or
+ * <pre>/alfresco/download/direct/workspace/SpacesStore/0000-0000-0000-0000/myfile.pdf</pre>
+ * <p>
+ * The store protocol, followed by the store ID, followed by the content Node Id
+ * the last element is used for mimetype calculation and browser default filename.
+ * <p>
+ * The 'attach' or 'direct' element is used to indicate whether to display the stream directly
+ * in the browser or download it as a file attachment.
+ * <p>
+ * By default, the download assumes that the content is on the
+ * {@link org.alfresco.model.ContentModel#PROP_CONTENT content property}.<br>
+ * To retrieve the content of a specific model property, use a 'property' arg, providing the workspace,
+ * node ID AND the qualified name of the property.
+ * <p>
+ * The URL may be followed by a valid ticket argument for authentication: ?ticket=1234567890 
+ * 
+ * @author Kevin Roast
+ */
+public class DownloadContentServlet extends HttpServlet
+{
+   private static final long serialVersionUID = -4558907921887235966L;
+   
+   private static Log logger = LogFactory.getLog(DownloadContentServlet.class);
+   
+   private static final String DOWNLOAD_URL  = "/download/attach/{0}/{1}/{2}/{3}";
+   private static final String BROWSER_URL   = "/download/direct/{0}/{1}/{2}/{3}";
+   
+   private static final String MIMETYPE_OCTET_STREAM = "application/octet-stream";
+   
+   private static final String MSG_ERROR_CONTENT_MISSING = "error_content_missing";
+   
+   private static final String ARG_PROPERTY = "property";
+   private static final String ARG_ATTACH   = "attach";
+   private static final String ARG_TICKET   = "ticket";
+   
+   /**
+    * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+    */
+   protected void doGet(HttpServletRequest req, HttpServletResponse res)
+      throws ServletException, IOException
+   {
+      ServletOutputStream out = res.getOutputStream();
+      
+      try
+      {
+         // The URL contains multiple parts
+         // /alfresco/download/attach/workspace/SpacesStore/0000-0000-0000-0000/myfile.pdf
+         // the protocol, followed by the store, followed by the Id
+         // the last part is only used for mimetype and browser use
+         // may be followed by valid ticket for pre-authenticated usage: ?ticket=1234567890 
+         String uri = req.getRequestURI();
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Processing URL: " + uri + (req.getQueryString() != null ? ("?" + req.getQueryString()) : ""));
+         
+         // see if a ticket has been supplied
+         String ticket = req.getParameter(ARG_TICKET);
+         if (ticket == null || ticket.length() == 0)
+         {
+            if (AuthenticationHelper.authenticate(getServletContext(), req, res) == false)
+            {
+               // authentication failed - no point returning the content as we haven't logged in yet
+               // so end servlet execution and save the URL so the login page knows what to do later
+               req.getSession().setAttribute(LoginBean.LOGIN_REDIRECT_KEY, uri);
+               return;
+            }
+         }
+         else
+         {
+            AuthenticationHelper.authenticate(getServletContext(), req, res, ticket);
+         }
+         
+         // TODO: add compression here?
+         //       see http://servlets.com/jservlet2/examples/ch06/ViewResourceCompress.java for example
+         //       only really needed if we don't use the built in compression of the servlet container
+         StringTokenizer t = new StringTokenizer(uri, "/");
+         if (t.countTokens() < 7)
+         {
+            throw new IllegalArgumentException("Download URL did not contain all required args: " + uri); 
+         }
+         
+         t.nextToken();    // skip web app name
+         t.nextToken();    // skip servlet name
+         
+         String attachToken = t.nextToken();
+         boolean attachment = attachToken.equals(ARG_ATTACH);
+         
+         StoreRef storeRef = new StoreRef(t.nextToken(), t.nextToken());
+         String id = t.nextToken();
+         String filename = t.nextToken();
+         
+         // get property qualified name
+         QName propertyQName = null;
+         String property = req.getParameter(ARG_PROPERTY);
+         if (property == null || property.length() == 0)
+         {
+             propertyQName = ContentModel.PROP_CONTENT;
+         }
+         else
+         {
+             propertyQName = QName.createQName(property);
+         }
+         
+         NodeRef nodeRef = new NodeRef(storeRef, id);
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("Found NodeRef: " + nodeRef.toString());
+            logger.debug("Will use filename: " + filename);
+            logger.debug("For property: " + propertyQName);
+            logger.debug("With attachment mode: " + attachment);
+         }
+         
+         if (attachment == true)
+         {
+            // set header based on filename - will force a Save As from the browse if it doesn't recognise it
+            // this is better than the default response of the browse trying to display the contents!
+            // TODO: make this configurable - and check it does not prevent streaming of large files
+            res.setHeader("Content-Disposition", "attachment;filename=\"" + URLDecoder.decode(filename, "UTF-8") + '"');
+         }
+         
+         // get the services we need to retrieve the content
+         WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
+         ServiceRegistry serviceRegistry = (ServiceRegistry)context.getBean(ServiceRegistry.SERVICE_REGISTRY);
+         ContentService contentService = serviceRegistry.getContentService();
+         
+         // get the content reader
+         ContentReader reader = contentService.getReader(nodeRef, propertyQName);
+         // ensure that it is safe to use
+         reader = FileContentReader.getSafeContentReader(
+                    reader,
+                    Application.getMessage(req.getSession(), MSG_ERROR_CONTENT_MISSING),
+                    nodeRef, reader);
+         
+         String mimetype = reader.getMimetype();
+         // fall back if unable to resolve mimetype property
+         if (mimetype == null || mimetype.length() == 0)
+         {
+            MimetypeService mimetypeMap = serviceRegistry.getMimetypeService();
+            mimetype = MIMETYPE_OCTET_STREAM;
+            int extIndex = filename.lastIndexOf('.');
+            if (extIndex != -1)
+            {
+               String ext = filename.substring(extIndex + 1);
+               String mt = mimetypeMap.getMimetypesByExtension().get(ext);
+               if (mt != null)
+               {
+                  mimetype = mt;
+               }
+            }
+         }
+         res.setContentType(mimetype);
+         
+         // get the content and stream directly to the response output stream
+         // assuming the repo is capable of streaming in chunks, this should allow large files
+         // to be streamed directly to the browser response stream.
+         try
+         {
+            reader.getContent( res.getOutputStream() );
+         }
+         catch (SocketException e)
+         {
+            if (e.getMessage().contains("ClientAbortException"))
+            {
+               // the client cut the connection - our mission was accomplished apart from a little error message
+               logger.error("Client aborted stream read:\n   node: " + nodeRef + "\n   content: " + reader);
+            }
+            else
+            {
+               throw e;
+            }
+         }
+      }
+      catch (Throwable err)
+      {
+         throw new AlfrescoRuntimeException("Error during download content servlet processing: " + err.getMessage(), err);
+      }
+      finally
+      {
+         out.close();
+      }
+   }
+   
+   /**
+    * Helper to generate a URL to a content node for downloading content from the server.
+    * The content is supplied as an HTTP1.1 attachment to the response. This generally means
+    * a browser should prompt the user to save the content to specified location.
+    * 
+    * @param ref     NodeRef of the content node to generate URL for (cannot be null)
+    * @param name    File name to return in the URL (cannot be null)
+    * 
+    * @return URL to download the content from the specified node
+    */
+   public final static String generateDownloadURL(NodeRef ref, String name)
+   {
+      String url = null;
+      
+      try
+      {
+         url = MessageFormat.format(DOWNLOAD_URL, new Object[] {
+                  ref.getStoreRef().getProtocol(),
+                  ref.getStoreRef().getIdentifier(),
+                  ref.getId(),
+                  URLEncoder.encode(name, "US-ASCII") } );
+      }
+      catch (UnsupportedEncodingException uee)
+      {
+         throw new AlfrescoRuntimeException("Failed to encode content URL for node: " + ref, uee);
+      }
+      
+      return url;
+   }
+   
+   /**
+    * Helper to generate a URL to a content node for downloading content from the server.
+    * The content is supplied directly in the reponse. This generally means a browser will
+    * attempt to open the content directly if possible, else it will prompt to save the file.
+    * 
+    * @param ref     NodeRef of the content node to generate URL for (cannot be null)
+    * @param name    File name to return in the URL (cannot be null)
+    * 
+    * @return URL to download the content from the specified node
+    */
+   public final static String generateBrowserURL(NodeRef ref, String name)
+   {
+      String url = null;
+      
+      try
+      {
+         url = MessageFormat.format(BROWSER_URL, new Object[] {
+                  ref.getStoreRef().getProtocol(),
+                  ref.getStoreRef().getIdentifier(),
+                  ref.getId(),
+                  URLEncoder.encode(name, "US-ASCII") } );
+      }
+      catch (UnsupportedEncodingException uee)
+      {
+         throw new AlfrescoRuntimeException("Failed to encode content URL for node: " + ref, uee);
+      }
+      
+      return url;
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
new file mode 100644
index 0000000000..866344edc4
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.web.bean.LoginBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Servlet allowing external URL access to various global JSF views in the Web Client.
+ * <p>
+ * The servlet accepts a well formed URL that can easily be generated from a Content or Space NodeRef.
+ * The URL also specifies the JSF "outcome" to be executed which provides the correct JSF View to be
+ * displayed. The JSF "outcome" must equate to a global navigation rule or it will not be displayed.
+ * Servlet URL is of the form:
+ * <p>
+ * <code>http://&lt;server&gt;/alfresco/navigate/&lt;outcome&gt;[/&lt;workspace&gt;/&lt;store&gt;/&lt;nodeId&gt;]</code> or <br/>
+ * <code>http://&lt;server&gt;/alfresco/navigate/&lt;outcome&gt;[/webdav/&lt;path/to/node&gt;]</code>
+ * </p>
+ * 
+ * @author Kevin Roast
+ */
+public class ExternalAccessServlet extends HttpServlet
+{
+   private static final long serialVersionUID = -4118907921337237802L;
+   
+   private static Log logger = LogFactory.getLog(ExternalAccessServlet.class);
+   
+   
+   /**
+    * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+    */
+   protected void service(HttpServletRequest req, HttpServletResponse res)
+      throws ServletException, IOException
+   {
+      boolean alreadyAuthenticated = AuthenticationHelper.authenticate(getServletContext(), req, res);
+      
+      // The URL contains multiple parts
+      // /alfresco/navigate/<outcome>
+      String uri = req.getRequestURI();
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Processing URL: " + uri);
+      
+      StringTokenizer t = new StringTokenizer(uri, "/");
+      int count = t.countTokens();
+      if (count < 3)
+      {
+         throw new IllegalArgumentException("Externally addressable URL did not contain all required args: " + uri); 
+      }
+      t.nextToken();    // skip web app name
+      t.nextToken();    // skip servlet name
+      
+      String outcome = t.nextToken();
+      
+      // get rest of the tokens
+      String[] tokens = new String[count - 3];
+      for (int i=0; i<count - 3; i++)
+      {
+         tokens[i] = t.nextToken();
+      }
+      
+      // set the session variable so the login bean knows which outcome to use
+      req.getSession().setAttribute(LoginBean.LOGIN_OUTCOME_KEY, outcome);
+      
+      // set the args if any
+      req.getSession().setAttribute(LoginBean.LOGIN_OUTCOME_ARGS, tokens);
+      
+      if (alreadyAuthenticated)
+      {
+         // clear the User object from the Session - this will force a relogin
+         // we do this so the outcome from the login page can then be changed
+         req.getSession().removeAttribute(AuthenticationHelper.AUTHENTICATION_USER);
+         
+         if (logger.isDebugEnabled())
+           logger.debug("Removing User session - will redirect via login page...");
+         
+         // redirect to root URL will force the login page to appear via the Authentication Filter
+         res.sendRedirect(req.getContextPath());
+      }
+   }
+   
+   /**
+    * Generate a URL to the External Access Servlet.
+    * Allows access to JSF views (via an "outcome" ID) from external URLs.
+    * 
+    * @param outcome
+    * @param args
+    * 
+    * @return URL
+    */
+   public final static String generateExternalURL(String outcome, String args)
+   {
+      if (args == null)
+      {
+         return MessageFormat.format(EXTERNAL_URL, new Object[] {outcome} );
+      }
+      else
+      {
+         return MessageFormat.format(EXTERNAL_URL_ARGS, new Object[] {outcome, args} );
+      }
+   }
+   
+   // example: http://<server>/alfresco/navigate/<outcome>[/<workspace>/<store>/<nodeId>]
+   private static final String EXTERNAL_URL  = "/navigate/{0}";
+   private static final String EXTERNAL_URL_ARGS  = "/navigate/{0}/{1}";
+}
diff --git a/source/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java b/source/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java
new file mode 100644
index 0000000000..efafd0eb1d
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/ModeDetectionFilter.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.alfresco.web.app.Application;
+
+
+/**
+ * Filter that determines whether the application is running inside a portal
+ * server or servlet engine. The fact that this filter gets called means
+ * the application is running inside a servlet engine. 
+ *  
+ * @author gavinc
+ */
+public class ModeDetectionFilter implements Filter
+{  
+   /**
+    * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+    */
+   public void init(FilterConfig config) throws ServletException
+   {
+      // nothing to do
+   }
+
+   /**
+    * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+    */
+   public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+         throws IOException, ServletException
+   {
+      // as we get here means we are inside a servlet engine as portal servers 
+      // do not support the calling of filters yet
+      Application.setInPortalServer(false);
+      
+      // continue filter chaining
+      chain.doFilter(req, res);
+   }
+
+   /**
+    * @see javax.servlet.Filter#destroy()
+    */
+   public void destroy()
+   {
+      // nothing to do
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
new file mode 100644
index 0000000000..27a51fbc46
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.net.SocketException;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.template.DateCompareMethod;
+import org.alfresco.repo.template.HasAspectMethod;
+import org.alfresco.repo.template.I18NMessageMethod;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.TemplateException;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.repository.TemplateService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.LoginBean;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Servlet responsible for streaming content from a template processed against a node directly
+ * to the response stream.
+ * <p>
+ * The URL to the servlet should be generated thus:
+ * <pre>/alfresco/template/workspace/SpacesStore/0000-0000-0000-0000
+ * or
+ * <pre>/alfresco/template/workspace/SpacesStore/0000-0000-0000-0000/workspace/SpacesStore/0000-0000-0000-0000
+ * <p>
+ * The store protocol, followed by the store ID, followed by the content Node Id used to
+ * identify the node to execute the default template for. The second set of elements encode
+ * the store and node Id of the template to used if a default is not set or not requested.
+ * <p>
+ * The URL may be followed by a valid 'ticket' argument for authentication: ?ticket=1234567890
+ * <br>
+ * And may be followed by a 'mimetype' argument specifying the mimetype to return the result as
+ * on the stream. Otherwise it is assumed that HTML is the default response mimetype.
+ * 
+ * @author Kevin Roast
+ */
+public class TemplateContentServlet extends HttpServlet
+{
+   private static final String MIMETYPE_HTML = "text/html";
+
+   private static final long serialVersionUID = -4123407921997235977L;
+   
+   private static Log logger = LogFactory.getLog(TemplateContentServlet.class);
+   
+   private static final String DEFAULT_URL  = "/template/{0}/{1}/{2}";
+   private static final String TEMPALTE_URL = "/template/{0}/{1}/{2}/{3}/{4}/{5}";
+   
+   private static final String MSG_ERROR_CONTENT_MISSING = "error_content_missing";
+   
+   private static final String ARG_TICKET   = "ticket";
+   private static final String ARG_MIMETYPE = "mimetype";
+   
+   /**
+    * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+    */
+   protected void doGet(HttpServletRequest req, HttpServletResponse res)
+      throws ServletException, IOException
+   {
+      try
+      {
+         String uri = req.getRequestURI();
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Processing URL: " + uri + (req.getQueryString() != null ? ("?" + req.getQueryString()) : ""));
+         
+         // see if a ticket has been supplied
+         String ticket = req.getParameter(ARG_TICKET);
+         if (ticket == null || ticket.length() == 0)
+         {
+            if (AuthenticationHelper.authenticate(getServletContext(), req, res) == false)
+            {
+               // authentication failed - no point returning the content as we haven't logged in yet
+               // so end servlet execution and save the URL so the login page knows what to do later
+               req.getSession().setAttribute(LoginBean.LOGIN_REDIRECT_KEY, uri);
+               return;
+            }
+         }
+         else
+         {
+            AuthenticationHelper.authenticate(getServletContext(), req, res, ticket);
+         }
+         
+         StringTokenizer t = new StringTokenizer(uri, "/");
+         int tokenCount = t.countTokens();
+         if (tokenCount < 5)
+         {
+            throw new IllegalArgumentException("Download URL did not contain all required args: " + uri); 
+         }
+         
+         t.nextToken();    // skip web app name
+         t.nextToken();    // skip servlet name
+         
+         // get NodeRef to the content
+         StoreRef storeRef = new StoreRef(t.nextToken(), t.nextToken());
+         NodeRef nodeRef = new NodeRef(storeRef, t.nextToken());
+         
+         // get NodeRef to the template if supplied
+         NodeRef templateRef = null;
+         if (tokenCount == 8)
+         {
+            storeRef = new StoreRef(t.nextToken(), t.nextToken());
+            templateRef = new NodeRef(storeRef, t.nextToken());
+         }
+         
+         // get the services we need to retrieve the content
+         WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
+         ServiceRegistry serviceRegistry = (ServiceRegistry)context.getBean(ServiceRegistry.SERVICE_REGISTRY);
+         NodeService nodeService = serviceRegistry.getNodeService();
+         TemplateService templateService = serviceRegistry.getTemplateService();
+         
+         UserTransaction txn = null;
+         try
+         {
+            txn = serviceRegistry.getTransactionService().getUserTransaction(true);
+            txn.begin();
+            
+            // if template not supplied, then use the default against the node
+            if (templateRef == null)
+            {
+               if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPLATABLE))
+               {
+                  templateRef = (NodeRef)nodeService.getProperty(nodeRef, ContentModel.PROP_TEMPLATE);
+               }
+               if (templateRef == null)
+               {
+                  throw new TemplateException("Template reference not set against node or not supplied in URL.");
+               }
+            }
+            
+            // create the model - put the supplied noderef in as space/document as appropriate
+            Object model = getModel(serviceRegistry, req.getSession(), nodeRef);
+            
+            // process the template against the node content directly to the response output stream
+            // assuming the repo is capable of streaming in chunks, this should allow large files
+            // to be streamed directly to the browser response stream.
+            try
+            {
+               templateService.processTemplate(
+                     null,
+                     templateRef.toString(),
+                     model,
+                     res.getWriter());
+               
+               // commit the transaction
+               txn.commit();
+            }
+            catch (SocketException e)
+            {
+               if (e.getMessage().contains("ClientAbortException"))
+               {
+                  // the client cut the connection - our mission was accomplished apart from a little error message
+                  logger.error("Client aborted stream read:\n   node: " + nodeRef + "\n   template: " + templateRef);
+                  try { if (txn != null) {txn.rollback();} } catch (Exception tex) {}
+               }
+               else
+               {
+                  throw e;
+               }
+            }
+         }
+         catch (Throwable txnErr)
+         {
+            try { if (txn != null) {txn.rollback();} } catch (Exception tex) {}
+         }
+      }
+      catch (Throwable err)
+      {
+         throw new AlfrescoRuntimeException("Error during download content servlet processing: " + err.getMessage(), err);
+      }
+   }
+   
+   private Object getModel(ServiceRegistry services, HttpSession session, NodeRef nodeRef)
+   {
+      // create FreeMarker default model and merge
+      Map root = new HashMap(11, 1.0f);
+      
+      // supply the CompanyHome space as "companyhome"
+      NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+      TemplateNode companyRootNode = new TemplateNode(companyRootRef, services, imageResolver);
+      root.put("companyhome", companyRootNode);
+      
+      // supply the users Home Space as "userhome"
+      User user = Application.getCurrentUser(session);
+      NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
+      TemplateNode userRootNode = new TemplateNode(userRootRef, services, imageResolver);
+      root.put("userhome", userRootNode);
+      
+      // put the current NodeRef in as "space" and "document"
+      TemplateNode node = new TemplateNode(nodeRef, services, imageResolver);
+      root.put("space", node);
+      root.put("document", node);
+      
+      // supply the current user Node as "person"
+      root.put("person", new TemplateNode(user.getPerson(), services, imageResolver));
+      
+      // current date/time is useful to have and isn't supplied by FreeMarker by default
+      root.put("date", new Date());
+      
+      // add custom method objects
+      root.put("hasAspect", new HasAspectMethod());
+      root.put("message", new I18NMessageMethod());
+      root.put("dateCompare", new DateCompareMethod());
+      
+      return root;
+   }
+   
+   /** Template Image resolver helper */
+   private TemplateImageResolver imageResolver = new TemplateImageResolver()
+   {
+       public String resolveImagePathForName(String filename, boolean small)
+       {
+           return Utils.getFileTypeImage(filename, small);
+       }
+   };
+   
+   /**
+    * Helper to generate a URL to a content node for downloading content from the server.
+    * The content is supplied as an HTTP1.1 attachment to the response. This generally means
+    * a browser should prompt the user to save the content to specified location.
+    * 
+    * @param ref     NodeRef of the content node to generate URL for (cannot be null)
+    * @param name    File name to return in the URL (cannot be null)
+    * 
+    * @return URL to download the content from the specified node
+    */
+   public final static String generateURL(NodeRef ref, String name)
+   {
+      return MessageFormat.format(DEFAULT_URL, new Object[] {
+                ref.getStoreRef().getProtocol(),
+                ref.getStoreRef().getIdentifier(),
+                ref.getId() } );
+   }
+}
diff --git a/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
new file mode 100644
index 0000000000..18fae11f39
--- /dev/null
+++ b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.FileUploadBean;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Servlet that takes a file uploaded via a browser and represents it as an
+ * UploadFileBean in the session
+ * 
+ * @author gavinc
+ */
+public class UploadFileServlet extends HttpServlet
+{
+   private static final long serialVersionUID = -5482538466491052873L;
+   private static Log logger = LogFactory.getLog(UploadFileServlet.class); 
+   
+   /**
+    * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+    */
+   protected void service(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException
+   {
+      String returnPage = null;
+      boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+      
+      try
+      {
+         AuthenticationHelper.authenticate(getServletContext(), request, response);
+         
+         if (isMultipart == false)
+         {
+            throw new AlfrescoRuntimeException("This servlet can only be used to handle file upload requests, make" +
+                                        "sure you have set the enctype attribute on your form to multipart/form-data");
+         }
+
+         if (logger.isDebugEnabled())
+            logger.debug("Uploading servlet servicing...");
+         
+         HttpSession session = request.getSession();
+         ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
+         List<FileItem> fileItems = upload.parseRequest(request);
+         
+         Iterator<FileItem> iter = fileItems.iterator();
+         FileUploadBean bean = new FileUploadBean();
+         while(iter.hasNext())
+         {
+            FileItem item = iter.next();
+            if(item.isFormField())
+            {
+               if (item.getFieldName().equalsIgnoreCase("return-page"))
+               {
+                  returnPage = item.getString();
+               }
+            }
+            else
+            {
+               String filename = item.getName();
+               if (filename != null && filename.length() != 0)
+               {
+                  if (logger.isDebugEnabled())
+                     logger.debug("Processing uploaded file: " + filename);
+                  
+                  // workaround a bug in IE where the full path is returned
+                  // IE is only available for Windows so only check for the Windows path separator
+                  int idx = filename.lastIndexOf('\\');
+                  
+                  if (idx == -1)
+                  {
+                     // if there is no windows path separator check for *nix
+                     idx = filename.lastIndexOf('/');
+                  }
+                  
+                  if (idx != -1)
+                  {
+                     filename = filename.substring(idx + File.separator.length());
+                  }
+                  
+                  File tempFile = TempFileProvider.createTempFile("alfresco", ".upload");
+                  item.write(tempFile);
+                  bean.setFile(tempFile);
+                  bean.setFileName(filename);
+                  bean.setFilePath(tempFile.getAbsolutePath());
+                  session.setAttribute(FileUploadBean.FILE_UPLOAD_BEAN_NAME, bean);
+                  if (logger.isDebugEnabled())
+                     logger.debug("Temp file: " + tempFile.getAbsolutePath() + " created from upload filename: " + filename);
+               }
+            }
+         }
+         
+         if (returnPage == null || returnPage.length() == 0)
+         {
+            throw new AlfrescoRuntimeException("return-page parameter has not been supplied");
+         }
+
+         // finally redirect
+         if (logger.isDebugEnabled())
+            logger.debug("Upload servicing complete, redirecting to: " + returnPage);
+
+         response.sendRedirect(returnPage);
+      }
+      catch (Throwable error)
+      {
+         Application.handleServletError(getServletContext(), (HttpServletRequest)request,
+               (HttpServletResponse)response, error, logger, returnPage);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/AdminBean.java b/source/java/org/alfresco/web/bean/AdminBean.java
new file mode 100644
index 0000000000..0be3526671
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/AdminBean.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.config.xml.XMLConfigService;
+import org.alfresco.web.app.Application;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Bean used for administration purposes
+ * 
+ * @author gavinc
+ */
+public class AdminBean
+{
+   /**
+    * Resets the config service
+    * 
+    * @param event Event that caused the request for the reset
+    */
+   public void resetConfigService(ActionEvent event)
+   {
+      // get the config service
+      XMLConfigService configSvc = (XMLConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+            FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+      
+      // reset it
+      configSvc.reset();
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/AdminNodeBrowseBean.java b/source/java/org/alfresco/web/bean/AdminNodeBrowseBean.java
new file mode 100644
index 0000000000..57653e02c0
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/AdminNodeBrowseBean.java
@@ -0,0 +1,741 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.search.ISO9075;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
+
+
+// TODO: DownloadServlet - use of request parameter for property name?
+// TODO: Anyway to switch content view url link / property value text?
+
+
+/**
+ * Backing bean to support the Admin Node Browser
+ */
+public class AdminNodeBrowseBean
+{
+    /** selected query language */
+    private String queryLanguage = null;
+
+    /** available query languages */
+    private static List<SelectItem> queryLanguages = new ArrayList<SelectItem>();
+    static
+    {
+        queryLanguages.add(new SelectItem("noderef"));
+        queryLanguages.add(new SelectItem(SearchService.LANGUAGE_XPATH));
+        queryLanguages.add(new SelectItem(SearchService.LANGUAGE_LUCENE));
+    }
+
+    // query and results
+    private String query = null;
+    private SearchResults searchResults = new SearchResults(null);
+    
+    // stores and node
+    private DataModel stores = null;
+    private NodeRef nodeRef = null;
+    private QName nodeType = null;
+    private Path primaryPath = null;
+    private DataModel parents = null;
+    private DataModel aspects = null;
+    private DataModel properties = null;
+    private DataModel children = null;
+    private DataModel assocs = null;
+    
+    // supporting repository services
+    private NodeService nodeService;
+    private DictionaryService dictionaryService;
+    private SearchService searchService;
+    
+    /**
+     * @param nodeService  node service
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * @param searchService  search service
+     */
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+    
+    /**
+     * @param dictionaryService   dictionary service
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+
+    /**
+     * Gets the list of repository stores
+     * 
+     * @return  stores
+     */
+    public DataModel getStores()
+    {
+        if (stores == null)
+        {
+            List<StoreRef> storeRefs = nodeService.getStores();
+            stores = new ListDataModel(storeRefs);
+        }
+        return stores;
+    }
+    
+    /**
+     * Gets the selected node reference
+     * 
+     * @return  node reference  (defaults to system store root)
+     */
+    public NodeRef getNodeRef()
+    {
+        if (nodeRef == null)
+        {
+            nodeRef = nodeService.getRootNode(new StoreRef("system", "system"));
+        }
+        return nodeRef;
+    }
+
+    /**
+     * Sets the selected node reference
+     * 
+     * @param nodeRef  node reference
+     */
+    private void setNodeRef(NodeRef nodeRef)
+    {
+        this.nodeRef = nodeRef;
+
+        // clear cache
+        primaryPath = null;
+        nodeType = null;
+        parents = null;
+        aspects = null;
+        properties = null;        
+        children = null;
+        assocs = null;
+    }
+    
+    /**
+     * Gets the current node type
+     * 
+     * @return  node type
+     */
+    public QName getNodeType()
+    {
+        if (nodeType == null)
+        {
+            nodeType = nodeService.getType(getNodeRef());
+        }
+        return nodeType;
+    }
+    
+    /**
+     * Gets the current node primary path
+     * 
+     * @return  primary path
+     */
+    public String getPrimaryPath()
+    {
+        if (primaryPath == null)
+        {
+            primaryPath = nodeService.getPath(getNodeRef());
+        }
+        return ISO9075.decode(primaryPath.toString());
+    }
+
+    /**
+     * Gets the current node primary parent reference
+     * 
+     * @return  primary parent ref
+     */
+    public NodeRef getPrimaryParent()
+    {
+        getPrimaryPath();
+        Path.Element element = primaryPath.last();
+        NodeRef parentRef = ((Path.ChildAssocElement)element).getRef().getParentRef();
+        return parentRef;
+    }
+
+    /**
+     * Gets the current node aspects
+     * 
+     * @return  node aspects
+     */
+    public DataModel getAspects()
+    {
+        if (aspects == null)
+        {
+            List<QName> aspectNames = new ArrayList<QName>(nodeService.getAspects(getNodeRef()));
+            aspects = new ListDataModel(aspectNames);
+        }
+        return aspects;
+    }
+        
+    /**
+     * Gets the current node parents
+     * 
+     * @return  node parents
+     */
+    public DataModel getParents()
+    {
+        if (parents == null)
+        {
+            List<ChildAssociationRef> parentRefs = nodeService.getParentAssocs(getNodeRef());
+            parents = new ListDataModel(parentRefs);
+        }
+        return parents;        
+    }
+    
+    /**
+     * Gets the current node properties
+     * 
+     * @return  properties
+     */
+    public DataModel getProperties()
+    {
+        if (properties == null)
+        {
+            Map<QName, Serializable> propertyValues = nodeService.getProperties(getNodeRef());
+            List<Property> nodeProperties = new ArrayList<Property>(propertyValues.size());
+            for (Map.Entry<QName, Serializable> property : propertyValues.entrySet())
+            {
+                nodeProperties.add(new Property(property.getKey(), property.getValue()));
+            }
+            properties = new ListDataModel(nodeProperties);
+        }
+        return properties;
+    }
+    
+    /**
+     * Gets the current node children
+     * 
+     * @return  node children
+     */
+    public DataModel getChildren()
+    {
+        if (children == null)
+        {
+            List<ChildAssociationRef> assocRefs = nodeService.getChildAssocs(getNodeRef());
+            children = new ListDataModel(assocRefs);
+        }
+        return children;
+    }
+
+    /**
+     * Gets the current node associations
+     * 
+     * @return  associations
+     */
+    public DataModel getAssocs()
+    {
+        if (assocs == null)
+        {
+            List<AssociationRef> assocRefs = nodeService.getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
+            assocs = new ListDataModel(assocRefs);
+        }
+        return assocs;
+    }
+
+    /**
+     * Gets the current query language
+     * 
+     * @return  query language 
+     */
+    public String getQueryLanguage()
+    {
+        return queryLanguage;
+    }
+
+    /**
+     * Sets the current query language
+     * 
+     * @param queryLanguage  query language
+     */
+    public void setQueryLanguage(String queryLanguage)
+    {
+        this.queryLanguage = queryLanguage;
+    }
+    
+    /**
+     * Gets the current query
+     * 
+     * @return  query statement
+     */
+    public String getQuery()
+    {
+        return query;
+    }
+    
+    /**
+     * Set the current query
+     * 
+     * @param query   query statement
+     */
+    public void setQuery(String query)
+    {
+        this.query = query;
+    }
+    
+    /**
+     * Gets the list of available query languages
+     * 
+     * @return  query languages
+     */
+    public List getQueryLanguages()
+    {
+        return queryLanguages;
+    }
+
+    /**
+     * Gets the current search results
+     * 
+     * @return  search results
+     */
+    public SearchResults getSearchResults()
+    {
+        return searchResults;
+    }
+    
+    /**
+     * Action to select a store
+     * 
+     * @return  next action
+     */
+    public String selectStore()
+    {
+        StoreRef storeRef = (StoreRef)stores.getRowData();
+        NodeRef rootNode = nodeService.getRootNode(storeRef);
+        setNodeRef(rootNode);
+        return "success";
+    }
+
+    /**
+     * Action to select stores list
+     * 
+     * @return  next action
+     */
+    public String selectStores()
+    {
+        stores = null;
+        return "success";
+    }
+
+    /**
+     * Action to select primary path
+     * 
+     * @return  next action
+     */
+    public String selectPrimaryPath()
+    {
+        // force refresh of self
+        setNodeRef(nodeRef);
+        return "success";
+    }
+    
+    /**
+     * Action to select primary parent
+     * 
+     * @return  next action
+     */
+    public String selectPrimaryParent()
+    {
+        setNodeRef(getPrimaryParent());
+        return "success";
+    }
+    
+    /**
+     * Action to select parent
+     * 
+     * @return  next action
+     */
+    public String selectParent()
+    {
+        ChildAssociationRef assocRef = (ChildAssociationRef)parents.getRowData();
+        NodeRef parentRef = assocRef.getParentRef();
+        setNodeRef(parentRef);
+        return "success";
+    }
+
+    /**
+     * Action to select association To node
+     * 
+     * @return  next action
+     */
+    public String selectToNode()
+    {
+        AssociationRef assocRef = (AssociationRef)assocs.getRowData();
+        NodeRef targetRef = assocRef.getTargetRef();
+        setNodeRef(targetRef);
+        return "success";
+    }
+
+    /**
+     * Action to select node property
+     * 
+     * @return  next action
+     */
+    public String selectNodeProperty()
+    {
+        Property property = (Property)properties.getRowData();
+        Property.Value value = (Property.Value)property.getValues().getRowData();
+        NodeRef nodeRef = (NodeRef)value.getValue();
+        setNodeRef(nodeRef);
+        return "success";
+    }
+    
+    /**
+     * Action to select child
+     * 
+     * @return  next action
+     */
+    public String selectChild()
+    {
+        ChildAssociationRef assocRef = (ChildAssociationRef)children.getRowData();
+        NodeRef childRef = assocRef.getChildRef();
+        setNodeRef(childRef);
+        return "success";
+    }
+    
+    /**
+     * Action to select search result node
+     * 
+     * @return  next action
+     */
+    public String selectResultNode()
+    {
+        ChildAssociationRef assocRef = (ChildAssociationRef)searchResults.getRows().getRowData();
+        NodeRef childRef = assocRef.getChildRef();
+        setNodeRef(childRef);
+        return "success";
+    }
+
+    /**
+     * Action to submit search
+     * 
+     * @return  next action
+     */
+    public String submitSearch()
+    {
+        try
+        {
+            if (queryLanguage.equals("noderef"))
+            {
+                // ensure node exists
+                NodeRef nodeRef = new NodeRef(query);
+                boolean exists = nodeService.exists(nodeRef);
+                if (!exists)
+                {
+                    throw new AlfrescoRuntimeException("Node " + nodeRef + " does not exist.");
+                }
+                setNodeRef(nodeRef);
+                return "node";
+            }
+            
+            // perform search
+            searchResults = new SearchResults(searchService.query(getNodeRef().getStoreRef(), queryLanguage, query));
+            return "search";
+        }
+        catch(Throwable e)
+        {
+            FacesContext context = FacesContext.getCurrentInstance();
+            FacesMessage message = new FacesMessage();
+            message.setSeverity(FacesMessage.SEVERITY_ERROR);
+            message.setDetail("Search failed due to: " + e.toString());
+            context.addMessage("searchForm:query", message);
+            return "error";
+        }
+    }
+    
+    /**
+     * Property wrapper class
+     */
+    public class Property
+    {
+        private QName name;
+        private boolean isCollection = false;
+        private DataModel values;
+        private String datatype;
+        private String residual;
+    
+        /**
+         * Construct
+         * 
+         * @param name  property name
+         * @param value  property values
+         */
+        public Property(QName name, Serializable value)
+        {
+            this.name = name;
+            
+            PropertyDefinition propDef = dictionaryService.getProperty(name);
+            if (propDef != null)
+            {
+                datatype = propDef.getDataType().getName().toString();
+                residual = "false";
+            }
+            else
+            {
+                residual = "true";
+            }
+            
+            // handle multi/single values
+            // TODO: perhaps this is not the most efficient way - lots of list creations
+            List<Value> values = new ArrayList<Value>();
+            if (value instanceof Collection)
+            {
+                isCollection = true;
+                for (Serializable multiValue : (Collection<Serializable>)value)
+                {
+                    values.add(new Value(multiValue));
+                }
+            }
+            else
+            {
+                values.add(new Value(value));
+            }
+            this.values = new ListDataModel(values);
+        }
+        
+        /**
+         * Gets the property name
+         * 
+         * @return  name
+         */
+        public QName getName()
+        {
+            return name;
+        }
+        
+        /**
+         * Gets the property data type
+         * 
+         * @return  data type
+         */
+        public String getDataType()
+        {
+            return datatype;
+        }
+        
+        /**
+         * Gets the property value
+         * 
+         * @return  value
+         */
+        public DataModel getValues()
+        {
+            return values;
+        }
+
+        /**
+         * Determines whether the property is residual
+         * 
+         * @return  true => property is not defined in dictionary
+         */
+        public String getResidual()
+        {
+            return residual;
+        }
+        
+        /**
+         * Determines whether the property is of ANY type
+         * 
+         * @return  true => is any
+         */
+        public boolean isAny()
+        {
+            return (datatype == null) ? false : datatype.equals(DataTypeDefinition.ANY.toString());
+        }
+        
+        /**
+         * Determines whether the property is a collection
+         * 
+         * @return  true => is collection
+         */
+        public boolean isCollection()
+        {
+            return isCollection;
+        }
+        
+        
+        /**
+         * Value wrapper
+         */
+        public class Value
+        {
+            private Serializable value;
+
+            /**
+             * Construct
+             * 
+             * @param value  value
+             */
+            public Value(Serializable value)
+            {
+                this.value = value;
+            }
+            
+            /**
+             * Gets the value
+             * 
+             * @return  the value
+             */
+            public Serializable getValue()
+            {
+                return value;
+            }
+            
+            /**
+             * Gets the value datatype
+             * 
+             * @return  the value datatype
+             */
+            public String getDataType()
+            {
+                String datatype = Property.this.getDataType();
+                if (datatype == null || datatype.equals(DataTypeDefinition.ANY.toString()))
+                {
+                    if (value != null)
+                    {
+                        datatype = dictionaryService.getDataType(value.getClass()).getName().toString();
+                    }
+                }
+                return datatype;
+            }
+            
+            /**
+             * Gets the download url (for content properties)
+             * 
+             * @return  url
+             */
+            public String getUrl()
+            {
+                String url = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath();
+                url += DownloadContentServlet.generateBrowserURL(nodeRef, "file.bin");
+                url += "?property=" + name;
+                return url;
+            }
+            
+            /**
+             * Determines whether the value is content
+             * 
+             * @return  true => is content
+             */
+            public boolean isContent()
+            {
+                String datatype = getDataType();
+                return (datatype == null) ? false : datatype.equals(DataTypeDefinition.CONTENT.toString());
+            }
+            
+            /**
+             * Determines whether the value is a node ref
+             * 
+             * @return  true => is node ref
+             */
+            public boolean isNodeRef()
+            {
+                String datatype = getDataType();
+                return (datatype == null) ? false : datatype.equals(DataTypeDefinition.NODE_REF.toString()) || datatype.equals(DataTypeDefinition.CATEGORY.toString());
+            }
+            
+            /**
+             * Determines whether the value is null
+             * 
+             * @return  true => value is null
+             */
+            public boolean isNullValue()
+            {
+                return value == null;
+            }
+        }
+    }
+
+    /**
+     * Wrapper class for Search Results
+     */
+    public class SearchResults
+    {
+        private int length = 0;
+        private DataModel rows;
+
+        /**
+         * Construct
+         * 
+         * @param resultSet  query result set
+         */
+        public SearchResults(ResultSet resultSet)
+        {
+            rows = new ListDataModel();
+            if (resultSet != null)
+            {
+                rows.setWrappedData(resultSet.getChildAssocRefs());
+                length = resultSet.length();
+            }
+        }
+        
+        /**
+         * Gets the row count
+         * 
+         * @return  count of rows
+         */
+        public int getLength()
+        {
+            return length;
+        }
+
+        /**
+         * Gets the rows
+         * 
+         * @return  the rows
+         */
+        public DataModel getRows()
+        {
+            return rows;
+        }
+    }
+    
+}
diff --git a/source/java/org/alfresco/web/bean/AdvancedSearchBean.java b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
new file mode 100644
index 0000000000..19de6ce188
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/AdvancedSearchBean.java
@@ -0,0 +1,829 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.CachingDateFormat;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.config.ClientConfigElement.CustomProperty;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.component.UIPanel.ExpandedEvent;
+import org.alfresco.web.ui.repo.component.UISearchCustomProperties;
+
+/**
+ * Provides the form state and action event handling for the Advanced Search UI.
+ * <p>
+ * Integrates with the web-client ConfigService to retrieve configuration of custom
+ * meta-data searching fields. Custom fields can be configured to appear in the UI
+ * and they are they automatically added to the search query by this bean.
+ * 
+ * @author Kevin Roast
+ */
+public class AdvancedSearchBean
+{
+   /**
+    * Default constructor
+    */
+   public AdvancedSearchBean()
+   {
+      // initial state of progressive panels that don't use the default
+      panels.put("categories-panel", false);
+      panels.put("attrs-panel", false);
+      panels.put("custom-panel", false);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param namespaceService The NamespaceService to set.
+    */
+   public void setNamespaceService(NamespaceService namespaceService)
+   {
+      this.namespaceService = namespaceService;
+   }
+   
+   /**
+    * @return Returns the progressive panels expanded state map.
+    */
+   public Map<String, Boolean> getPanels()
+   {
+      return this.panels;
+   }
+
+   /**
+    * @param panels The progressive panels expanded state map.
+    */
+   public void setPanels(Map<String, Boolean> panels)
+   {
+      this.panels = panels;
+   }
+   
+   /**
+    * @return Returns the folder to search, null for all.
+    */
+   public String getLookin()
+   {
+      return this.lookin;
+   }
+   
+   /**
+    * @param lookin   The folder to search in or null for all.
+    */
+   public void setLookin(String lookIn)
+   {
+      this.lookin = lookIn;
+   }
+   
+   /**
+    * @return Returns the location.
+    */
+   public NodeRef getLocation()
+   {
+      return this.location;
+   }
+   
+   /**
+    * @param location The location to set.
+    */
+   public void setLocation(NodeRef location)
+   {
+      this.location = location;
+   }
+   
+   /**
+    * @return Returns the search mode.
+    */
+   public String getMode()
+   {
+      return this.mode;
+   }
+   
+   /**
+    * @param mode The search mode to set.
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * @return Returns the text to search for.
+    */
+   public String getText()
+   {
+      return this.text;
+   }
+   
+   /**
+    * @param text The text to set.
+    */
+   public void setText(String text)
+   {
+      this.text = text;
+   }
+   
+   /**
+    * @return Returns the category.
+    */
+   public NodeRef getCategory()
+   {
+      return this.category;
+   }
+   
+   /**
+    * @param category The category to set.
+    */
+   public void setCategory(NodeRef category)
+   {
+      this.category = category;
+   }
+   
+   /**
+    * @return Returns true to search location children, false for just the specified location.
+    */
+   public boolean getLocationChildren()
+   {
+      return this.locationChildren;
+   }
+   
+   /**
+    * @param locationChildren    True to search location children, false for just the specified location.
+    */
+   public void setLocationChildren(boolean locationChildren)
+   {
+      this.locationChildren = locationChildren;
+   }
+   
+   /**
+    * @return Returns true to search category children, false for just the specified category.
+    */
+   public boolean getCategoryChildren()
+   {
+      return this.categoryChildren;
+   }
+   
+   /**
+    * @param categoryChildren    True to search category children, false for just the specified category.
+    */
+   public void setCategoryChildren(boolean categoryChildren)
+   {
+      this.categoryChildren = categoryChildren;
+   }
+   
+   /**
+    * @return Returns the createdDateFrom.
+    */
+   public Date getCreatedDateFrom()
+   {
+      return this.createdDateFrom;
+   }
+
+   /**
+    * @param createdDateFrom The createdDateFrom to set.
+    */
+   public void setCreatedDateFrom(Date createdDate)
+   {
+      this.createdDateFrom = createdDate;
+   }
+
+   /**
+    * @return Returns the description.
+    */
+   public String getDescription()
+   {
+      return this.description;
+   }
+
+   /**
+    * @param description The description to set.
+    */
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+
+   /**
+    * @return Returns the modifiedDateFrom.
+    */
+   public Date getModifiedDateFrom()
+   {
+      return this.modifiedDateFrom;
+   }
+
+   /**
+    * @param modifiedDateFrom The modifiedDateFrom to set.
+    */
+   public void setModifiedDateFrom(Date modifiedDate)
+   {
+      this.modifiedDateFrom = modifiedDate;
+   }
+   
+   /**
+    * @return Returns the createdDateTo.
+    */
+   public Date getCreatedDateTo()
+   {
+      return this.createdDateTo;
+   }
+
+   /**
+    * @param createdDateTo The createdDateTo to set.
+    */
+   public void setCreatedDateTo(Date createdDateTo)
+   {
+      this.createdDateTo = createdDateTo;
+   }
+
+   /**
+    * @return Returns the modifiedDateTo.
+    */
+   public Date getModifiedDateTo()
+   {
+      return this.modifiedDateTo;
+   }
+
+   /**
+    * @param modifiedDateTo The modifiedDateTo to set.
+    */
+   public void setModifiedDateTo(Date modifiedDateTo)
+   {
+      this.modifiedDateTo = modifiedDateTo;
+   }
+
+   /**
+    * @return Returns the title.
+    */
+   public String getTitle()
+   {
+      return this.title;
+   }
+
+   /**
+    * @param title The title to set.
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+   
+   /**
+    * @return Returns the author.
+    */
+   public String getAuthor()
+   {
+      return this.author;
+   }
+
+   /**
+    * @param author The author to set.
+    */
+   public void setAuthor(String author)
+   {
+      this.author = author;
+   }
+   
+   /**
+    * @return Returns the modifiedDateChecked.
+    */
+   public boolean isModifiedDateChecked()
+   {
+      return this.modifiedDateChecked;
+   }
+
+   /**
+    * @param modifiedDateChecked The modifiedDateChecked to set.
+    */
+   public void setModifiedDateChecked(boolean modifiedDateChecked)
+   {
+      this.modifiedDateChecked = modifiedDateChecked;
+   }
+
+   /**
+    * @return Returns the createdDateChecked.
+    */
+   public boolean isCreatedDateChecked()
+   {
+      return this.createdDateChecked;
+   }
+   
+   /**
+    * @return Returns the content type currenty selected
+    */
+   public String getContentType()
+   {
+      return this.contentType;
+   }
+
+   /**
+    * @param contentType Sets the currently selected content type
+    */
+   public void setContentType(String contentType)
+   {
+      this.contentType = contentType;
+   }
+   
+   /**
+    * @return Returns the contentFormat.
+    */
+   public String getContentFormat()
+   {
+      return this.contentFormat;
+   }
+
+   /**
+    * @param contentFormat The contentFormat to set.
+    */
+   public void setContentFormat(String contentFormat)
+   {
+      this.contentFormat = contentFormat;
+   }
+   
+   /**
+    * @return Returns the custom properties Map.
+    */
+   public Map<String, Object> getCustomProperties()
+   {
+      return this.customProperties;
+   }
+
+   /**
+    * @param customProperties The custom properties Map to set.
+    */
+   public void setCustomProperties(Map<String, Object> customProperties)
+   {
+      this.customProperties = customProperties;
+   }
+
+   /**
+    * @param createdDateChecked The createdDateChecked to set.
+    */
+   public void setCreatedDateChecked(boolean createdDateChecked)
+   {
+      this.createdDateChecked = createdDateChecked;
+   }
+   
+   /**
+    * @return Returns a list of content object types to allow the user to select from
+    */
+   public List<SelectItem> getContentTypes()
+   {
+      if (this.contentTypes == null)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         
+         // add the well known cm:content object type by default
+         this.contentTypes = new ArrayList<SelectItem>(5);
+         this.contentTypes.add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), 
+               Application.getMessage(context, MSG_CONTENT)));
+         
+         // add any configured content sub-types to the list
+         List<String> types = getClientConfig().getContentTypes();
+         if (types != null)
+         {
+            DictionaryService dictionaryService = Repository.getServiceRegistry(context).getDictionaryService();
+            for (String type : types)
+            {
+               QName idQName = Repository.resolveToQName(type);
+               TypeDefinition typeDef = dictionaryService.getType(idQName);
+               
+               if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
+               {
+                  // try and get label from the dictionary
+                  String label = typeDef.getTitle();
+                  
+                  // else just use the localname
+                  if (label == null)
+                  {
+                     label = idQName.getLocalName();
+                  }
+                  
+                  this.contentTypes.add(new SelectItem(idQName.toString(), label));
+               }
+            }
+            
+            // make sure the list is sorted by the label
+            QuickSort sorter = new QuickSort(this.contentTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+            sorter.sort();
+         }
+      }
+      
+      return this.contentTypes;
+   }
+   
+   /**
+    * @return Returns a list of content formats to allow the user to select from
+    */
+   public List<SelectItem> getContentFormats()
+   {
+      if (this.contentFormats == null)
+      {
+         this.contentFormats = new ArrayList<SelectItem>(80);
+         ServiceRegistry registry = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+         MimetypeService mimetypeService = registry.getMimetypeService();
+         
+         // get the mime type display names
+         Map<String, String> mimeTypes = mimetypeService.getDisplaysByMimetype();
+         for (String mimeType : mimeTypes.keySet())
+         {
+            this.contentFormats.add(new SelectItem(mimeType, mimeTypes.get(mimeType)));
+         }
+         
+         // make sure the list is sorted by the values
+         QuickSort sorter = new QuickSort(this.contentFormats, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+         
+         // add the "All Formats" constant marker at the top of the list (default selection)
+         this.contentFormats.add(0, new SelectItem("", Application.getMessage(FacesContext.getCurrentInstance(), MSG_ALL_FORMATS)));
+      }
+      
+      return this.contentFormats;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action event handlers
+   
+   /**
+    * Handler to clear the advanced search screen form details
+    */
+   public void reset(ActionEvent event)
+   {
+      this.text = "";
+      this.mode = MODE_ALL;
+      this.lookin = LOOKIN_ALL;
+      this.contentType = null;
+      this.location = null;
+      this.category = null;
+      this.title = null;
+      this.description = null;
+      this.author = null;
+      this.createdDateFrom = null;
+      this.modifiedDateFrom = null;
+      this.createdDateChecked = false;
+      this.modifiedDateChecked = false;
+      this.customProperties.clear();
+   }
+   
+   /**
+    * Handler to perform a search based on the current criteria
+    */
+   public String search()
+   {
+      String outcome = null;
+      
+      if (this.text != null && this.text.length() != 0)
+      {
+         // construct the Search Context and set on the navigation bean
+         // then simply navigating to the browse screen will cause it pickup the Search Context
+         SearchContext search = new SearchContext();
+         
+         search.setText(this.text);
+         
+         if (this.mode.equals(MODE_ALL))
+         {
+            search.setMode(SearchContext.SEARCH_ALL);
+         }
+         else if (this.mode.equals(MODE_FILES_TEXT))
+         {
+            search.setMode(SearchContext.SEARCH_FILE_NAMES_CONTENTS);
+         }
+         else if (this.mode.equals(MODE_FILES))
+         {
+            search.setMode(SearchContext.SEARCH_FILE_NAMES);
+         }
+         else if (this.mode.equals(MODE_FOLDERS))
+         {
+            search.setMode(SearchContext.SEARCH_SPACE_NAMES);
+         }
+         
+         // additional attributes search
+         if (this.description != null && this.description.length() != 0)
+         {
+            search.addAttributeQuery(ContentModel.PROP_DESCRIPTION, this.description);
+         }
+         if (this.title != null && this.title.length() != 0)
+         {
+            search.addAttributeQuery(ContentModel.PROP_TITLE, this.title);
+         }
+         if (this.author != null && this.author.length() != 0)
+         {
+            search.addAttributeQuery(ContentModel.PROP_CREATOR, this.author);
+         }
+         if (this.contentFormat != null && this.contentFormat.length() != 0)
+         {
+            search.setMimeType(this.contentFormat);
+         }
+         if (this.createdDateChecked == true)
+         {
+            SimpleDateFormat df = CachingDateFormat.getDateFormat();
+            String strCreatedDate = df.format(this.createdDateFrom);
+            String strCreatedDateTo = df.format(this.createdDateTo);
+            search.addRangeQuery(ContentModel.PROP_CREATED, strCreatedDate, strCreatedDateTo, true);
+         }
+         if (this.modifiedDateChecked == true)
+         {
+            SimpleDateFormat df = CachingDateFormat.getDateFormat();
+            String strModifiedDate = df.format(this.modifiedDateFrom);
+            String strModifiedDateTo = df.format(this.modifiedDateTo);
+            search.addRangeQuery(ContentModel.PROP_MODIFIED, strModifiedDate, strModifiedDateTo, true);
+         }
+         
+         // walk each of the custom properties add add them as additional attributes
+         for (String qname : this.customProperties.keySet())
+         {
+            Object value = this.customProperties.get(qname);
+            DataTypeDefinition typeDef = getCustomPropertyLookup().get(qname);
+            if (typeDef != null)
+            {
+               QName typeName = typeDef.getName();
+               if (DataTypeDefinition.DATE.equals(typeName) || DataTypeDefinition.DATETIME.equals(typeName))
+               {
+                  // only apply date to search if the user has checked the enable checkbox
+                  if (value != null && Boolean.valueOf(value.toString()) == true)
+                  {
+                     SimpleDateFormat df = CachingDateFormat.getDateFormat();
+                     String strDateFrom = df.format(this.customProperties.get(
+                           UISearchCustomProperties.PREFIX_DATE_FROM + qname));
+                     String strDateTo = df.format(this.customProperties.get(
+                           UISearchCustomProperties.PREFIX_DATE_TO + qname));
+                     search.addRangeQuery(QName.createQName(qname), strDateFrom, strDateTo, true);
+                  }
+               }
+               else if (DataTypeDefinition.BOOLEAN.equals(typeName))
+               {
+                  if (((Boolean)value) == true)
+                  {
+                     search.addFixedValueQuery(QName.createQName(qname), value.toString());
+                  }
+               }
+               else if (DataTypeDefinition.NODE_REF.equals(typeName) || DataTypeDefinition.CATEGORY.equals(typeName))
+               {
+                  if (value != null)
+                  {
+                     search.addFixedValueQuery(QName.createQName(qname), value.toString());
+                  }
+               }
+               else if (DataTypeDefinition.INT.equals(typeName) || DataTypeDefinition.LONG.equals(typeName) ||
+                        DataTypeDefinition.FLOAT.equals(typeName) || DataTypeDefinition.DOUBLE.equals(typeName))
+               {
+                  String strVal = value.toString();
+                  if (strVal != null && strVal.length() != 0)
+                  {
+                     search.addFixedValueQuery(QName.createQName(qname), strVal);
+                  }
+               }
+               else
+               {
+                  // by default use toString() value - this is for text fields and unknown types
+                  String strVal = value.toString();
+                  if (strVal != null && strVal.length() != 0)
+                  {
+                     search.addAttributeQuery(QName.createQName(qname), strVal);
+                  }
+               }
+            }
+         }
+         
+         // location path search
+         if (this.lookin.equals(LOOKIN_OTHER) && this.location != null)
+         {
+            search.setLocation(SearchContext.getPathFromSpaceRef(
+                  new NodeRef(Repository.getStoreRef(), this.location.getId()), this.locationChildren));
+         }
+         
+         // category path search
+         if (this.category != null)
+         {
+            search.setCategories(new String[]{SearchContext.getPathFromSpaceRef(
+                  new NodeRef(Repository.getStoreRef(), this.category.getId()), this.categoryChildren)});
+         }
+         
+         // content type restriction
+         if (this.contentType != null)
+         {
+            search.setContentType(this.contentType);
+         }
+         
+         // set the Search Context onto the top-level navigator bean
+         // this causes the browse screen to switch into search results view
+         this.navigator.setSearchContext(search);
+         
+         outcome = "browse";
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @return ClientConfigElement
+    */
+   private ClientConfigElement getClientConfig()
+   {
+      if (clientConfigElement == null)
+      {
+         ConfigService configService = Application.getConfigService(FacesContext.getCurrentInstance());
+         clientConfigElement = (ClientConfigElement)configService.getGlobalConfig().getConfigElement(
+               ClientConfigElement.CONFIG_ELEMENT_ID);
+      }
+      return clientConfigElement;
+   }
+   
+   /**
+    * Helper map to lookup custom property QName strings against a DataTypeDefinition
+    * 
+    * @return custom property lookup Map
+    */
+   private Map<String, DataTypeDefinition> getCustomPropertyLookup()
+   {
+      if (customPropertyLookup == null)
+      {
+         customPropertyLookup = new HashMap<String, DataTypeDefinition>(7, 1.0f);
+         List<CustomProperty> customProps = getClientConfig().getCustomProperties();
+         if (customProps != null)
+         {
+            DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
+            for (CustomProperty customProp : customProps)
+            {
+               PropertyDefinition propDef = null;
+               QName propQName = Repository.resolveToQName(customProp.Property);
+               if (customProp.Type != null)
+               {
+                  QName type = Repository.resolveToQName(customProp.Type);
+                  TypeDefinition typeDef = dd.getType(type);
+                  propDef = typeDef.getProperties().get(propQName);
+               }
+               else if (customProp.Aspect != null)
+               {
+                  QName aspect = Repository.resolveToQName(customProp.Aspect);
+                  AspectDefinition aspectDef = dd.getAspect(aspect);
+                  propDef = aspectDef.getProperties().get(propQName);
+               }
+               customPropertyLookup.put(propQName.toString(), propDef.getDataType());
+            }
+         }
+      }
+      return customPropertyLookup;
+   }
+   
+   /**
+    * Save the state of the progressive panel that was expanded/collapsed
+    */
+   public void expandPanel(ActionEvent event)
+   {
+      if (event instanceof ExpandedEvent)
+      {
+         this.panels.put(event.getComponent().getId(), ((ExpandedEvent)event).State);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data 
+   
+   private static final String MSG_CONTENT = "content";
+   private static final String MSG_ALL_FORMATS = "all_formats";
+   
+   private static final String MODE_ALL = "all";
+   private static final String MODE_FILES_TEXT = "files_text";
+   private static final String MODE_FILES = "files";
+   private static final String MODE_FOLDERS = "folders";
+   
+   private static final String LOOKIN_ALL = "all";
+   private static final String LOOKIN_OTHER = "other";
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The NamespaceService to be used by the bean */
+   private NamespaceService namespaceService;
+   
+   /** The NavigationBean reference */
+   private NavigationBean navigator;
+   
+   /** Client Config reference */
+   private ClientConfigElement clientConfigElement = null;
+   
+   /** Progressive panel UI state */
+   private Map<String, Boolean> panels = new HashMap(5, 1.0f);
+   
+   /** custom property names to values */
+   private Map<String, Object> customProperties = new HashMap(5, 1.0f);
+   
+   /** lookup of custom property QName string to DataTypeDefinition for the property */
+   private Map<String, DataTypeDefinition> customPropertyLookup = null;
+   
+   /** content types to for restricting searches */
+   private List<SelectItem> contentTypes;
+   
+   /** content format list restricting searches */
+   private List<SelectItem> contentFormats;
+   
+   /** content type selection */
+   private String contentType;
+   
+   /** content format selection */
+   private String contentFormat;
+   
+   /** the text to search for */
+   private String text = "";
+   
+   /** search mode */
+   private String mode = MODE_ALL;
+   
+   /** folder lookin mode */
+   private String lookin = LOOKIN_ALL;
+   
+   /** Space Selector location */
+   private NodeRef location = null;
+   
+   /** categories to search */
+   private NodeRef category = null;
+   
+   /** title attribute to search */
+   private String title = null;
+   
+   /** description attribute to search */
+   private String description = null;
+   
+   /** created attribute to search from */
+   private Date createdDateFrom = null;
+   
+   /** created attribute to search to */
+   private Date createdDateTo = null;
+   
+   /** modified attribute to search from */
+   private Date modifiedDateFrom = null;
+   
+   /** modified attribute to search to */
+   private Date modifiedDateTo = null;
+   
+   /** true to search location children as well as location */
+   private boolean locationChildren = true;
+   
+   /** true to search category children as well as category */
+   private boolean categoryChildren = true;
+   
+   /** author (creator) attribute to search */
+   private String author = null;
+   
+   private boolean modifiedDateChecked = false;
+   private boolean createdDateChecked = false;
+}
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
new file mode 100644
index 0000000000..999147d0c0
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -0,0 +1,1477 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
+import org.alfresco.web.bean.repository.MapNode;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.NodePropertyResolver;
+import org.alfresco.web.bean.repository.QNameNodeMap;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.wizard.NewSpaceWizard;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.Utils.URLMode;
+import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIBreadcrumb;
+import org.alfresco.web.ui.common.component.UIModeList;
+import org.alfresco.web.ui.common.component.UIStatusMessage;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
+import org.alfresco.web.ui.repo.component.UINodeDescendants;
+import org.alfresco.web.ui.repo.component.UINodePath;
+import org.alfresco.web.ui.repo.component.UISimpleSearch;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
+
+/**
+ * Bean providing properties and behaviour for the main folder/document browse screen and
+ * search results screens.
+ * 
+ * @author Kevin Roast
+ */
+public class BrowseBean implements IContextListener
+{
+   // ------------------------------------------------------------------------------
+   // Construction 
+
+   private static final String VIEWMODE_DASHBOARD = "dashboard";
+   private static final String PAGE_NAME_BROWSE = "browse";
+
+   /**
+    * Default Constructor
+    */
+   public BrowseBean()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).registerBean(this);
+      
+      initFromClientConfig();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param searchService The Searcher to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * @param lockService The Lock Service to set.
+    */
+   public void setLockService(LockService lockService)
+   {
+      this.lockService = lockService;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+   
+   /**
+    * @param dictionaryService The DictionaryService to set.
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+   
+   /**
+    * @param fileFolderService The FileFolderService to set.
+    */
+   public void setFileFolderService(FileFolderService fileFolderService)
+   {
+      this.fileFolderService = fileFolderService;
+   }
+   
+   /**
+    * @return Returns the browse View mode. See UIRichList
+    */
+   public String getBrowseViewMode()
+   {
+      return this.browseViewMode;
+   }
+   
+   /**
+    * @param browseViewMode      The browse View mode to set. See UIRichList.
+    */
+   public void setBrowseViewMode(String browseViewMode)
+   {
+      this.browseViewMode = browseViewMode;
+   }
+   
+   /**
+    * @return Returns true if dashboard view is available for the current node.
+    */
+   public boolean isDashboardView()
+   {
+      return this.dashboardView;
+   }
+
+   /**
+    * @param dashboardView The dashboard view mode to set.
+    */
+   public void setDashboardView(boolean dashboardView)
+   {
+      this.dashboardView = dashboardView;
+      if (dashboardView == true)
+      {
+         FacesContext fc = FacesContext.getCurrentInstance();
+         fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dashboard");
+      }
+      else
+      {
+         navigateBrowseScreen();
+      }
+   }
+   
+   /**
+    * @return Returns the browsePageSize.
+    */
+   public int getBrowsePageSize()
+   {
+      return this.browsePageSize;
+   }
+   
+   /**
+    * @param browsePageSize The browsePageSize to set.
+    */
+   public void setBrowsePageSize(int browsePageSize)
+   {
+      this.browsePageSize = browsePageSize;
+   }
+   
+   /**
+    * @return Returns the minimum length of a valid search string.
+    */
+   public int getMinimumSearchLength()
+   {
+      return this.clientConfig.getSearchMinimum();
+   }
+   
+   /**
+    * @return Returns the Space Node being used for the current browse screen action.
+    */
+   public Node getActionSpace()
+   {
+      return this.actionSpace;
+   }
+   
+   /**
+    * @param actionSpace     Set the Space Node to be used for the current browse screen action.
+    */
+   public void setActionSpace(Node actionSpace)
+   {
+      this.actionSpace = actionSpace;
+   }
+   
+   /**
+    * @return The document node being used for the current operation
+    */
+   public Node getDocument()
+   {
+      return this.document;
+   }
+
+   /**
+    * @param document The document node to be used for the current operation
+    */
+   public void setDocument(Node document)
+   {
+      this.document = document;
+   }
+
+   /**
+    * @param contentRichList The contentRichList to set.
+    */
+   public void setContentRichList(UIRichList browseRichList)
+   {
+      this.contentRichList = browseRichList;
+      if (this.contentRichList != null)
+      {
+         this.contentRichList.setInitialSortColumn(
+               this.clientConfig.getDefaultSortColumn(PAGE_NAME_BROWSE));
+         this.contentRichList.setInitialSortDescending(
+               this.clientConfig.hasDescendingSort(PAGE_NAME_BROWSE));
+      }
+   }
+   
+   /**
+    * @return Returns the contentRichList.
+    */
+   public UIRichList getContentRichList()
+   {
+      return this.contentRichList;
+   }
+   
+   /**
+    * @param spacesRichList The spacesRichList to set.
+    */
+   public void setSpacesRichList(UIRichList detailsRichList)
+   {
+      this.spacesRichList = detailsRichList;
+      if (this.spacesRichList != null)
+      {
+         // set the initial sort column and direction
+         this.spacesRichList.setInitialSortColumn(
+               this.clientConfig.getDefaultSortColumn(PAGE_NAME_BROWSE));
+         this.spacesRichList.setInitialSortDescending(
+               this.clientConfig.hasDescendingSort(PAGE_NAME_BROWSE));
+      }
+   }
+   
+   /**
+    * @return Returns the spacesRichList.
+    */
+   public UIRichList getSpacesRichList()
+   {
+      return this.spacesRichList;
+   }
+   
+   /**
+    * @return Returns the statusMessage component.
+    */
+   public UIStatusMessage getStatusMessage()
+   {
+      return this.statusMessage;
+   }
+
+   /**
+    * @param statusMessage The statusMessage component to set.
+    */
+   public void setStatusMessage(UIStatusMessage statusMessage)
+   {
+      this.statusMessage = statusMessage;
+   }
+   
+   /**
+    * @return Returns the deleteMessage.
+    */
+   public String getDeleteMessage()
+   {
+      return this.deleteMessage;
+   }
+
+   /**
+    * @param deleteMessage The deleteMessage to set.
+    */
+   public void setDeleteMessage(String deleteMessage)
+   {
+      this.deleteMessage = deleteMessage;
+   }
+   
+   /**
+    * Page accessed bean method to get the container nodes currently being browsed
+    * 
+    * @return List of container Node objects for the current browse location
+    */
+   public List<Node> getNodes()
+   {
+      // the references to container nodes and content nodes are transient for one use only
+      // we do this so we only query/search once - as we cannot distinguish between node types
+      // until after the query. The logic is a bit confusing but otherwise we would need to
+      // perform the same query or search twice for every screen refresh.
+      if (this.containerNodes == null)
+      {
+         if (this.navigator.getSearchContext() == null)
+         {
+            queryBrowseNodes(this.navigator.getCurrentNodeId());
+         }
+         else
+         {
+            searchBrowseNodes(this.navigator.getSearchContext());
+         }
+      }
+      List<Node> result = this.containerNodes;
+      
+      // we clear the member variable during invalidateComponents()
+      
+      return result;
+   }
+   
+   /**
+    * Page accessed bean method to get the content nodes currently being browsed
+    * 
+    * @return List of content Node objects for the current browse location
+    */
+   public List<Node> getContent()
+   {
+      // see comment in getNodes() above for reasoning here
+      if (this.contentNodes == null)
+      {
+         if (this.navigator.getSearchContext() == null)
+         {
+            queryBrowseNodes(this.navigator.getCurrentNodeId());
+         }
+         else
+         {
+            searchBrowseNodes(this.navigator.getSearchContext());
+         }
+      }
+      List<Node> result = this.contentNodes;
+      
+      // we clear the member variable during invalidateComponents()
+      
+      return result;
+   }
+   
+   /**
+    * Setup the additional properties required at data-binding time.
+    * <p>
+    * These are properties used by components on the page when iterating over the nodes.
+    * Information such as whether the node is locked, a working copy, download URL etc.
+    * <p>
+    * We use a set of anonymous inner classes to provide the implemention for the property
+    * getters. The interfaces are only called when the properties are first required. 
+    * 
+    * @param node       MapNode to add the properties too
+    */
+   public void setupDataBindingProperties(MapNode node)
+   {
+      // special properties to be used by the value binding components on the page
+      node.addPropertyResolver("locked", this.resolverlocked);
+      node.addPropertyResolver("owner", this.resolverOwner);
+      node.addPropertyResolver("workingCopy", this.resolverWorkingCopy);
+      node.addPropertyResolver("url", this.resolverUrl);
+      node.addPropertyResolver("fileType16", this.resolverFileType16);
+      node.addPropertyResolver("fileType32", this.resolverFileType32);
+      node.addPropertyResolver("size", this.resolverSize);
+      node.addPropertyResolver("cancelCheckOut", this.resolverCancelCheckOut);
+      node.addPropertyResolver("checkIn", this.resolverCheckIn);
+      node.addPropertyResolver("editLinkType", this.resolverEditLinkType);
+      node.addPropertyResolver("webdavUrl", this.resolverWebdavUrl);
+      node.addPropertyResolver("cifsPath", this.resolverCifsPath);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation 
+   
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      invalidateComponents();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers 
+   
+   /**
+    * Change the current view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void viewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      
+      // get the view mode ID
+      String viewMode = viewList.getValue().toString();
+      
+      if (VIEWMODE_DASHBOARD.equals(viewMode) == false)
+      { 
+         // set the page size based on the style of display
+         setBrowsePageSize(this.clientConfig.getDefaultPageSize(PAGE_NAME_BROWSE, 
+               viewMode));
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Browse view page size set to: " + getBrowsePageSize());
+         
+         // in case we left for dashboard 
+         if (isDashboardView() == true)
+         {
+            setDashboardView(false);
+         }
+         
+         // push the view mode into the lists
+         setBrowseViewMode(viewMode);
+      }
+      else
+      {
+         // special case for Dashboard view
+         setDashboardView(true);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Helper methods
+   
+   /**
+    * Query a list of nodes for the specified parent node Id
+    * 
+    * @param parentNodeId     Id of the parent node or null for the root node
+    */
+   private void queryBrowseNodes(String parentNodeId)
+   {
+      long startTime = 0;
+      if (logger.isDebugEnabled())
+         startTime = System.currentTimeMillis();
+      
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         NodeRef parentRef;
+         if (parentNodeId == null)
+         {
+            // no specific parent node specified - use the root node
+            parentRef = this.nodeService.getRootNode(Repository.getStoreRef());
+         }
+         else
+         {
+            // build a NodeRef for the specified Id and our store
+            parentRef = new NodeRef(Repository.getStoreRef(), parentNodeId);
+         }
+         
+         // TODO: can we improve the Get here with an API call for children of a specific type?
+         List<ChildAssociationRef> childRefs = this.nodeService.getChildAssocs(parentRef);
+         this.containerNodes = new ArrayList<Node>(childRefs.size());
+         this.contentNodes = new ArrayList<Node>(childRefs.size());
+         for (ChildAssociationRef ref: childRefs)
+         {
+            // create our Node representation from the NodeRef
+            NodeRef nodeRef = ref.getChildRef();
+            
+            if (this.nodeService.exists(nodeRef))
+            {
+               // find it's type so we can see if it's a node we are interested in
+               QName type = this.nodeService.getType(nodeRef);
+               
+               // make sure the type is defined in the data dictionary
+               TypeDefinition typeDef = this.dictionaryService.getType(type);
+               
+               if (typeDef != null)
+               {
+                  // look for Space or File nodes
+                  if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER) == true && 
+                  	 this.dictionaryService.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
+                  {
+                     // create our Node representation
+                     MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                     node.addPropertyResolver("icon", this.resolverSpaceIcon);
+                     
+                     this.containerNodes.add(node);
+                  }
+                  else if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
+                  {
+                     // create our Node representation
+                     MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                     
+                     setupDataBindingProperties(node);
+                     
+                     this.contentNodes.add(node);
+                  }
+               }
+               else
+               {
+                  if (logger.isEnabledFor(Priority.WARN))
+                     logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
+               }
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {refErr.getNodeRef()}) );
+         this.containerNodes = Collections.<Node>emptyList();
+         this.contentNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Throwable err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         this.containerNodes = Collections.<Node>emptyList();
+         this.contentNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      
+      if (logger.isDebugEnabled())
+      {
+         long endTime = System.currentTimeMillis();
+         logger.debug("Time to query and build map nodes: " + (endTime - startTime) + "ms");
+      }
+   }
+   
+   /**
+    * Search for a list of nodes using the specific search context
+    * 
+    * @param searchContext    To use to perform the search
+    */
+   private void searchBrowseNodes(SearchContext searchContext)
+   {
+      long startTime = 0;
+      if (logger.isDebugEnabled())
+         startTime = System.currentTimeMillis();
+      
+      // special exit case for < 3 characters in length
+      if (searchContext.getText().length() < getMinimumSearchLength())
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), MSG_SEARCH_MINIMUM),
+               new Object[] {getMinimumSearchLength()}));
+         this.containerNodes = Collections.<Node>emptyList();
+         this.contentNodes = Collections.<Node>emptyList();
+         return;
+      }
+      
+      // get the searcher object and perform the search of the root node
+      String query = searchContext.buildQuery();
+      
+      UserTransaction tx = null;
+      ResultSet results = null;
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
+         tx.begin();
+         
+         results = this.searchService.query(
+               Repository.getStoreRef(), 
+               "lucene", query, null, null);
+         if (logger.isDebugEnabled())
+            logger.debug("Search results returned: " + results.length());
+         
+         // create a list of items from the results
+         this.containerNodes = new ArrayList<Node>(results.length());
+         this.contentNodes = new ArrayList<Node>(results.length());
+         if (results.length() != 0)
+         {
+            for (ResultSetRow row: results)
+            {
+               NodeRef nodeRef = row.getNodeRef();
+               
+               if (this.nodeService.exists(nodeRef))
+               {
+                  // find it's type so we can see if it's a node we are interested in
+                  QName type = this.nodeService.getType(nodeRef);
+                  
+                  // make sure the type is defined in the data dictionary
+                  TypeDefinition typeDef = this.dictionaryService.getType(type);
+               
+                  if (typeDef != null)
+                  {
+                     // look for Space or File nodes
+                     if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER) && 
+                         this.dictionaryService.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
+                     {
+                        // create our Node representation
+                        MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                        
+                        // construct the path to this Node
+                        node.addPropertyResolver("path", this.resolverPath);
+                        node.addPropertyResolver("displayPath", this.resolverDisplayPath);
+                        node.addPropertyResolver("icon", this.resolverSpaceIcon);
+                        
+                        this.containerNodes.add(node);
+                     }
+                     else if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
+                     {
+                        // create our Node representation
+                        MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                        
+                        setupDataBindingProperties(node);
+                        
+                        // construct the path to this Node
+                        node.addPropertyResolver("path", this.resolverPath);
+                        node.addPropertyResolver("displayPath", this.resolverDisplayPath);
+                        
+                        this.contentNodes.add(node);
+                     }
+                  }
+                  else
+                  {
+                     if (logger.isEnabledFor(Priority.WARN))
+                        logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
+                  }
+               }
+               else
+               {
+                  if (logger.isEnabledFor(Priority.WARN))
+                     logger.warn("Missing object returned from search indexes: id = " + nodeRef + " search query: " + query);
+               }
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {refErr.getNodeRef()}) );
+         this.containerNodes = Collections.<Node>emptyList();
+         this.contentNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Throwable err)
+      {
+         logger.info("Search failed for: " + query);
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_SEARCH), new Object[] {err.getMessage()}), err );
+         this.containerNodes = Collections.<Node>emptyList();
+         this.contentNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      finally
+      {
+         if (results != null)
+         {
+            results.close();
+         }
+      }
+      
+      if (logger.isDebugEnabled())
+      {
+         long endTime = System.currentTimeMillis();
+         logger.debug("Time to query and build map nodes: " + (endTime - startTime) + "ms");
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Property Resolvers
+   
+   public NodePropertyResolver resolverlocked = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return Repository.isNodeLocked(node, lockService);
+      }
+   };
+   
+   public NodePropertyResolver resolverOwner = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return Repository.isNodeOwner(node, lockService);
+      }
+   };
+   
+   public NodePropertyResolver resolverCancelCheckOut = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.CANCEL_CHECK_OUT);
+      }
+   };
+   
+   public NodePropertyResolver resolverCheckIn = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.CHECK_IN);
+      }
+   };
+   
+   public NodePropertyResolver resolverWorkingCopy = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY);
+      }
+   };
+   
+   public NodePropertyResolver resolverDownload = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return DownloadContentServlet.generateDownloadURL(node.getNodeRef(), node.getName());
+      }
+   };
+   
+   public NodePropertyResolver resolverUrl = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return DownloadContentServlet.generateBrowserURL(node.getNodeRef(), node.getName());
+      }
+   };
+   
+   public NodePropertyResolver resolverWebdavUrl = new NodePropertyResolver() {
+      public Object get(Node node) 
+      {
+         return Utils.generateURL(FacesContext.getCurrentInstance(), node, URLMode.WEBDAV); 
+      }   
+   };
+   
+   public NodePropertyResolver resolverCifsPath = new NodePropertyResolver() {
+      public Object get(Node node)
+      {
+         return Utils.generateURL(FacesContext.getCurrentInstance(), node, URLMode.CIFS);
+      }
+   };
+   
+   public NodePropertyResolver resolverFileType16 = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return Utils.getFileTypeImage(node.getName(), true);
+      }
+   };
+   
+   public NodePropertyResolver resolverFileType32 = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return Utils.getFileTypeImage(node.getName(), false);
+      }
+   };
+   
+   public NodePropertyResolver resolverPath = new NodePropertyResolver() {
+      public Object get(Node node) {
+         return nodeService.getPath(node.getNodeRef());
+      }
+   };
+   
+   public NodePropertyResolver resolverDisplayPath = new NodePropertyResolver() {
+      public Object get(Node node) {
+         // TODO: replace this with a method that shows the full display name - not QNames
+         return Repository.getDisplayPath( (Path)node.getProperties().get("path") );
+      }
+   };
+   
+   public NodePropertyResolver resolverSpaceIcon = new NodePropertyResolver() {
+      public Object get(Node node) {
+         QNameNodeMap props = (QNameNodeMap)node.getProperties();
+         String icon = (String)props.getRaw("app:icon");
+         return (icon != null ? icon : NewSpaceWizard.SPACE_ICON_DEFAULT);
+      }
+   };
+   
+   public NodePropertyResolver resolverMimetype = new NodePropertyResolver() {
+      public Object get(Node node) {
+         ContentData content = (ContentData)node.getProperties().get(ContentModel.PROP_CONTENT);
+         return (content != null ? content.getMimetype() : null);
+      }
+   };
+   
+   public NodePropertyResolver resolverSize = new NodePropertyResolver() {
+      public Object get(Node node) {
+         ContentData content = (ContentData)node.getProperties().get(ContentModel.PROP_CONTENT);
+         return (content != null ? new Long(content.getSize()) : null);
+      }
+   };
+   
+   public NodePropertyResolver resolverEditLinkType = new NodePropertyResolver() {
+      public Object get(Node node)
+      {
+         String editLinkType = "http";
+         
+         // if the node is inline editable, the default http behaviour should 
+         // always be used otherwise the configured approach is used
+         if (node.hasAspect(ContentModel.ASPECT_INLINEEDITABLE) == false)
+         {
+            editLinkType = clientConfig.getEditLinkType();
+            if (editLinkType == null)
+            {
+               editLinkType = "http";
+            }
+         }
+         
+         return editLinkType;
+      }
+   };
+   
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers
+   
+   /**
+    * Action called from the Simple Search component.
+    * Sets up the SearchContext object with the values from the simple search menu.
+    */
+   public void search(ActionEvent event)
+   {
+      // setup the search text string on the top-level navigation handler
+      UISimpleSearch search = (UISimpleSearch)event.getComponent();
+      this.navigator.setSearchContext(search.getSearchContext());
+      
+      navigateBrowseScreen();
+   }
+   
+   /**
+    * Action called to Close the search dialog by returning to the last view node Id
+    */
+   public void closeSearch(ActionEvent event)
+   {
+      // set the current node Id ready for page refresh
+      this.navigator.setCurrentNodeId( this.navigator.getCurrentNodeId() );
+   }
+   
+   /**
+    * Action called when a folder space is clicked.
+    * Navigate into the space.
+    */
+   public void clickSpace(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         try
+         {
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            
+            // refresh UI based on node selection
+            updateUILocation(ref);
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+   }
+   
+   /**
+    * Handler called when a path element is clicked - navigate to the appropriate Space
+    */
+   public void clickSpacePath(ActionEvent event)
+   {
+      UINodePath.PathElementEvent pathEvent = (UINodePath.PathElementEvent)event;
+      NodeRef ref = pathEvent.NodeReference;
+      try
+      {
+         // refresh UI based on node selection
+         this.updateUILocation(ref);
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {ref.getId()}) );
+      }
+   }
+   
+   /**
+    * Action called when a folders direct descendant (in the 'list' browse mode) is clicked.
+    * Navigate into the the descendant space.
+    */
+   public void clickDescendantSpace(ActionEvent event)
+   {
+      UINodeDescendants.NodeSelectedEvent nodeEvent = (UINodeDescendants.NodeSelectedEvent)event;
+      NodeRef nodeRef = nodeEvent.NodeReference;
+      if (nodeRef == null)
+      {
+         throw new IllegalStateException("NodeRef returned from UINodeDescendants.NodeSelectedEvent cannot be null!");
+      }
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Selected noderef Id: " + nodeRef.getId());
+      
+      try
+      {
+         // user can either select a descendant of a node display on the page which means we
+         // must add the it's parent and itself to the breadcrumb
+         List<IBreadcrumbHandler> location = this.navigator.getLocation();
+         ChildAssociationRef parentAssocRef = nodeService.getPrimaryParent(nodeRef);
+         
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("Selected item getPrimaryParent().getChildRef() noderef Id:  " + parentAssocRef.getChildRef().getId());
+            logger.debug("Selected item getPrimaryParent().getParentRef() noderef Id: " + parentAssocRef.getParentRef().getId());
+            logger.debug("Current value getNavigator().getCurrentNodeId() noderef Id: " + this.navigator.getCurrentNodeId());
+         }
+         
+         if (nodeEvent.IsParent == false)
+         {
+            // a descendant of the displayed node was selected
+            // first refresh based on the parent and add to the breadcrumb
+            updateUILocation(parentAssocRef.getParentRef());
+            
+            // now add our selected node
+            updateUILocation(nodeRef);
+         }
+         else
+         {
+            // else the parent ellipses i.e. the displayed node was selected
+            updateUILocation(nodeRef);
+         }
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {nodeRef.getId()}) );
+      }
+   }
+   
+   /**
+    * Action event called by all Browse actions that need to setup a Space context
+    * before an action page/wizard is called. The context will be a Node in setActionSpace() which
+    * can be retrieved on the action page from BrowseBean.getActionSpace().
+    * 
+    * @param event   ActionEvent
+    */
+   public void setupSpaceAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      setupSpaceAction(id, true);
+   }
+   
+   /**
+    * Public helper to setup action pages with Space context
+    * 
+    * @param id     of the Space node to setup context for
+    */
+   public void setupSpaceAction(String id, boolean invalidate)
+   {
+      if (id != null && id.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Setup for action, setting current space to: " + id);
+         
+         try
+         {
+            // create the node ref, then our node representation
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+            
+            // resolve icon in-case one has not been set
+            node.addPropertyResolver("icon", this.resolverSpaceIcon);
+            
+            // prepare a node for the action context
+            setActionSpace(node);
+            
+            // setup the dispatch context in case it is required
+            this.navigator.setupDispatchContext(node);
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+      else
+      {
+         setActionSpace(null);
+      }
+      
+      // clear the UI state in preparation for finishing the next action
+      if (invalidate == true)
+      {
+         // use the context service to notify all registered beans
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      }
+   }
+   
+   /**
+    * Acrtion event called by Delete Space actions. We setup the action space as normal, then prepare
+    * any special case message string to be shown to the user if they are trying to delete specific spaces. 
+    */
+   public void setupDeleteAction(ActionEvent event)
+   {
+      String message = null;
+      
+      setupSpaceAction(event);
+      
+      Node node = getActionSpace();
+      if (node != null)
+      {
+         NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+         if (node.getNodeRef().equals(companyRootRef))
+         {
+            message = Application.getMessage(FacesContext.getCurrentInstance(), MSG_DELETE_COMPANYROOT);
+         }
+      }
+      
+      setDeleteMessage(message);
+   }
+   
+   /**
+    * Action event called by all actions that need to setup a Content Document context on the 
+    * BrowseBean before an action page/wizard is called. The context will be a Node in
+    * setDocument() which can be retrieved on the action page from BrowseBean.getDocument().
+    */
+   public void setupContentAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      setupContentAction(params.get("id"), true);
+   }
+   
+   /**
+    * Public helper to setup action pages with content context
+    * 
+    * @param id     of the content node to setup context for
+    */
+   public void setupContentAction(String id, boolean invalidate)
+   {
+      if (id != null && id.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Setup for action, setting current document to: " + id);
+         
+         try
+         {
+            // create the node ref, then our node representation
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+            
+            // store the URL to for downloading the content
+            node.addPropertyResolver("url", this.resolverDownload);
+            node.addPropertyResolver("fileType32", this.resolverFileType32);
+            node.addPropertyResolver("mimetype", this.resolverMimetype);
+            node.addPropertyResolver("size", this.resolverSize);
+            node.addPropertyResolver("cancelCheckOut", this.resolverCancelCheckOut);
+            node.addPropertyResolver("checkIn", this.resolverCheckIn);
+            
+            // get hold of the DocumentDetailsBean and reset it
+            DocumentDetailsBean docDetails = (DocumentDetailsBean)FacesContext.getCurrentInstance().
+               getExternalContext().getSessionMap().get("DocumentDetailsBean");
+            if (docDetails != null)
+            {
+               docDetails.reset();
+            }
+            
+            // remember the document
+            setDocument(node);
+            
+            // setup the dispatch context in case it is required
+            this.navigator.setupDispatchContext(node);
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+      else
+      {
+         setDocument(null);
+      }
+      
+      // clear the UI state in preparation for finishing the next action
+      if (invalidate == true)
+      {
+         invalidateComponents();
+      }
+   }
+   
+   /**
+    * Handler called upon the completion of the Delete Space page
+    * 
+    * @return outcome
+    */
+   public String deleteSpaceOK()
+   {
+      String outcome = null;
+      
+      Node node = getActionSpace();
+      if (node != null)
+      {
+         try
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to delete space: " + node.getId());
+            
+            this.nodeService.deleteNode(node.getNodeRef());
+            
+            // remove this node from the breadcrumb if required
+            List<IBreadcrumbHandler> location = navigator.getLocation();
+            IBreadcrumbHandler handler = location.get(location.size() - 1);
+            if (handler instanceof BrowseBreadcrumbHandler)
+            {
+               // see if the current breadcrumb location is our node 
+               if ( ((BrowseBreadcrumbHandler)handler).getNodeRef().equals(node.getNodeRef()) == true )
+               {
+                  location.remove(location.size() - 1);
+                  
+                  // now work out which node to set the list to refresh against
+                  if (location.size() != 0)
+                  {
+                     handler = location.get(location.size() - 1);
+                     if (handler instanceof BrowseBreadcrumbHandler)
+                     {
+                        // change the current node Id
+                        navigator.setCurrentNodeId(((BrowseBreadcrumbHandler)handler).getNodeRef().getId());
+                     }
+                     else
+                     {
+                        // TODO: shouldn't do this - but for now the user home dir is the root!
+                        navigator.setCurrentNodeId(Application.getCurrentUser(FacesContext.getCurrentInstance()).getHomeSpaceId());
+                     }
+                  }
+               }
+            }
+            
+            // add a message to inform the user that the delete was OK 
+            String statusMsg = MessageFormat.format(
+                  Application.getMessage(FacesContext.getCurrentInstance(), "status_space_deleted"), 
+                  new Object[]{node.getName()});
+            Utils.addStatusMessage(FacesMessage.SEVERITY_INFO, statusMsg);
+            
+            // clear action context
+            setActionSpace(null);
+            
+            // setting the outcome will show the browse view again
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_SPACE) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: deleteSpaceOK called without a current Space!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Handler called upon the completion of the Delete File page
+    * 
+    * @return outcome
+    */
+   public String deleteFileOK()
+   {
+      String outcome = null;
+      
+      Node node = getDocument();
+      if (node != null)
+      {
+         try
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to delete content node: " + node.getId());
+            
+            this.nodeService.deleteNode(node.getNodeRef());
+            
+            // clear action context
+            setDocument(null);
+            
+            // setting the outcome will show the browse view again
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_FILE) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: deleteFileOK called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Initialise default values from client configuration
+    */
+   private void initFromClientConfig()
+   {
+      this.clientConfig = (ClientConfigElement)Application.getConfigService(
+            FacesContext.getCurrentInstance()).getGlobalConfig().
+            getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      this.browseViewMode = clientConfig.getDefaultView(PAGE_NAME_BROWSE);
+      this.browsePageSize = clientConfig.getDefaultPageSize(PAGE_NAME_BROWSE, 
+            this.browseViewMode);
+   }
+   
+   /**
+    * Refresh the UI after a Space selection change. Adds the selected space to the breadcrumb
+    * location path and also updates the list components in the UI.
+    * 
+    * @param ref     NodeRef of the selected space
+    */
+   /*package*/ void updateUILocation(NodeRef ref)
+   {
+      // get the current breadcrumb location and append a new handler to it
+      // our handler know the ID of the selected node and the display label for it
+      List<IBreadcrumbHandler> location = this.navigator.getLocation();
+      if (location.size() != 0)
+      {
+         // attempt to find the ID - if it's already in the breadcrumb then we
+         // navigate directly to that node - rather than add duplication to the breadcrumb path
+         boolean foundNode = false;
+         for (int i=0; i<location.size(); i++)
+         {
+            IBreadcrumbHandler element = location.get(i);
+            if (element instanceof IRepoBreadcrumbHandler)
+            {
+               NodeRef nodeRef = ((IRepoBreadcrumbHandler)element).getNodeRef();
+               if (ref.equals(nodeRef) == true)
+               {
+                  // TODO: we should be able to do this - but the UIBreadcrumb component modifies
+                  //       it's own internal value when clicked - then uses that from then on!
+                  //       the other ops are using the same List object and modding it directly.
+                  //List<IBreadcrumbHandler> newLocation = new ArrayList<IBreadcrumbHandler>(i+1);
+                  //newLocation.addAll(location.subList(0, i + 1));
+                  //this.navigator.setLocation(newLocation);
+                  // TODO: but instead for now we do this:
+                  int count = location.size();
+                  for (int n=i+1; n<count; n++)
+                  {
+                     location.remove(i+1);
+                  }
+                  
+                  foundNode = true;
+                  break;
+               }
+            }
+         }
+         
+         // add new node to the end of the existing breadcrumb
+         if (foundNode == false)
+         {
+            String name = Repository.getNameForNode(this.nodeService, ref);
+            location.add(new BrowseBreadcrumbHandler(ref, name));
+         }
+      }
+      else
+      {
+         // special case to add first item to the location
+         String name = Repository.getNameForNode(this.nodeService, ref);
+         location.add(new BrowseBreadcrumbHandler(ref, name));
+      }
+      
+      // set the current node Id ready for page refresh
+      this.navigator.setCurrentNodeId(ref.getId());
+      
+      // set up the dispatch context for the navigation handler
+      this.navigator.setupDispatchContext(new Node(ref));
+      
+      navigateBrowseScreen();
+   }
+   
+   /**
+    * Invalidate list component state after an action which changes the UI context
+    */
+   private void invalidateComponents()
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Invalidating browse components...");
+      
+      // clear the value for the list components - will cause re-bind to it's data and refresh
+      if (this.contentRichList != null)
+      {
+         this.contentRichList.setValue(null);
+         if (this.navigator.getSearchContext() != null)
+         {
+            // clear the sorting mode so the search results are displayed in default 'score' order
+            this.contentRichList.clearSort();
+         }
+      }
+      if (this.spacesRichList != null)
+      {
+         this.spacesRichList.setValue(null);
+         if (this.navigator.getSearchContext() != null)
+         {
+            // clear the sorting mode so the search results are displayed in default 'score' order
+            this.spacesRichList.clearSort();
+         }
+      }
+      
+      // clear the storage of the last set of nodes
+      this.containerNodes = null;
+      this.contentNodes = null;
+   }
+   
+   /**
+    * @return whether the current View ID is the "browse" screen
+    */
+   private boolean isViewCurrent()
+   {
+      return (FacesContext.getCurrentInstance().getViewRoot().getViewId().equals(BROWSE_VIEW_ID));
+   }
+   
+   /**
+    * Perform navigation to the browse screen if it is not already the current View
+    */
+   private void navigateBrowseScreen()
+   {
+      String outcome = null;
+      
+      if (isViewCurrent() == false)
+      {
+         outcome = "browse";
+      }
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class to handle breadcrumb interaction for Browse pages
+    */
+   private class BrowseBreadcrumbHandler implements IRepoBreadcrumbHandler
+   {
+      private static final long serialVersionUID = 3833183653173016630L;
+      
+      /**
+       * Constructor
+       * 
+       * @param NodeRef    The NodeRef for this browse navigation element
+       * @param label      Element label
+       */
+      public BrowseBreadcrumbHandler(NodeRef nodeRef, String label)
+      {
+         this.label = label;
+         this.nodeRef = nodeRef;
+      }
+      
+      /**
+       * @see java.lang.Object#toString()
+       */
+      public String toString()
+      {
+         return this.label;
+      }
+
+      /**
+       * @see org.alfresco.web.ui.common.component.IBreadcrumbHandler#navigationOutcome(org.alfresco.web.ui.common.component.UIBreadcrumb)
+       */
+      @SuppressWarnings("unchecked")
+      public String navigationOutcome(UIBreadcrumb breadcrumb)
+      {
+         // All browse breadcrumb element relate to a Node Id - when selected we
+         // set the current node id
+         navigator.setCurrentNodeId(this.nodeRef.getId());
+         navigator.setLocation( (List)breadcrumb.getValue() );
+         
+         // setup the dispatch context
+         navigator.setupDispatchContext(new Node(this.nodeRef));
+         
+         // return to browse page if required
+         return (isViewCurrent() ? null : "browse"); 
+      }
+      
+      public NodeRef getNodeRef()
+      {
+         return this.nodeRef;
+      }
+      
+      private NodeRef nodeRef;
+      private String label;
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   public static final String BROWSE_VIEW_ID = "/jsp/browse/browse.jsp";
+   
+   /** I18N messages */
+   private static final String MSG_ERROR_DELETE_FILE  = "error_delete_file";
+   private static final String MSG_ERROR_DELETE_SPACE = "error_delete_space";
+   private static final String MSG_DELETE_COMPANYROOT = "delete_companyroot_confirm";
+   private static final String MSG_SEARCH_MINIMUM     = "search_minimum";
+   
+   private static Logger logger = Logger.getLogger(BrowseBean.class);
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The SearchService to be used by the bean */
+   private SearchService searchService;
+   
+   /** The LockService to be used by the bean */
+   private LockService lockService;
+   
+   /** The NavigationBean bean reference */
+   private NavigationBean navigator;
+   
+   /** The DictionaryService bean reference */
+   private DictionaryService dictionaryService;
+   
+   /** The file folder service */
+   private FileFolderService fileFolderService;
+
+   /** Client configuration object */
+   private ClientConfigElement clientConfig = null;
+   
+   /** Component references */
+   private UIRichList spacesRichList;
+   private UIRichList contentRichList;
+   private UIStatusMessage statusMessage;
+   
+   /** Transient lists of container and content nodes for display */
+   private List<Node> containerNodes = null;
+   private List<Node> contentNodes = null;
+   
+   /** The current space and it's properties - if any */
+   private Node actionSpace;
+   
+   /** The current document */
+   private Node document;
+   
+   /** Special message to display when user deleting certain folders e.g. Company Home */
+   private String deleteMessage;
+   
+   /** The current browse view mode - set to a well known IRichListRenderer identifier */
+   private String browseViewMode;
+   
+   /** The current browse view page size */
+   private int browsePageSize;
+   
+   /** True if current space has a dashboard (template) view available */
+   private boolean dashboardView;
+}
diff --git a/source/java/org/alfresco/web/bean/CategoriesBean.java b/source/java/org/alfresco/web/bean/CategoriesBean.java
new file mode 100644
index 0000000000..31ddaade30
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/CategoriesBean.java
@@ -0,0 +1,688 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.CategoryService;
+import org.alfresco.service.cmr.search.CategoryService.Depth;
+import org.alfresco.service.cmr.search.CategoryService.Mode;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIBreadcrumb;
+import org.alfresco.web.ui.common.component.UIModeList;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
+import org.apache.log4j.Logger;
+
+/**
+ * Backing Bean for the Category Management pages.
+ * 
+ * @author Kevin Roast
+ */
+public class CategoriesBean implements IContextListener
+{
+   private static final String DEFAULT_OUTCOME = "finish";
+
+   private static final String MSG_CATEGORIES = "categories";
+
+   private static Logger logger = Logger.getLogger(CategoriesBean.class);
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   private CategoryService categoryService;
+   
+   /** Component references */
+   private UIRichList categoriesRichList;
+   
+   /** Currently visible category Node*/
+   private Node category = null;
+   
+   /** Current category ref */
+   private NodeRef categoryRef = null;
+   
+   /** Action category node */
+   private Node actionCategory = null;
+   
+   /** Member Count of the linked items of a category */
+   private Integer members = null;
+   
+   /** Dialog properties */
+   private String name = null;
+   private String description = null;
+   
+   /** RichList view mode */
+   private String viewMode = "icons"; 
+   
+   /** Category path breadcrumb location */
+   private List<IBreadcrumbHandler> location = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Construction 
+   
+   /**
+    * Default Constructor
+    */
+   public CategoriesBean()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).registerBean(this);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @param nodeService      The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * @param categoryService  The CategoryService to set.
+    */
+   public void setCategoryService(CategoryService categoryService)
+   {
+      this.categoryService = categoryService;
+   }
+   
+   /**
+    * @param list    The categories RichList to set.
+    */
+   public void setCategoriesRichList(UIRichList list)
+   {
+      this.categoriesRichList = list;
+   }
+   
+   /**
+    * @return Returns the categories RichList to set.
+    */
+   public UIRichList getCategoriesRichList()
+   {
+      return this.categoriesRichList;
+   }
+   
+   /**
+    * @return Returns the description.
+    */
+   public String getDescription()
+   {
+      return this.description;
+   }
+
+   /**
+    * @param description The description to set.
+    */
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+   
+   /**
+    * @return Returns the viewMode.
+    */
+   public String getViewMode()
+   {
+      return this.viewMode;
+   }
+
+   /**
+    * @param viewMode The viewMode to set.
+    */
+   public void setViewMode(String viewMode)
+   {
+      this.viewMode = viewMode;
+   }
+
+   /**
+    * @return Returns the name.
+    */
+   public String getName()
+   {
+      return this.name;
+   }
+
+   /**
+    * @param name The name to set.
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   /**
+    * @return Returns the members count for current action category.
+    */
+   public int getMembers()
+   {
+      return (this.members != null ? this.members.intValue() : 0);
+   }
+   
+   /**
+    * @return Returns the Node being used for the current action screen.
+    */
+   public Node getActionCategory()
+   {
+      return this.actionCategory;
+   }
+   
+   /**
+    * @param actionSpace     Set the Node to be used for the current category screen action.
+    */
+   public void setActionCategory(Node node)
+   {
+      this.actionCategory = node;
+      
+      if (node != null)
+      {
+         // setup form properties
+         this.name = node.getName();
+         this.description = (String)node.getProperties().get(ContentModel.PROP_DESCRIPTION);
+         this.members = this.categoryService.getChildren(node.getNodeRef(), Mode.MEMBERS, Depth.ANY).size();
+      }
+      else
+      {
+         this.name = null;
+         this.description = null;
+         this.members = 0;
+      }
+   }
+   
+   /**
+    * @return The currently displayed category as a Node or null if at the root.
+    */
+   public Node getCurrentCategory()
+   {
+      if (this.category == null)
+      {
+         if (this.categoryRef != null)
+         {
+            this.category = new Node(this.categoryRef);
+         }
+      }
+      
+      return this.category;
+   }
+   
+   /**
+    * @return The ID of the currently displayed category or null if at the root.
+    */
+   public String getCurrentCategoryId()
+   {
+      if (this.categoryRef != null)
+      {
+         return categoryRef.getId();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   
+   /**
+    * Set the current category node.
+    * <p>
+    * Setting this value causes the UI to update and display the specified node as current.
+    * 
+    * @param ref     The current category node.
+    */
+   public void setCurrentCategory(NodeRef ref)
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Setting current category: " + ref);
+      
+      // set the current NodeRef for our UI context operations
+      this.categoryRef = ref;
+      
+      // clear current node context
+      this.category = null;
+      
+      // inform that the UI needs updating after this change 
+      contextUpdated();
+   }
+   
+   /**
+    * @return Breadcrumb location list
+    */
+   public List<IBreadcrumbHandler> getLocation()
+   {
+      if (this.location == null)
+      {
+         List<IBreadcrumbHandler> loc = new ArrayList<IBreadcrumbHandler>(8);
+         loc.add(new CategoryBreadcrumbHandler(null,
+               Application.getMessage(FacesContext.getCurrentInstance(), MSG_CATEGORIES)));
+         
+         this.location = loc;
+      }
+      return this.location;
+   }
+   
+   /**
+    * @param location Breadcrumb location list
+    */
+   public void setLocation(List<IBreadcrumbHandler> location)
+   {
+      this.location = location;
+   }
+   
+   /**
+    * @return The list of categories Nodes to display. Returns the list root categories or the
+    *         list of sub-categories for the current category if set.
+    */
+   public List<Node> getCategories()
+   {
+      List<Node> categories;
+      
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         Collection<ChildAssociationRef> refs;
+         if (this.categoryRef == null)
+         {
+            // root categories
+            refs = this.categoryService.getCategories(Repository.getStoreRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE, Depth.IMMEDIATE);
+         }
+         else
+         {
+            // sub-categories of an existing category
+            refs = this.categoryService.getChildren(this.categoryRef, Mode.SUB_CATEGORIES, Depth.IMMEDIATE);
+         }
+         categories = new ArrayList<Node>(refs.size());
+         for (ChildAssociationRef child : refs)
+         {
+            Node categoryNode = new Node(child.getChildRef());
+            // force early props init within transaction
+            categoryNode.getProperties();
+            categories.add(categoryNode);
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {refErr.getNodeRef()}) );
+         categories = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         categories = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      
+      return categories;
+   }
+   
+   /**
+    * Set the Category to be used for next action dialog
+    */
+   public void setupCategoryAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Setup for action, setting current Category to: " + id);
+         
+         try
+         {
+            // create the node ref, then our node representation
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+            
+            // prepare a node for the action context
+            setActionCategory(node);
+            
+            // clear datalist cache ready from return from action dialog
+            contextUpdated();
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+   }
+   
+   /**
+    * Clear the category action context - e.g. ready for a Create operation
+    */
+   public void clearCategoryAction(ActionEvent event)
+   {
+      setActionCategory(null);
+      
+      // clear datalist cache ready from return from action dialog
+      contextUpdated();
+   }
+   
+   /**
+    * Action called when a category folder is clicked.
+    * Navigate into the category.
+    */
+   public void clickCategory(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         try
+         {
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            
+            // refresh UI based on node selection
+            updateUILocation(ref);
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+   }
+   
+   /**
+    * Action handler called on Create Category finish button click.
+    */
+   public String finishCreate()
+   {
+      String outcome = DEFAULT_OUTCOME;
+      
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         // create category using categoryservice
+         NodeRef ref;
+         if (categoryRef == null)
+         {
+            ref = this.categoryService.createRootCategory(Repository.getStoreRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE, this.name);
+         }
+         else
+         {
+            ref = this.categoryService.createCategory(categoryRef, this.name);
+         }
+         
+         // apply the titled aspect - for description
+         Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(1, 1.0f);
+         titledProps.put(ContentModel.PROP_DESCRIPTION, this.description);
+         this.nodeService.addAspect(ref, ContentModel.ASPECT_TITLED, titledProps);
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Throwable err)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action handler called on Edit Category finish button click.
+    */
+   public String finishEdit()
+   {
+      String outcome = DEFAULT_OUTCOME;
+      
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         // update the category node
+         NodeRef nodeRef = getActionCategory().getNodeRef();
+         this.nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, this.name);
+         
+         // apply the titled aspect - for description
+         if (this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TITLED) == false)
+         {
+            Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(1, 1.0f);
+            titledProps.put(ContentModel.PROP_DESCRIPTION, this.description);
+            this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, titledProps);
+         }
+         else
+         {
+            this.nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, this.description);
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // edit the node in the breadcrumb if required
+         List<IBreadcrumbHandler> location = getLocation();
+         IBreadcrumbHandler handler = location.get(location.size() - 1);
+         
+         // see if the current breadcrumb location is our node 
+         if ( nodeRef.equals(((IRepoBreadcrumbHandler)handler).getNodeRef()) )
+         {
+            // and update with the modified node details
+            IBreadcrumbHandler newHandler = new CategoryBreadcrumbHandler(
+                  nodeRef, Repository.getNameForNode(nodeService, nodeRef));
+            location.set(location.size() - 1, newHandler);
+         }
+      }
+      catch (Throwable err)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action handler called on Delete Category finish button click.
+    */
+   public String finishDelete()
+   {
+      String outcome = DEFAULT_OUTCOME;
+      
+      if (getActionCategory() != null)
+      {
+         UserTransaction tx = null;
+         try
+         {
+            FacesContext context = FacesContext.getCurrentInstance();
+            tx = Repository.getUserTransaction(context);
+            tx.begin();
+            
+            // delete the category node using the nodeservice
+            NodeRef nodeRef = getActionCategory().getNodeRef();
+            this.categoryService.deleteCategory(nodeRef);
+            
+            // commit the transaction
+            tx.commit();
+            
+            // remove this node from the breadcrumb if required
+            List<IBreadcrumbHandler> location = getLocation();
+            IBreadcrumbHandler handler = location.get(location.size() - 1);
+            
+            // see if the current breadcrumb location is our node 
+            if ( nodeRef.equals(((IRepoBreadcrumbHandler)handler).getNodeRef()) )
+            {
+               location.remove(location.size() - 1);
+               
+               // now work out which node to set the list to refresh against
+               if (location.size() != 0)
+               {
+                  handler = location.get(location.size() - 1);
+                  this.setCurrentCategory(((IRepoBreadcrumbHandler)handler).getNodeRef());
+               }
+            }
+            
+            // clear action context
+            setActionCategory(null);
+         }
+         catch (Throwable err)
+         {
+            // rollback the transaction
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+            outcome = null;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Change the current view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void viewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      
+      // get the view mode ID
+      setViewMode(viewList.getValue().toString());
+   }
+   
+   /**
+    * Update the breadcrumb with the clicked category location
+    */
+   private void updateUILocation(NodeRef ref)
+   {
+      String name = Repository.getNameForNode(this.nodeService, ref);
+      this.location.add(new CategoryBreadcrumbHandler(ref, name));
+      this.setCurrentCategory(ref);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation 
+   
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Invalidating Category Management Components...");
+      
+      // force a requery of the current category ref properties
+      this.category = null;
+      
+      // force a requery of the richlist dataset
+      this.categoriesRichList.setValue(null);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class to handle breadcrumb interaction for Categories pages
+    */
+   private class CategoryBreadcrumbHandler implements IRepoBreadcrumbHandler
+   {
+      private static final long serialVersionUID = 3831234653171036630L;
+      
+      /**
+       * Constructor
+       * 
+       * @param NodeRef    The NodeRef for this browse navigation element
+       * @param label      Element label
+       */
+      public CategoryBreadcrumbHandler(NodeRef nodeRef, String label)
+      {
+         this.label = label;
+         this.nodeRef = nodeRef;
+      }
+      
+      /**
+       * @see java.lang.Object#toString()
+       */
+      public String toString()
+      {
+         return this.label;
+      }
+
+      /**
+       * @see org.alfresco.web.ui.common.component.IBreadcrumbHandler#navigationOutcome(org.alfresco.web.ui.common.component.UIBreadcrumb)
+       */
+      public String navigationOutcome(UIBreadcrumb breadcrumb)
+      {
+         // All category breadcrumb elements relate to a Categiry Node Id
+         // when selected we set the current category Id and return
+         setCurrentCategory(this.nodeRef);
+         setLocation( (List)breadcrumb.getValue() );
+         
+         return null;
+      }
+      
+      public NodeRef getNodeRef()
+      {
+         return this.nodeRef;
+      }
+      
+      private NodeRef nodeRef;
+      private String label;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
new file mode 100644
index 0000000000..27546a6a5c
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
@@ -0,0 +1,951 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.version.VersionModel;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionType;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Kevin Roast
+ */
+public class CheckinCheckoutBean
+{
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @return Returns the BrowseBean.
+    */
+   public BrowseBean getBrowseBean()
+   {
+      return this.browseBean;
+   }
+   
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @return Returns the NodeService.
+    */
+   public NodeService getNodeService()
+   {
+      return this.nodeService;
+   }
+
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * @return Returns the VersionOperationsService.
+    */
+   public CheckOutCheckInService getVersionOperationsService()
+   {
+      return this.versionOperationsService;
+   }
+   
+   /**
+    * @param versionOperationsService  The VersionOperationsService to set.
+    */
+   public void setVersionOperationsService(CheckOutCheckInService versionOperationsService)
+   {
+      this.versionOperationsService = versionOperationsService;
+   }
+   
+   /**
+    * @return Returns the ContentService.
+    */
+   public ContentService getContentService()
+   {
+      return this.contentService;
+   }
+
+   /**
+    * @param contentService   The ContentService to set.
+    */
+   public void setContentService(ContentService contentService)
+   {
+      this.contentService = contentService;
+   }
+   
+   /**
+    * @return The document node being used for the current operation
+    */
+   public Node getDocument()
+   {
+      return this.document;
+   }
+
+   /**
+    * @param document The document node to be used for the current operation
+    */
+   public void setDocument(Node document)
+   {
+      this.document = document;
+   }
+   
+   /**
+    * @return Returns the working copy Document.
+    */
+   public Node getWorkingDocument()
+   {
+      return this.workingDocument;
+   }
+   
+   /**
+    * @param workingDocument The working copy Document to set.
+    */
+   public void setWorkingDocument(Node workingDocument)
+   {
+      this.workingDocument = workingDocument;
+   }
+   
+   /**
+    * Determines whether the document being checked in has 
+    * the versionable aspect applied
+    * 
+    * @return true if the versionable aspect is applied
+    */
+   public boolean isVersionable()
+   {
+      return getDocument().hasAspect(ContentModel.ASPECT_VERSIONABLE);
+   }
+   
+   /**
+    * @param keepCheckedOut   The keepCheckedOut to set.
+    */
+   public void setKeepCheckedOut(boolean keepCheckedOut)
+   {
+      this.keepCheckedOut = keepCheckedOut;
+   }
+   
+   /**
+    * @return Returns the keepCheckedOut.
+    */
+   public boolean getKeepCheckedOut()
+   {
+      return this.keepCheckedOut;
+   }
+   
+   /**
+    * @param minorChange   The minorChange to set.
+    */
+   public void setMinorChange(boolean minorChange)
+   {
+      this.minorChange = minorChange;
+   }
+   
+   /**
+    * @return Returns the minorChange flag.
+    */
+   public boolean getMinorChange()
+   {
+      return this.minorChange;
+   }
+   
+   /**
+    * @return Returns the version history notes.
+    */
+   public String getVersionNotes()
+   {
+      return this.versionNotes;
+   }
+
+   /**
+    * @param versionNotes  The version history notes to set.
+    */
+   public void setVersionNotes(String versionNotes)
+   {
+      this.versionNotes = versionNotes;
+   }
+   
+   /**
+    * @return Returns the selected Space Id.
+    */
+   public NodeRef getSelectedSpaceId()
+   {
+      return this.selectedSpaceId;
+   }
+   
+   /**
+    * @param selectedSpaceId  The selected Space Id to set.
+    */
+   public void setSelectedSpaceId(NodeRef selectedSpaceId)
+   {
+      this.selectedSpaceId = selectedSpaceId;
+   }
+   
+   /**
+    * @return Returns the copy location. Either the current or other space.
+    */
+   public String getCopyLocation()
+   {
+      if (this.fileName != null)
+      {
+         return CheckinCheckoutBean.COPYLOCATION_OTHER;
+      }
+      else
+      {
+         return this.copyLocation;
+      }
+   }
+   
+   /**
+    * @param copyLocation The copy location. Either the current or other space.
+    */
+   public void setCopyLocation(String copyLocation)
+   {
+      this.copyLocation = copyLocation;
+   }
+   
+   /**
+    * @return Returns the message to display when a file has been uploaded
+    */
+   public String getFileUploadSuccessMsg()
+   {
+      String msg = Application.getMessage(FacesContext.getCurrentInstance(), "file_upload_success");
+      return MessageFormat.format(msg, new Object[] {getFileName()});
+   }
+   
+   /**
+    * @return Returns the name of the file
+    */
+   public String getFileName()
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)ctx.getExternalContext().getSessionMap().
+         get(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+      if (fileBean != null)
+      {
+         this.file = fileBean.getFile();
+         this.fileName = fileBean.getFileName();
+      }
+      
+      return this.fileName;
+   }
+
+   /**
+    * @param fileName The name of the file
+    */
+   public void setFileName(String fileName)
+   {
+      this.fileName = fileName;
+      
+      // we also need to keep the file upload bean in sync
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)ctx.getExternalContext().getSessionMap().
+         get(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+      if (fileBean != null)
+      {
+         fileBean.setFileName(this.fileName);
+      }
+   }
+   
+   /**
+    * @return Returns the document content used for HTML in-line editing.
+    */
+   public String getDocumentContent()
+   {
+      return this.documentContent;
+   }
+   
+   /**
+    * @param documentContent     The document content for HTML in-line editing.
+    */
+   public void setDocumentContent(String documentContent)
+   {
+      this.documentContent = documentContent;
+   }
+   
+   /**
+    * @return Returns output from the in-line editor page.
+    */
+   public String getEditorOutput()
+   {
+      return this.editorOutput;
+   }
+
+   /**
+    * @param editorOutput  The output from the in-line editor page
+    */
+   public void setEditorOutput(String editorOutput)
+   {
+      this.editorOutput = editorOutput;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers
+   
+   /**
+    * Action event called by all actions that need to setup a Content Document context on the 
+    * CheckinCheckoutBean before an action page/wizard is called. The context will be a Node in
+    * setDocument() which can be retrieved on action pages via getDocument().
+    * 
+    * @param event   ActionEvent
+    */
+   public void setupContentAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         setupContentDocument(id);
+      }
+      else
+      {
+         setDocument(null);
+      }
+      
+      clearUpload();
+   }
+   
+   /**
+    * Setup a content document node context
+    * 
+    * @param id      GUID of the node to setup as the content document context
+    * 
+    * @return The Node
+    */
+   private Node setupContentDocument(String id)
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Setup for action, setting current document to: " + id);
+
+      Node node = null;
+      
+      try
+      {
+         // create the node ref, then our node representation
+         NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+         node = new Node(ref);
+         
+         // create content URL to the content download servlet with ID and expected filename
+         // the myfile part will be ignored by the servlet but gives the browser a hint
+         String url = DownloadContentServlet.generateDownloadURL(ref, node.getName());
+         node.getProperties().put("url", url);
+         node.getProperties().put("workingCopy", node.hasAspect(ContentModel.ASPECT_WORKING_COPY));
+         node.getProperties().put("fileType32", Utils.getFileTypeImage(node.getName(), false)); 
+         
+         // remember the document
+         setDocument(node);
+         
+         // refresh the UI, calling this method now is fine as it basically makes sure certain
+         // beans clear the state - so when we finish here other beans will have been reset
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+      }
+      
+      return node;
+   }
+   
+   /**
+    * Action called upon completion of the Check Out file page
+    */
+   public String checkoutFile()
+   {
+      String outcome = null;
+      
+      UserTransaction tx = null;
+      
+      Node node = getDocument();
+      if (node != null)
+      {
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+            tx.begin();
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to checkout content node Id: " + node.getId());
+            
+            // checkout the node content to create a working copy
+            if (logger.isDebugEnabled())
+            {
+               logger.debug("Checkout copy location: " + getCopyLocation());
+               logger.debug("Selected Space Id: " + this.selectedSpaceId);
+            }
+            NodeRef workingCopyRef;
+            if (getCopyLocation().equals(COPYLOCATION_OTHER) && this.selectedSpaceId != null)
+            {
+               // checkout to a arbituary parent Space 
+               NodeRef destRef = this.selectedSpaceId;
+               
+               ChildAssociationRef childAssocRef = this.nodeService.getPrimaryParent(destRef);
+               workingCopyRef = this.versionOperationsService.checkout(node.getNodeRef(),
+                     destRef, ContentModel.ASSOC_CONTAINS, childAssocRef.getQName());
+            }
+            else
+            {
+               workingCopyRef = this.versionOperationsService.checkout(node.getNodeRef());
+            }
+            
+            // set the working copy Node instance
+            Node workingCopy = new Node(workingCopyRef);
+            setWorkingDocument(workingCopy);
+            
+            // create content URL to the content download servlet with ID and expected filename
+            // the myfile part will be ignored by the servlet but gives the browser a hint
+            String url = DownloadContentServlet.generateDownloadURL(workingCopyRef, workingCopy.getName());
+            
+            workingCopy.getProperties().put("url", url);
+            workingCopy.getProperties().put("fileType32", Utils.getFileTypeImage(workingCopy.getName(), false)); 
+            
+            // commit the transaction
+            tx.commit();
+            
+            // show the page that display the checkout link
+            outcome = "checkoutFileLink";
+         }
+         catch (Throwable err)
+         {
+            // rollback the transaction
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_CHECKOUT) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: checkoutFile called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called upon completion of the Check Out file Link download page
+    */
+   public String checkoutFileOK()
+   {
+      String outcome = null;
+      
+      Node node = getWorkingDocument();
+      if (node != null)
+      {
+         // clean up and clear action context
+         clearUpload();
+         setDocument(null);
+         setWorkingDocument(null);
+         
+         outcome = "browse";
+      }
+      else
+      {
+         logger.warn("WARNING: checkoutFileOK called without a current WorkingDocument!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called upon completion of the Edit File download page
+    */
+   public String editFileOK()
+   {
+      String outcome = null;
+      
+      Node node = getDocument();
+      if (node != null)
+      {
+         // clean up and clear action context
+         clearUpload();
+         setDocument(null);
+         setWorkingDocument(null);
+         
+         outcome = "browse";
+      }
+      else
+      {
+         logger.warn("WARNING: editFileOK called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action handler called to calculate which editing screen to display based on the mimetype
+    * of a document. If appropriate, the in-line editing screen will be shown.
+    */
+   public void editFile(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         Node node = setupContentDocument(id);
+         
+         // detect the inline editing aspect to see which edit mode to use
+         if (node.hasAspect(ContentModel.ASPECT_INLINEEDITABLE) &&
+             node.getProperties().get(ContentModel.PROP_EDITINLINE) != null &&
+             ((Boolean)node.getProperties().get(ContentModel.PROP_EDITINLINE)).booleanValue() == true)
+         {
+            // retrieve the content reader for this node
+            ContentReader reader = getContentService().getReader(node.getNodeRef(), ContentModel.PROP_CONTENT);
+            String mimetype = reader.getMimetype();
+            
+            // calculate which editor screen to display
+            if (MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(mimetype) ||
+                MimetypeMap.MIMETYPE_XML.equals(mimetype) ||
+                MimetypeMap.MIMETYPE_TEXT_CSS.equals(mimetype))
+            {
+               // make content available to the editing screen
+               if (reader != null)
+               {
+                  setEditorOutput(reader.getContentString());
+               }
+               else
+               {
+                  setEditorOutput("");
+               }
+               
+               // navigate to appropriate screen
+               FacesContext fc = FacesContext.getCurrentInstance();
+               fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editTextInline");
+            }
+            else
+            {
+               // make content available to the editing screen
+               if (reader != null)
+               {
+                  setDocumentContent(reader.getContentString());
+               }
+               else
+               {
+                  setDocumentContent("");
+               }
+               setEditorOutput(null);
+               
+               // navigate to appropriate screen
+               FacesContext fc = FacesContext.getCurrentInstance();
+               fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editHtmlInline");
+            }
+         }
+         else
+         {
+            // normal downloadable document
+            FacesContext fc = FacesContext.getCurrentInstance();
+            fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editFile");
+         }
+      }
+   }
+   
+   /**
+    * Action handler called to set the content of a node from an inline editing page.
+    */
+   public String editInlineOK()
+   {
+      String outcome = null;
+      
+      UserTransaction tx = null;
+      
+      Node node = getDocument();
+      if (node != null)
+      {
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+            tx.begin();
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to update content node Id: " + node.getId());
+            
+            // get an updating writer that we can use to modify the content on the current node
+            ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true);
+            writer.putContent(this.editorOutput);
+            
+            // commit the transaction
+            tx.commit();
+            
+            // clean up and clear action context
+            clearUpload();
+            setDocument(null);
+            setDocumentContent(null);
+            setEditorOutput(null);
+            
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            // rollback the transaction
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE) + err.getMessage());
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: editInlineOK called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action to undo the checkout of a document just checked out from the checkout screen.
+    */
+   public String undoCheckout()
+   {
+      String outcome = null;
+      
+      Node node = getWorkingDocument();
+      if (node != null)
+      {
+         try
+         {
+            // try to cancel checkout of the working copy
+            this.versionOperationsService.cancelCheckout(node.getNodeRef());
+            
+            clearUpload();
+            
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_CANCELCHECKOUT) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: undoCheckout called without a current WorkingDocument!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action to undo the checkout of a locked document. This document may either by the original copy
+    * or the working copy node. Therefore calculate which it is, if the working copy is found then
+    * we simply cancel checkout on that document. If the original copy is found then we need to find
+    * the appropriate working copy and perform the action on that node.
+    */
+   public String undoCheckoutFile()
+   {
+      String outcome = null;
+      
+      Node node = getDocument();
+      if (node != null)
+      {
+         try
+         {
+            if (node.hasAspect(ContentModel.ASPECT_WORKING_COPY))
+            {
+               this.versionOperationsService.cancelCheckout(node.getNodeRef());
+            }
+            else if (node.hasAspect(ContentModel.ASPECT_LOCKABLE))
+            {
+               // TODO: find the working copy for this document and cancel the checkout on it
+               //       is this possible? as currently only the workingcopy aspect has the copyReference
+               //       attribute - this means we cannot find out where the copy is to cancel it!
+               //       can we construct an XPath node lookup?
+               throw new RuntimeException("NOT IMPLEMENTED");
+            }
+            else
+            {
+               throw new IllegalStateException("Node supplied for undo checkout has neither Working Copy or Locked aspect!");
+            }
+            
+            clearUpload();
+            
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage(MSG_ERROR_CANCELCHECKOUT + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: undoCheckout called without a current WorkingDocument!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called upon completion of the Check In file page
+    */
+   public String checkinFileOK()
+   {
+      String outcome = null;
+      
+      UserTransaction tx = null;
+      
+      // NOTE: for checkin the document node _is_ the working document!
+      Node node = getDocument();
+      if (node != null && (getCopyLocation().equals(COPYLOCATION_CURRENT) || this.getFileName() != null))
+      {
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+            tx.begin();
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to checkin content node Id: " + node.getId());
+            
+            // we can either checkin the content from the current working copy node
+            // which would have been previously updated by the user
+            String contentUrl;
+            String mimetype;
+            if (getCopyLocation().equals(COPYLOCATION_CURRENT))
+            {
+               ContentData contentData = (ContentData) node.getProperties().get(ContentModel.PROP_CONTENT);
+               contentUrl = (contentData == null ? null : contentData.getContentUrl());
+            }
+            // or specify a specific file as the content instead
+            else
+            {
+               // add the content to an anonymous but permanent writer location
+               // we can then retrieve the URL to the content to to be set on the node during checkin
+               ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, false);
+               // TODO: Adjust the mimetype
+               writer.putContent(this.file);
+               contentUrl = writer.getContentUrl();
+            }
+            
+            if (contentUrl == null || contentUrl.length() == 0)
+            {
+               throw new IllegalStateException("Content URL is empty for specified working copy content node!");
+            }
+            
+            // add version history text to props
+            Map<String, Serializable> props = new HashMap<String, Serializable>(1, 1.0f);
+            props.put(Version.PROP_DESCRIPTION, this.versionNotes);
+            // set the flag for minor or major change
+            if (this.minorChange)
+            {
+               props.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR);
+            }
+            else
+            {
+               props.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
+            }
+            
+            NodeRef originalDoc = this.versionOperationsService.checkin(
+                  node.getNodeRef(),
+                  props,
+                  contentUrl, 
+                  this.keepCheckedOut);
+            
+            // commit the transaction
+            tx.commit();
+            
+            // clear action context
+            setDocument(null);
+            clearUpload();
+            
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            // rollback the transaction
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_CHECKIN) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: checkinFileOK called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called upon completion of the Update File page
+    */
+   public String updateFileOK()
+   {
+      String outcome = null;
+      
+      UserTransaction tx = null;
+      
+      // NOTE: for update the document node _is_ the working document!
+      Node node = getDocument();
+      if (node != null && this.getFileName() != null)
+      {
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+            tx.begin();
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Trying to update content node Id: " + node.getId());
+            
+            // get an updating writer that we can use to modify the content on the current node
+            ContentWriter writer = this.contentService.getWriter(node.getNodeRef(), ContentModel.PROP_CONTENT, true);
+            writer.putContent(this.file);
+            
+            // commit the transaction
+            tx.commit();
+            
+            // clear action context
+            setDocument(null);
+            clearUpload();
+            
+            outcome = "browse";
+         }
+         catch (Throwable err)
+         {
+            // rollback the transaction
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: updateFileOK called without a current Document!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Deals with the cancel button being pressed on the check in file page
+    */
+   public String cancel()
+   {
+      // reset the state
+      clearUpload();
+      
+      return "browse";
+   }
+   
+   /**
+    * Clear form state and upload file bean
+    */
+   private void clearUpload()
+   {
+      // delete the temporary file we uploaded earlier
+      if (this.file != null)
+      {
+         this.file.delete();
+      }
+      
+      this.file = null;
+      this.fileName = null;
+      this.keepCheckedOut = false;
+      this.minorChange = true;
+      this.copyLocation = COPYLOCATION_CURRENT;
+      this.versionNotes = "";
+      this.selectedSpaceId = null;
+      
+      // remove the file upload bean from the session
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      ctx.getExternalContext().getSessionMap().remove(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   private static Log logger = LogFactory.getLog(CheckinCheckoutBean.class);
+   
+   /** I18N messages */
+   private static final String MSG_ERROR_CHECKIN = "error_checkin";
+   private static final String MSG_ERROR_CANCELCHECKOUT = "error_cancel_checkout";
+   private static final String MSG_ERROR_UPDATE = "error_update";
+   private static final String MSG_ERROR_CHECKOUT = "error_checkout";
+
+   /** constants for copy location selection */
+   private static final String COPYLOCATION_CURRENT = "current";
+   private static final String COPYLOCATION_OTHER   = "other";
+   
+   /** The current document */
+   private Node document;
+   
+   /** The working copy of the document we are checking out */
+   private Node workingDocument;
+   
+   /** Content of the document used for HTML in-line editing */
+   private String documentContent;
+   
+   /** Content of the document returned from in-line editing */
+   private String editorOutput;
+   
+   /** transient form and upload properties */
+   private File file;
+   private String fileName;
+   private boolean keepCheckedOut = false;
+   private boolean minorChange = true;
+   private String copyLocation = COPYLOCATION_CURRENT;
+   private String versionNotes = "";
+   private NodeRef selectedSpaceId = null;
+   
+   /** The BrowseBean to be used by the bean */
+   private BrowseBean browseBean;
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The VersionOperationsService to be used by the bean */
+   private CheckOutCheckInService versionOperationsService;
+   
+   /** The ContentService to be used by the bean */
+   private ContentService contentService;
+}
diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
new file mode 100644
index 0000000000..1db1ddfecf
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
@@ -0,0 +1,1262 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.CopyService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
+import org.alfresco.web.bean.repository.MapNode;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.wizard.NewRuleWizard;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.Utils.URLMode;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIPanel.ExpandedEvent;
+import org.apache.log4j.Logger;
+
+/**
+ * Backing bean providing access to the details of a document
+ * 
+ * @author gavinc
+ */
+public class DocumentDetailsBean
+{
+   private static final String MSG_SUCCESS_OWNERSHIP = "success_ownership";
+   private static final String MSG_HAS_FOLLOWING_CATEGORIES = "has_following_categories";
+   private static final String MSG_NO_CATEGORIES_APPLIED = "no_categories_applied";
+   private static final String MSG_ERROR_ASPECT_INLINEEDITABLE = "error_aspect_inlineeditable";
+   private static final String MSG_ERROR_ASPECT_VERSIONING = "error_aspect_versioning";
+   private static final String MSG_ERROR_ASPECT_CLASSIFY = "error_aspect_classify";
+   private static final String MSG_ERROR_WORKFLOW_REJECT = "error_workflow_reject";
+   private static final String MSG_ERROR_WORKFLOW_APPROVE = "error_workflow_approve";
+   private static final String MSG_ERROR_UPDATE_SIMPLEWORKFLOW = "error_update_simpleworkflow";
+   private static final String MSG_ERROR_UPDATE_CATEGORY = "error_update_category";
+
+   private static Logger logger = Logger.getLogger(DocumentDetailsBean.class);
+   
+   private BrowseBean browseBean;
+   private NodeService nodeService;
+   private LockService lockService;
+   private CopyService copyService;
+   private VersionService versionService;
+   private OwnableService ownableService;
+   private NavigationBean navigator;
+   
+   private Map<String, Boolean> panels = new HashMap<String, Boolean>(5, 1.0f);
+   
+   private Map<String, Serializable> workflowProperties;
+   private NodeRef addedCategory;
+   private List categories;
+
+
+   /**
+    * Default constructor
+    */
+   public DocumentDetailsBean()
+   {
+      // initial state of some panels that don't use the default
+      panels.put("workflow-panel", false);
+      panels.put("category-panel", false);
+      panels.put("version-history-panel", false);
+   }
+   
+   /**
+    * Resets any state that may be held by this bean
+    */
+   public void reset()
+   {
+      // reset the workflow cache
+      this.workflowProperties = null;
+      
+      // reset the category caches
+      this.categories = null;
+      this.addedCategory = null;
+   }
+   
+   /**
+    * Returns the id of the current document
+    * 
+    * @return The id
+    */
+   public String getId()
+   {
+      return getDocument().getId();
+   }
+   
+   /**
+    * Returns the name of the current document
+    * 
+    * @return Name of the current document
+    */
+   public String getName()
+   {
+      return getDocument().getName();
+   }
+   
+   /**
+    * Returns the URL to download content for the current document
+    * 
+    * @return Content url to download the current document
+    */
+   public String getUrl()
+   {
+      return (String)getDocument().getProperties().get("url");
+   }
+   
+   /**
+    * Returns the URL to the content for the current document
+    *  
+    * @return Content url to the current document
+    */
+   public String getBrowserUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getDocument(), URLMode.HTTP_INLINE);
+   }
+
+   /**
+    * Returns the download URL to the content for the current document
+    *  
+    * @return Download url to the current document
+    */
+   public String getDownloadUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getDocument(), URLMode.HTTP_DOWNLOAD);
+   }
+   
+   /**
+    * Returns the WebDAV URL for the current document
+    * 
+    * @return The WebDAV url
+    */
+   public String getWebdavUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getDocument(), URLMode.WEBDAV);
+   }
+   
+   /**
+    * Returns the URL to access the details page for the current document
+    * 
+    * @return The bookmark URL
+    */
+   public String getBookmarkUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getDocument(), URLMode.SHOW_DETAILS);
+   }
+   
+   /**
+    * Returns the CIFS path for the current document
+    * 
+    * @return The CIFS path
+    */
+   public String getCifsPath()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getDocument(), URLMode.CIFS);
+   }
+   
+   /**
+    * Determines whether the current document is versionable
+    * 
+    * @return true if the document has the versionable aspect
+    */
+   public boolean isVersionable()
+   {
+      return getDocument().hasAspect(ContentModel.ASPECT_VERSIONABLE);
+   }
+   
+   /**
+    * @return true if the current document has the 'inlineeditable' aspect applied
+    */
+   public boolean isInlineEditable()
+   {
+      return getDocument().hasAspect(ContentModel.ASPECT_INLINEEDITABLE);
+   }
+   
+   /**
+    * Returns a list of objects representing the versions of the 
+    * current document 
+    * 
+    * @return List of previous versions
+    */
+   public List getVersionHistory()
+   {
+      List<MapNode> versions = new ArrayList<MapNode>();
+      
+      if (getDocument().hasAspect(ContentModel.ASPECT_VERSIONABLE))
+      {
+         VersionHistory history = this.versionService.getVersionHistory(getDocument().getNodeRef());
+   
+         if (history != null)
+         {
+            for (Version version : history.getAllVersions())
+            {
+               // create a map node representation of the version
+               MapNode clientVersion = new MapNode(version.getFrozenStateNodeRef());
+               clientVersion.put("versionLabel", version.getVersionLabel());
+               clientVersion.put("notes", version.getDescription());
+               clientVersion.put("author", clientVersion.get("creator"));
+               clientVersion.put("versionDate", version.getCreatedDate());
+               clientVersion.put("url", DownloadContentServlet.generateBrowserURL(version.getFrozenStateNodeRef(), 
+                     clientVersion.getName()));
+               
+               // add the client side version to the list
+               versions.add(clientVersion);
+            }
+         }
+      }
+      
+      return versions;
+   }
+   
+   /**
+    * Determines whether the current document has any categories applied
+    * 
+    * @return true if the document has categories attached
+    */
+   public boolean isCategorised()
+   {
+      return getDocument().hasAspect(ContentModel.ASPECT_GEN_CLASSIFIABLE);
+   }
+   
+   /**
+    * Returns a list of objects representing the categories applied to the 
+    * current document
+    *  
+    * @return List of categories
+    */
+   public String getCategoriesOverviewHTML()
+   {
+      String html = null;
+      
+      if (isCategorised())
+      {
+         // we know for now that the general classifiable aspect only will be
+         // applied so we can retrive the categories property direclty
+         Collection categories = (Collection)this.nodeService.getProperty(this.browseBean.getDocument().getNodeRef(), 
+               ContentModel.PROP_CATEGORIES);
+         
+         if (categories == null || categories.size() == 0)
+         {
+            html = Application.getMessage(FacesContext.getCurrentInstance(), MSG_NO_CATEGORIES_APPLIED);
+         }
+         else
+         {
+            StringBuilder builder = new StringBuilder(Application.getMessage(FacesContext.getCurrentInstance(), 
+                  MSG_HAS_FOLLOWING_CATEGORIES));
+            
+            builder.append("<ul>");
+            for (Object obj : categories)
+            {
+               if (obj instanceof NodeRef)
+               {
+                  if (this.nodeService.exists((NodeRef)obj))
+                  {
+                     builder.append("<li>");
+                     builder.append(Repository.getNameForNode(this.nodeService, (NodeRef)obj));
+                     builder.append("</li>");
+                  }
+               }
+            }
+            builder.append("</ul>");
+            
+            html = builder.toString();
+         }
+      }
+      
+      return html;
+   }
+
+   /**
+    * Event handler called to setup the categories for editing
+    * 
+    * @param event The event
+    */
+   public void setupCategoriesForEdit(ActionEvent event)
+   {
+      this.categories = (List)this.nodeService.getProperty(this.browseBean.getDocument().getNodeRef(), 
+               ContentModel.PROP_CATEGORIES);
+   }
+   
+   /**
+    * Returns a Map of the initial categories on the node keyed by the NodeRef
+    * 
+    * @return Map of initial categories
+    */
+   public List getCategories()
+   {
+      return this.categories;
+   }
+   
+   /**
+    * Sets the categories Map
+    * 
+    * @param categories
+    */
+   public void setCategories(List categories)
+   {
+      this.categories = categories;
+   }
+   
+   /**
+    * Returns the last category added from the multi value editor
+    * 
+    * @return The last category added
+    */
+   public NodeRef getAddedCategory()
+   {
+      return this.addedCategory;
+   }
+
+   /**
+    * Sets the category added from the multi value editor
+    * 
+    * @param addedCategory The added category
+    */
+   public void setAddedCategory(NodeRef addedCategory)
+   {
+      this.addedCategory = addedCategory;
+   }
+   
+   /**
+    * Updates the categories for the current document
+    *  
+    * @return The outcome
+    */
+   public String saveCategories()
+   {
+      String outcome = "cancel";
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // firstly retrieve all the properties for the current node
+         Map<QName, Serializable> updateProps = this.nodeService.getProperties(
+               getDocument().getNodeRef());
+         
+         // create a node ref representation of the selected id and set the new properties
+         updateProps.put(ContentModel.PROP_CATEGORIES, (Serializable)this.categories);
+         
+         // set the properties on the node
+         this.nodeService.setProperties(getDocument().getNodeRef(), updateProps);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the state of the current document so it reflects the changes just made
+         getDocument().reset();
+         
+         outcome = "finish";
+      }
+      catch (Throwable e)
+      {
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE_CATEGORY), e.getMessage()), e);
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Returns an overview summary of the current state of the attached
+    * workflow (if any)
+    * 
+    * @return Summary HTML
+    */
+   public String getWorkflowOverviewHTML()
+   {
+      String html = null;
+      
+      if (getDocument().hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW))
+      {
+         // get the simple workflow aspect properties
+         Map<String, Object> props = getDocument().getProperties();
+
+         String approveStepName = (String)props.get(
+               ContentModel.PROP_APPROVE_STEP.toString());
+         String rejectStepName = (String)props.get(
+               ContentModel.PROP_REJECT_STEP.toString());
+         
+         Boolean approveMove = (Boolean)props.get(
+               ContentModel.PROP_APPROVE_MOVE.toString());
+         Boolean rejectMove = (Boolean)props.get(
+               ContentModel.PROP_REJECT_MOVE.toString());
+         
+         NodeRef approveFolder = (NodeRef)props.get(
+               ContentModel.PROP_APPROVE_FOLDER.toString());
+         NodeRef rejectFolder = (NodeRef)props.get(
+               ContentModel.PROP_REJECT_FOLDER.toString());
+         
+         String approveFolderName = null;
+         String rejectFolderName = null;
+         
+         // get the approve folder name
+         if (approveFolder != null)
+         {
+            Node node = new Node(approveFolder);
+            approveFolderName = node.getName();
+         }
+         
+         // get the reject folder name
+         if (rejectFolder != null)
+         {
+            Node node = new Node(rejectFolder);
+            rejectFolderName = node.getName();
+         }
+         
+         StringBuilder builder = new StringBuilder();
+         
+         // calculate the approve action string
+         String action = null;
+         if (approveMove.booleanValue())
+         {
+            action = Application.getMessage(FacesContext.getCurrentInstance(), "moved");
+         }
+         else
+         {
+            action = Application.getMessage(FacesContext.getCurrentInstance(), "copied");
+         }
+         
+         String docActionPattern = Application.getMessage(FacesContext.getCurrentInstance(), "document_action");
+         Object[] params = new Object[] {action, approveFolderName, approveStepName};
+         builder.append(MessageFormat.format(docActionPattern, params));
+         
+         // add details of the reject step if there is one
+         if (rejectStepName != null && rejectMove != null && rejectFolderName != null)
+         {
+            if (rejectMove.booleanValue())
+            {
+               action = Application.getMessage(FacesContext.getCurrentInstance(), "moved");
+            }
+            else
+            {
+               action = Application.getMessage(FacesContext.getCurrentInstance(), "copied");
+            }
+            
+            builder.append("<p>");
+            params = new Object[] {action, rejectFolderName, rejectStepName};
+            builder.append(MessageFormat.format(docActionPattern, params));
+            builder.append("</p>");
+         }
+         
+         html = builder.toString();
+      }
+         
+      return html;
+   }
+   
+   /**
+    * Returns the properties for the attached workflow as a map
+    * 
+    * @return Properties of the attached workflow, null if there is no workflow
+    */
+   public Map<String, Serializable> getWorkflowProperties()
+   {
+      if (this.workflowProperties == null && 
+          getDocument().hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW))
+      {
+         // get the exisiting properties for the document
+         Map<String, Object> props = getDocument().getProperties();
+         
+         String approveStepName = (String)props.get(
+               ContentModel.PROP_APPROVE_STEP.toString());
+         String rejectStepName = (String)props.get(
+               ContentModel.PROP_REJECT_STEP.toString());
+         
+         Boolean approveMove = (Boolean)props.get(
+               ContentModel.PROP_APPROVE_MOVE.toString());
+         Boolean rejectMove = (Boolean)props.get(
+               ContentModel.PROP_REJECT_MOVE.toString());
+         
+         NodeRef approveFolder = (NodeRef)props.get(
+               ContentModel.PROP_APPROVE_FOLDER.toString());
+         NodeRef rejectFolder = (NodeRef)props.get(
+               ContentModel.PROP_REJECT_FOLDER.toString());
+
+         // put the workflow properties in a separate map for use by the JSP
+         this.workflowProperties = new HashMap<String, Serializable>(7);
+         this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_STEP_NAME, 
+               approveStepName);
+         this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_ACTION, 
+               approveMove ? "move" : "copy");
+         this.workflowProperties.put(NewRuleWizard.PROP_APPROVE_FOLDER, approveFolder);
+         
+         if (rejectStepName == null || rejectMove == null || rejectFolder == null)
+         {
+            this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_PRESENT, "no");
+         }
+         else
+         {
+            this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_PRESENT, 
+                  "yes");
+            this.workflowProperties.put(NewRuleWizard.PROP_REJECT_STEP_NAME, 
+                  rejectStepName);
+            this.workflowProperties.put(NewRuleWizard.PROP_REJECT_ACTION, 
+                  rejectMove ? "move" : "copy");
+            this.workflowProperties.put(NewRuleWizard.PROP_REJECT_FOLDER, 
+                  rejectFolder);
+         }
+      }
+      
+      return this.workflowProperties;
+   }
+   
+   /**
+    * 
+    * @return
+    */
+   public String cancelWorkflowEdit()
+   {
+      // resets the workflow properties map so any changes made
+      // don't appear to be persisted
+      this.workflowProperties.clear();
+      this.workflowProperties = null;
+      return "cancel";
+   }
+   
+   /**
+    * Saves the details of the workflow stored in workflowProperties
+    * to the current document
+    *  
+    * @return The outcome string
+    */
+   public String saveWorkflow()
+   {
+      String outcome = "cancel";
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // firstly retrieve all the properties for the current node
+         Map<QName, Serializable> updateProps = this.nodeService.getProperties(
+               getDocument().getNodeRef());
+         
+         // update the simple workflow properties
+         
+         // set the approve step name
+         updateProps.put(ContentModel.PROP_APPROVE_STEP,
+               this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_STEP_NAME));
+         
+         // specify whether the approve step will copy or move the content
+         boolean approveMove = true;
+         String approveAction = (String)this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_ACTION);
+         if (approveAction != null && approveAction.equals("copy"))
+         {
+            approveMove = false;
+         }
+         updateProps.put(ContentModel.PROP_APPROVE_MOVE, Boolean.valueOf(approveMove));
+         
+         // create node ref representation of the destination folder
+         updateProps.put(ContentModel.PROP_APPROVE_FOLDER,
+               this.workflowProperties.get(NewRuleWizard.PROP_APPROVE_FOLDER));
+         
+         // determine whether there should be a reject step
+         boolean requireReject = true;
+         String rejectStepPresent = (String)this.workflowProperties.get(
+               NewRuleWizard.PROP_REJECT_STEP_PRESENT);
+         if (rejectStepPresent != null && rejectStepPresent.equals("no"))
+         {
+            requireReject = false;
+         }
+         
+         if (requireReject)
+         {
+            // set the reject step name
+            updateProps.put(ContentModel.PROP_REJECT_STEP,
+                  this.workflowProperties.get(NewRuleWizard.PROP_REJECT_STEP_NAME));
+         
+            // specify whether the reject step will copy or move the content
+            boolean rejectMove = true;
+            String rejectAction = (String)this.workflowProperties.get(
+                  NewRuleWizard.PROP_REJECT_ACTION);
+            if (rejectAction != null && rejectAction.equals("copy"))
+            {
+               rejectMove = false;
+            }
+            updateProps.put(ContentModel.PROP_REJECT_MOVE, Boolean.valueOf(rejectMove));
+
+            // create node ref representation of the destination folder
+            updateProps.put(ContentModel.PROP_REJECT_FOLDER,
+                  this.workflowProperties.get(NewRuleWizard.PROP_REJECT_FOLDER));
+         }
+         else
+         {
+            // set all the reject properties to null to signify there should
+            // be no reject step
+            updateProps.put(ContentModel.PROP_REJECT_STEP, null);
+            updateProps.put(ContentModel.PROP_REJECT_MOVE, null);
+            updateProps.put(ContentModel.PROP_REJECT_FOLDER, null);
+         }
+         
+         // set the properties on the node
+         this.nodeService.setProperties(getDocument().getNodeRef(), updateProps);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the state of the current document so it reflects the changes just made
+         getDocument().reset();
+         
+         outcome = "finish";
+      }
+      catch (Throwable e)
+      {
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE_SIMPLEWORKFLOW), e.getMessage()), e);
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Returns the name of the approve step of the attached workflow
+    * 
+    * @return The name of the approve step or null if there is no workflow
+    */
+   public String getApproveStepName()
+   {
+      String approveStepName = null;
+      
+      if (getDocument().hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW))
+      {
+         approveStepName = (String)getDocument().getProperties().get(
+               ContentModel.PROP_APPROVE_STEP.toString());
+      }
+      
+      return approveStepName; 
+   }
+   
+   /**
+    * Event handler called to handle the approve step of the simple workflow
+    * 
+    * @param event The event that was triggered
+    */
+   public void approve(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id == null || id.length() == 0)
+      {
+         throw new AlfrescoRuntimeException("approve called without an id");
+      }
+      
+      NodeRef docNodeRef = new NodeRef(Repository.getStoreRef(), id);
+      Node docNode = new Node(docNodeRef);
+      
+      if (docNode.hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW) == false)
+      {
+         throw new AlfrescoRuntimeException("You can not approve a document that is not part of a workflow");
+      }
+      
+      // get the simple workflow aspect properties
+      Map<String, Object> props = docNode.getProperties();
+      
+      Boolean approveMove = (Boolean)props.get(ContentModel.PROP_APPROVE_MOVE.toString());
+      NodeRef approveFolder = (NodeRef)props.get(ContentModel.PROP_APPROVE_FOLDER.toString());
+      
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // first we need to take off the simpleworkflow aspect
+         this.nodeService.removeAspect(docNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW);
+         
+         if (approveMove.booleanValue())
+         {
+            // move the document to the specified folder
+            String qname = QName.createValidLocalName(docNode.getName());
+            this.nodeService.moveNode(docNodeRef, approveFolder, ContentModel.ASSOC_CONTAINS,
+                  QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, qname));
+         }
+         else
+         {
+            // copy the document to the specified folder
+            String qname = QName.createValidLocalName(docNode.getName());
+            this.copyService.copy(docNodeRef, approveFolder, ContentModel.ASSOC_CONTAINS,
+                  QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, qname));
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // if this was called via the document details dialog we need to reset the document node
+         if (getDocument() != null)
+         {
+            getDocument().reset();
+         }
+         
+         // also make sure the UI will get refreshed
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+         
+         if (logger.isDebugEnabled())
+         {
+            String movedCopied = approveMove ? "moved" : "copied";
+            logger.debug("Document has been approved and " + movedCopied + " to folder with id of " + 
+                  approveFolder.getId());
+         }
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_WORKFLOW_APPROVE), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Returns the name of the reject step of the attached workflow
+    * 
+    * @return The name of the reject step or null if there is no workflow
+    */
+   public String getRejectStepName()
+   {
+      String approveStepName = null;
+      
+      if (getDocument().hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW))
+      {
+         approveStepName = (String)getDocument().getProperties().get(
+               ContentModel.PROP_REJECT_STEP.toString());
+      }
+      
+      return approveStepName;
+   }
+   
+   /**
+    * Event handler called to handle the approve step of the simple workflow
+    * 
+    * @param event The event that was triggered
+    */
+   public void reject(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id == null || id.length() == 0)
+      {
+         throw new AlfrescoRuntimeException("reject called without an id");
+      }
+      
+      NodeRef docNodeRef = new NodeRef(Repository.getStoreRef(), id);
+      Node docNode = new Node(docNodeRef);
+      
+      if (docNode.hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW) == false)
+      {
+         throw new AlfrescoRuntimeException("You can not reject a document that is not part of a workflow");
+      }
+      
+      // get the simple workflow aspect properties
+      Map<String, Object> props = docNode.getProperties();
+      
+      String rejectStep = (String)props.get(ContentModel.PROP_REJECT_STEP.toString());
+      Boolean rejectMove = (Boolean)props.get(ContentModel.PROP_REJECT_MOVE.toString());
+      NodeRef rejectFolder = (NodeRef)props.get(ContentModel.PROP_REJECT_FOLDER.toString());
+      
+      if (rejectStep == null && rejectMove == null && rejectFolder == null)
+      {
+         throw new AlfrescoRuntimeException("The workflow does not have a reject step defined");
+      }
+      
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // first we need to take off the simpleworkflow aspect
+         this.nodeService.removeAspect(docNodeRef, ContentModel.ASPECT_SIMPLE_WORKFLOW);
+         
+         if (rejectMove.booleanValue())
+         {
+            // move the document to the specified folder
+            String qname = QName.createValidLocalName(docNode.getName());
+            this.nodeService.moveNode(docNodeRef, rejectFolder, ContentModel.ASSOC_CONTAINS,
+                  QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, qname));
+         }
+         else
+         {
+            // copy the document to the specified folder
+            String qname = QName.createValidLocalName(docNode.getName());
+            this.copyService.copy(docNodeRef, rejectFolder, ContentModel.ASSOC_CONTAINS,
+                  QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, qname));
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // if this was called via the document details dialog we need to reset the document node
+         if (getDocument() != null)
+         {
+            getDocument().reset();
+         }
+         
+         // also make sure the UI will get refreshed
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+         
+         if (logger.isDebugEnabled())
+         {
+            String movedCopied = rejectMove ? "moved" : "copied";
+            logger.debug("Document has been rejected and " + movedCopied + " to folder with id of " + 
+                  rejectFolder.getId());
+         }
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_WORKFLOW_REJECT), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Applies the classifiable aspect to the current document
+    */
+   public void applyClassifiable()
+   {
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // add the general classifiable aspect to the node
+         this.nodeService.addAspect(getDocument().getNodeRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE, null);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the state of the current document
+         getDocument().reset();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_CLASSIFY), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Applies the versionable aspect to the current document
+    */
+   public void applyVersionable()
+   {
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // add the versionable aspect to the node
+         this.nodeService.addAspect(getDocument().getNodeRef(), ContentModel.ASPECT_VERSIONABLE, null);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the state of the current document
+         getDocument().reset();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_VERSIONING), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Applies the inlineeditable aspect to the current document
+    */
+   public String applyInlineEditable()
+   {
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // add the inlineeditable aspect to the node
+         Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+         String contentType = null;
+         ContentData contentData = (ContentData)getDocument().getProperties().get(ContentModel.PROP_CONTENT);
+         if (contentData != null)
+         {
+            contentType = contentData.getMimetype();
+         }
+         if (contentType != null)
+         {
+            // set the property to true by default if the filetype is text/HTML content
+            if (MimetypeMap.MIMETYPE_HTML.equals(contentType) ||
+                MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(contentType) ||
+                MimetypeMap.MIMETYPE_XML.equals(contentType) ||
+                MimetypeMap.MIMETYPE_TEXT_CSS.equals(contentType))
+            {
+               props.put(ContentModel.PROP_EDITINLINE, true);
+            }
+         }
+         this.nodeService.addAspect(getDocument().getNodeRef(), ContentModel.ASPECT_INLINEEDITABLE, props);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the state of the current document
+         getDocument().reset();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_INLINEEDITABLE), e.getMessage()), e);
+      }
+      
+      // force recreation of the details view - this means the properties sheet component will reinit
+      return "showDocDetails";
+   }
+   
+   /**
+    * Navigates to next item in the list of content for the current Space
+    */
+   public void nextItem(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         List<Node> nodes = this.browseBean.getContent();
+         if (nodes.size() > 1)
+         {
+            // perform a linear search - this is slow but stateless
+            // otherwise we would have to manage state of last selected node
+            // this gets very tricky as this bean is instantiated once and never
+            // reset - it does not know when the document has changed etc.
+            for (int i=0; i<nodes.size(); i++)
+            {
+               if (id.equals(nodes.get(i).getId()) == true)
+               {
+                  Node next;
+                  // found our item - navigate to next
+                  if (i != nodes.size() - 1)
+                  {
+                     next = nodes.get(i + 1);
+                  }
+                  else
+                  {
+                     // handle wrapping case
+                     next = nodes.get(0);
+                  }
+                  
+                  // prepare for showing details for this node
+                  this.browseBean.setupContentAction(next.getId(), false);
+                  break;
+               }
+            }
+         }
+      }
+   }
+   
+   /**
+    * Navigates to the previous item in the list of content for the current Space
+    */
+   public void previousItem(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         List<Node> nodes = this.browseBean.getContent();
+         if (nodes.size() > 1)
+         {
+            // see above
+            for (int i=0; i<nodes.size(); i++)
+            {
+               if (id.equals(nodes.get(i).getId()) == true)
+               {
+                  Node previous;
+                  // found our item - navigate to previous
+                  if (i != 0)
+                  {
+                     previous = nodes.get(i - 1);
+                  }
+                  else
+                  {
+                     // handle wrapping case
+                     previous = nodes.get(nodes.size() - 1);
+                  }
+                  
+                  // prepare for showing details for this node
+                  this.browseBean.setupContentAction(previous.getId(), false);
+                  break;
+               }
+            }
+         }
+      }
+   }
+   
+   /**
+    * Action Handler to take Ownership of the current document
+    */
+   public void takeOwnership(ActionEvent event)
+   {
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         this.ownableService.takeOwnership(getDocument().getNodeRef());
+         
+         FacesContext context = FacesContext.getCurrentInstance();
+         String msg = Application.getMessage(context, MSG_SUCCESS_OWNERSHIP);
+         FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
+         context.addMessage(event.getComponent().getClientId(context), facesMsg);
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Save the state of the panel that was expanded/collapsed
+    */
+   public void expandPanel(ActionEvent event)
+   {
+      if (event instanceof ExpandedEvent)
+      {
+         String id = event.getComponent().getId();
+         // we prefix some panels with "no-" which we remove to give consistent behaviour in the UI
+         if (id.startsWith("no-") == true)
+         {
+            id = id.substring(3);
+         }
+         this.panels.put(id, ((ExpandedEvent)event).State);
+      }
+   }
+   
+   /**
+    * Returns a model for use by a template on the Document Details page.
+    * 
+    * @return model containing current document and current space info.
+    */
+   public Map getTemplateModel()
+   {
+      HashMap model = new HashMap(3, 1.0f);
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      TemplateNode documentNode = new TemplateNode(getDocument().getNodeRef(),
+              Repository.getServiceRegistry(fc), imageResolver);
+      model.put("document", documentNode);
+      TemplateNode spaceNode = new TemplateNode(this.navigator.getCurrentNode().getNodeRef(),
+              Repository.getServiceRegistry(fc), imageResolver);
+      model.put("space", spaceNode);
+      
+      return model;
+   }
+   
+   /** Template Image resolver helper */
+   private TemplateImageResolver imageResolver = new TemplateImageResolver()
+   {
+       public String resolveImagePathForName(String filename, boolean small)
+       {
+           return Utils.getFileTypeImage(filename, small);
+       }
+   };
+   
+   /**
+    * Returns whether the current document is locked
+    * 
+    * @return true if the document is checked out
+    */
+   public boolean isLocked()
+   {
+      return Repository.isNodeLocked(getDocument(), this.lockService);
+   }
+   
+   /**
+    * Returns whether the current document is a working copy
+    * 
+    * @return true if the document is a working copy
+    */
+   public boolean isWorkingCopy()
+   {
+      return getDocument().hasAspect(ContentModel.ASPECT_WORKING_COPY);
+   }
+   
+   /**
+    * Returns whether the current document is a working copy owned by the current User
+    * 
+    * @return true if the document is a working copy owner by the current User
+    */
+   public boolean isOwner()
+   {
+      return Repository.isNodeOwner(getDocument(), this.lockService);
+   }
+   
+   /**
+    * Returns the document this bean is currently representing
+    * 
+    * @return The document Node
+    */
+   public Node getDocument()
+   {
+      return this.browseBean.getDocument();
+   }
+   
+   /**
+    * @return Returns the panels expanded state map.
+    */
+   public Map<String, Boolean> getPanels()
+   {
+      return this.panels;
+   }
+
+   /**
+    * @param panels The panels expanded state map.
+    */
+   public void setPanels(Map<String, Boolean> panels)
+   {
+      this.panels = panels;
+   }
+   
+   /**
+    * Sets the BrowseBean instance to use to retrieve the current document
+    * 
+    * @param browseBean BrowseBean instance
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+
+   /**
+    * Sets the node service instance the bean should use
+    * 
+    * @param nodeService The NodeService
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * Sets the lock service instance the bean should use
+    * 
+    * @param lockService The LockService
+    */
+   public void setLockService(LockService lockService)
+   {
+      this.lockService = lockService;
+   }
+
+   /**
+    * Sets the version service instance the bean should use
+    * 
+    * @param versionService The VersionService
+    */
+   public void setVersionService(VersionService versionService)
+   {
+      this.versionService = versionService;
+   }
+   
+   /**
+    * Sets the copy service instance the bean should use
+    * 
+    * @param copyService The CopyService
+    */
+   public void setCopyService(CopyService copyService)
+   {
+      this.copyService = copyService;
+   }
+   
+   /**
+    * Sets the ownable service instance the bean should use
+    * 
+    * @param ownableService The OwnableService
+    */
+   public void setOwnableService(OwnableService ownableService)
+   {
+      this.ownableService = ownableService;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
new file mode 100644
index 0000000000..af1f3a065d
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigLookupContext;
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.PropertySheetConfigElement;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Backing bean for the edit document properties dialog
+ * 
+ * @author gavinc
+ */
+public class DocumentPropertiesBean
+{
+   private static final String TEMP_PROP_MIMETYPE = "mimetype";
+   
+   private NodeService nodeService;
+   private FileFolderService fileFolderService;
+   private DictionaryService dictionaryService;
+   private BrowseBean browseBean;
+   private List<SelectItem> contentTypes;
+   private Node editableNode;
+   private Boolean hasOtherProperties;
+   
+   /**
+    * Returns the node being edited
+    * 
+    * @return The node being edited
+    */
+   public Node getEditableNode()
+   {
+      return this.editableNode;
+   }
+   
+   /**
+    * Event handler called to setup the document for property editing
+    * 
+    * @param event The event
+    */
+   public void setupDocumentForAction(ActionEvent event)
+   {
+      this.editableNode = new Node(this.browseBean.getDocument().getNodeRef());
+      
+      // special case for Mimetype - since this is a sub-property of the ContentData object
+      // we must extract it so it can be edited in the client, then we check for it later
+      // and create a new ContentData object to wrap it and it's associated URL
+      ContentData content = (ContentData)this.editableNode.getProperties().get(ContentModel.PROP_CONTENT);
+      if (content != null)
+      {
+         this.editableNode.getProperties().put(TEMP_PROP_MIMETYPE, content.getMimetype());
+      }
+      
+      this.hasOtherProperties = null;
+   }
+   
+   /**
+    * Event handler used to save the edited properties back to the repository
+    * 
+    * @return The outcome
+    */
+   public String save()
+   {
+      String outcome = "cancel";
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         NodeRef nodeRef = this.browseBean.getDocument().getNodeRef();
+         Map<String, Object> props = this.editableNode.getProperties();
+         
+         // get the name and move the node as necessary
+         String name = (String) props.get(ContentModel.PROP_NAME);
+         if (name != null)
+         {
+            fileFolderService.rename(nodeRef, name);
+         }
+         
+         Map<QName, Serializable> properties = this.nodeService.getProperties(nodeRef);
+         // we need to put all the properties from the editable bag back into 
+         // the format expected by the repository
+         
+         // but first extract and deal with the special mimetype property for ContentData
+         String mimetype = (String)props.get(TEMP_PROP_MIMETYPE);
+         if (mimetype != null)
+         {
+            // remove temporary prop from list so it isn't saved with the others
+            props.remove(TEMP_PROP_MIMETYPE);
+            ContentData contentData = (ContentData)props.get(ContentModel.PROP_CONTENT);
+            if (contentData != null)
+            {
+               contentData = ContentData.setMimetype(contentData, mimetype);
+               props.put(ContentModel.PROP_CONTENT.toString(), contentData);
+            }
+         }
+         
+         // add the remaining properties
+         Iterator<String> iterProps = props.keySet().iterator();
+         while (iterProps.hasNext())
+         {
+            String propName = iterProps.next();
+            QName qname = QName.createQName(propName);
+            
+            // make sure the property is represented correctly
+            Serializable propValue = (Serializable)props.get(propName);
+            PropertyDefinition propDef = this.dictionaryService.getProperty(qname);
+            
+            properties.put(qname, propValue);
+         }
+         
+         // send the properties back to the repository
+         this.nodeService.setProperties(this.browseBean.getDocument().getNodeRef(), properties);
+         
+         // we also need to persist any association changes that may have been made
+         
+         // add any associations added in the UI
+         Map<String, Map<String, AssociationRef>> addedAssocs = this.editableNode.getAddedAssociations();
+         for (Map<String, AssociationRef> typedAssoc : addedAssocs.values())
+         {
+            for (AssociationRef assoc : typedAssoc.values())
+            {
+               this.nodeService.createAssociation(assoc.getSourceRef(), assoc.getTargetRef(), assoc.getTypeQName());
+            }
+         }
+         
+         // remove any association removed in the UI
+         Map<String, Map<String, AssociationRef>> removedAssocs = this.editableNode.getRemovedAssociations();
+         for (Map<String, AssociationRef> typedAssoc : removedAssocs.values())
+         {
+            for (AssociationRef assoc : typedAssoc.values())
+            {
+               this.nodeService.removeAssociation(assoc.getSourceRef(), assoc.getTargetRef(), assoc.getTypeQName());
+            }
+         }
+         
+         // add any child associations added in the UI
+         Map<String, Map<String, ChildAssociationRef>> addedChildAssocs = this.editableNode.getAddedChildAssociations();
+         for (Map<String, ChildAssociationRef> typedAssoc : addedChildAssocs.values())
+         {
+            for (ChildAssociationRef assoc : typedAssoc.values())
+            {
+               this.nodeService.addChild(assoc.getParentRef(), assoc.getChildRef(), assoc.getTypeQName(), assoc.getTypeQName());
+            }
+         }
+         
+         // remove any child association removed in the UI
+         Map<String, Map<String, ChildAssociationRef>> removedChildAssocs = this.editableNode.getRemovedChildAssociations();
+         for (Map<String, ChildAssociationRef> typedAssoc : removedChildAssocs.values())
+         {
+            for (ChildAssociationRef assoc : typedAssoc.values())
+            {
+               this.nodeService.removeChild(assoc.getParentRef(), assoc.getChildRef());
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // set the outcome to refresh
+         outcome = "finish";
+         
+         // reset the document held by the browse bean as it's just been updated
+         this.browseBean.getDocument().reset();
+      }
+      catch (FileExistsException e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         // print status message  
+         String statusMsg = MessageFormat.format(
+               Application.getMessage(
+                     FacesContext.getCurrentInstance(), "error_exists"), 
+                     e.getExisting().getName());
+         Utils.addErrorMessage(statusMsg);
+         // no outcome
+         outcome = null;
+      }
+      catch (InvalidNodeRefException err)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {this.browseBean.getDocument().getId()}) );
+         // this failure means the node no longer exists - we cannot show the doc properties screen
+         outcome = "browse";
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+      }
+      
+      return outcome;
+   }
+   
+   public Map<String, Object> getProperties()
+   {
+      return this.editableNode.getProperties();
+   }
+   
+   /**
+    * @return Returns a list of content types to allow the user to select from
+    */
+   public List<SelectItem> getContentTypes()
+   {
+      if (this.contentTypes == null)
+      {
+         this.contentTypes = new ArrayList<SelectItem>(80);
+         ServiceRegistry registry = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+         MimetypeService mimetypeService = registry.getMimetypeService();
+         
+         // get the mime type display names
+         Map<String, String> mimeTypes = mimetypeService.getDisplaysByMimetype();
+         for (String mimeType : mimeTypes.keySet())
+         {
+            this.contentTypes.add(new SelectItem(mimeType, mimeTypes.get(mimeType)));
+         }
+         
+         // make sure the list is sorted by the values
+         QuickSort sorter = new QuickSort(this.contentTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      return this.contentTypes;
+   }
+   
+   /**
+    * Determines whether this document has any other properties other than the 
+    * default set to display to the user.
+    * 
+    * @return true of there are properties to show, false otherwise
+    */
+   public boolean getOtherPropertiesPresent()
+   {
+      if (this.hasOtherProperties == null)
+      {
+         // we need to use the config service to see whether there are any
+         // editable properties configured for this document.
+         ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config configProps = configSvc.getConfig(this.editableNode, new ConfigLookupContext("edit-properties"));
+         PropertySheetConfigElement propsToDisplay = (PropertySheetConfigElement)configProps.
+               getConfigElement("property-sheet");
+         this.hasOtherProperties = Boolean.valueOf(propsToDisplay != null);
+      }
+      
+      return this.hasOtherProperties.booleanValue();
+   }
+   
+   /**
+    * @return Returns the nodeService.
+    */
+   public NodeService getNodeService()
+   {
+      return this.nodeService;
+   }
+
+   /**
+    * @param nodeService The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * @param fileFolderService the file and folder model-specific functions
+    */
+   public void setFileFolderService(FileFolderService fileFolderService)
+   {
+      this.fileFolderService = fileFolderService;
+   }
+
+   /**
+    * Sets the DictionaryService to use when persisting metadata
+    * 
+    * @param dictionaryService The DictionaryService
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+
+   /**
+    * @return The BrowseBean
+    */
+   public BrowseBean getBrowseBean()
+   {
+      return this.browseBean;
+   }
+
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/ErrorBean.java b/source/java/org/alfresco/web/bean/ErrorBean.java
new file mode 100644
index 0000000000..6a387f2c36
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/ErrorBean.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.servlet.ServletException;
+
+/**
+ * Bean used by the error page, holds the last exception to be thrown by the system
+ * 
+ * @author gavinc
+ */
+public class ErrorBean
+{
+   public static final String ERROR_BEAN_NAME = "alfresco.ErrorBean";
+   
+   private String returnPage;
+   private Throwable lastError;
+
+   /**
+    * @return Returns the page to go back to after the error has been displayed
+    */
+   public String getReturnPage()
+   {
+      return returnPage;
+   }
+
+   /**
+    * @param returnPage The page to return to after showing the error
+    */
+   public void setReturnPage(String returnPage)
+   {
+      this.returnPage = returnPage;
+   }
+
+   /**
+    * @return Returns the lastError.
+    */
+   public Throwable getLastError()
+   {
+      return lastError;
+   }
+
+   /**
+    * @param lastError The lastError to set.
+    */
+   public void setLastError(Throwable lastError)
+   {
+      this.lastError = lastError;
+   }
+   
+   /**
+    * @return Returns the last error to occur in string form
+    */
+   public String getLastErrorMessage()
+   {
+      String message = "No error currently stored";
+      
+      if (this.lastError != null)
+      {
+         StringBuilder builder = null;
+         Throwable cause = null;
+         if (this.lastError instanceof ServletException && 
+             ((ServletException)this.lastError).getRootCause() != null)
+         {
+            // servlet exception puts the actual error in root cause!!
+            Throwable actualError = ((ServletException)this.lastError).getRootCause();
+            builder = new StringBuilder(actualError.toString());
+            cause = actualError.getCause();
+         }
+         else
+         {
+            builder = new StringBuilder(this.lastError.toString());
+            cause = this.lastError.getCause(); 
+         }
+         
+         while (cause != null)
+         {
+            builder.append("<br/><br/>caused by:<br/>");
+            builder.append(cause.toString());
+            
+            if (cause instanceof ServletException && 
+             ((ServletException)cause).getRootCause() != null)
+            {
+               cause = ((ServletException)cause).getRootCause();
+            }
+            else
+            {
+               cause = cause.getCause();
+            }  
+         }
+         
+         message = builder.toString();
+      }
+      
+      return message;
+   }
+   
+   /**
+    * @return Returns the stack trace for the last error
+    */
+   public String getStackTrace()
+   {
+      StringWriter stringWriter = new StringWriter();
+      PrintWriter writer = new PrintWriter(stringWriter);
+      
+      if (this.lastError instanceof ServletException && 
+          ((ServletException)this.lastError).getRootCause() != null)
+      {
+         Throwable actualError = ((ServletException)this.lastError).getRootCause();
+         actualError.printStackTrace(writer);
+      }
+      else
+      {
+         this.lastError.printStackTrace(writer);
+      }
+      
+      return stringWriter.toString().replaceAll("\r\n", "<br/>");
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/ExportBean.java b/source/java/org/alfresco/web/bean/ExportBean.java
new file mode 100644
index 0000000000..fce8cf56b0
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/ExportBean.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.repo.action.executer.ExporterActionExecuter;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Backing bean implementation for the Export dialog.
+ * 
+ * @author gavinc
+ */
+public class ExportBean
+{
+   private static final Log logger = LogFactory.getLog(ExportBean.class);
+   
+   private static final String ALL_SPACES = "all";
+   private static final String CURRENT_SPACE = "current";
+
+   private static final String DEFAULT_OUTCOME = "browse";
+   
+   private static final String MSG_ERROR = "error_export";
+   
+   private BrowseBean browseBean;
+   private NodeService nodeService;
+   private ActionService actionService;
+   
+   private String packageName;
+   private String encoding = "UTF-8";
+   private String mode = CURRENT_SPACE;
+   private NodeRef destination;
+   private boolean includeChildren = true;
+   private boolean runInBackground = true;
+   private boolean includeSelf;
+   
+   /**
+    * Performs the export operation using the current state of the bean
+    * 
+    * @return The outcome
+    */
+   public String export()
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Called export for " + this.mode + " with package name: " + this.packageName);
+      
+      String outcome = DEFAULT_OUTCOME;
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // build the action params map based on the bean's current state
+         Map<String, Serializable> params = new HashMap<String, Serializable>(5);
+         params.put(ExporterActionExecuter.PARAM_STORE, Repository.getStoreRef().toString());
+         params.put(ExporterActionExecuter.PARAM_PACKAGE_NAME, this.packageName);
+         params.put(ExporterActionExecuter.PARAM_ENCODING, this.encoding);
+         params.put(ExporterActionExecuter.PARAM_DESTINATION_FOLDER, this.destination);
+         params.put(ExporterActionExecuter.PARAM_INCLUDE_CHILDREN, new Boolean(includeChildren));
+         params.put(ExporterActionExecuter.PARAM_INCLUDE_SELF, new Boolean(includeSelf));
+          
+         // build the action to execute
+         Action action = this.actionService.createAction(ExporterActionExecuter.NAME, params);
+         action.setExecuteAsynchronously(this.runInBackground);
+         
+         // get the appropriate node
+         NodeRef startNode = null;
+         if (this.mode.equals(ALL_SPACES))
+         {
+            startNode = this.nodeService.getRootNode(Repository.getStoreRef());
+         }
+         else
+         {
+            startNode = this.browseBean.getActionSpace().getNodeRef();
+         }
+         
+         // execute the action on the relevant node
+         this.actionService.executeAction(action, startNode);
+         
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("Executed export action with action params of " + params);
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the bean
+         reset();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR), e.toString()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called when the dialog is cancelled, just resets the bean's state
+    * 
+    * @return The outcome
+    */
+   public String cancel()
+   {
+      reset();
+      
+      return DEFAULT_OUTCOME;
+   }
+   
+   /**
+    * Resets the dialog state back to the default
+    */
+   public void reset()
+   {
+      this.packageName = null;
+      this.mode = CURRENT_SPACE;
+      this.destination = null;
+      this.includeChildren = true;
+      this.includeSelf = false;
+      this.runInBackground = true;
+   }
+   
+   /**
+    * Returns the package name for the export
+    * 
+    * @return The export package name
+    */
+   public String getPackageName()
+   {
+      return this.packageName;
+   }
+   
+   /**
+    * Sets the package name for the export
+    * 
+    * @param packageName The export package name 
+    */
+   public void setPackageName(String packageName)
+   {
+      this.packageName = packageName;
+   }
+   
+   /**
+    * The destination for the export as a NodeRef
+    * 
+    * @return The destination
+    */
+   public NodeRef getDestination()
+   {
+      return this.destination;
+   }
+   
+   /**
+    * Sets the destination for the export
+    * 
+    * @param destination The destination for the export
+    */
+   public void setDestination(NodeRef destination)
+   {
+      this.destination = destination;
+   }
+   
+   /**
+    * Determines whether the export will include child spaces 
+    * 
+    * @return true includes children
+    */
+   public boolean getIncludeChildren()
+   {
+      return this.includeChildren;
+   }
+   
+   /**
+    * Sets whether child spaces are included in the export 
+    * 
+    * @param includeChildren true to include the child spaces
+    */
+   public void setIncludeChildren(boolean includeChildren)
+   {
+      this.includeChildren = includeChildren;
+   }
+   
+   /**
+    * Determines whether the export will include the space itself 
+    * 
+    * @return true includes the space being exported from
+    */
+   public boolean getIncludeSelf()
+   {
+      return this.includeSelf;
+   }
+   
+   /**
+    * Sets whether the space itself is included in the export 
+    * 
+    * @param includeSelf true to include the space itself
+    */
+   public void setIncludeSelf(boolean includeSelf)
+   {
+      this.includeSelf = includeSelf;
+   }
+   
+   /**
+    * Determines whether to export only the current space or all spaces
+    * 
+    * @return "all" to export all space and "current" to export the current space
+    */
+   public String getMode()
+   {
+      return this.mode;
+   }
+   
+   /**
+    * Sets whether to export the current space or all spaces
+    * 
+    * @param mode "all" to export all space and "current" to export the current space
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * Returns the encoding to use for the export
+    *  
+    * @return The encoding
+    */
+   public String getEncoding()
+   {
+      return this.encoding;
+   }
+
+   /**
+    * Sets the encoding to use for the export package
+    * 
+    * @param encoding The encoding
+    */
+   public void setEncoding(String encoding)
+   {
+      this.encoding = encoding;
+   }
+
+   /**
+    * Determines whether the import should run in the background
+    * 
+    * @return true means the import will run in the background 
+    */
+   public boolean getRunInBackground()
+   {
+      return this.runInBackground;
+   }
+
+   /**
+    * Determines whether the import will run in the background
+    * 
+    * @param runInBackground true to run the import in the background
+    */
+   public void setRunInBackground(boolean runInBackground)
+   {
+      this.runInBackground = runInBackground;
+   }
+   
+   /**
+    * Sets the BrowseBean instance to use to retrieve the current document
+    * 
+    * @param browseBean BrowseBean instance
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * Sets the action service
+    * 
+    * @param actionService  the action service
+    */
+   public void setActionService(ActionService actionService)
+   {
+      this.actionService = actionService;
+   }
+   
+   /**
+    * Sets the node service
+    * 
+    * @param nodeService  the node service
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/FileUploadBean.java b/source/java/org/alfresco/web/bean/FileUploadBean.java
new file mode 100644
index 0000000000..fc0a5cff7d
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/FileUploadBean.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.File;
+
+/**
+ * Bean to hold the results of a file upload
+ * 
+ * @author gavinc
+ */
+public final class FileUploadBean
+{
+   public static final String FILE_UPLOAD_BEAN_NAME = "alfresco.UploadBean";
+   
+   private File file;
+   private String fileName;
+   private String filePath;
+   
+   /**
+    * @return Returns the file
+    */
+   public File getFile()
+   {
+      return file;
+   }
+   
+   /**
+    * @param file The file to set
+    */
+   public void setFile(File file)
+   {
+      this.file = file;
+   }
+
+   /**
+    * @return Returns the name of the file uploaded
+    */
+   public String getFileName()
+   {
+      return fileName;
+   }
+
+   /**
+    * @param fileName The name of the uploaded file
+    */
+   public void setFileName(String fileName)
+   {
+      this.fileName = fileName;
+   }
+
+   /**
+    * @return Returns the path of the file uploaded
+    */
+   public String getFilePath()
+   {
+      return filePath;
+   }
+
+   /**
+    * @param filePath The file path of the uploaded file
+    */
+   public void setFilePath(String filePath)
+   {
+      this.filePath = filePath;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/ForumsBean.java b/source/java/org/alfresco/web/bean/ForumsBean.java
new file mode 100644
index 0000000000..f7e6a9153d
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/ForumsBean.java
@@ -0,0 +1,1020 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.QueryParameterDefinition;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.MapNode;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.NodePropertyResolver;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIModeList;
+import org.alfresco.web.ui.common.component.data.UIColumn;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.alfresco.web.ui.common.renderer.data.IRichListRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Bean providing properties and behaviour for the forums screens.
+ * 
+ * @author gavinc
+ */
+public class ForumsBean implements IContextListener
+{
+   private static Log logger = LogFactory.getLog(ForumsBean.class);
+   private static final String PAGE_NAME_FORUMS = "forums";
+   private static final String PAGE_NAME_FORUM = "forum";
+   private static final String PAGE_NAME_TOPIC = "topic"; 
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The ContentService to be used by the bean */
+   private ContentService contentService;
+   
+   /** The DictionaryService bean reference */
+   private DictionaryService dictionaryService;
+   
+   /** The SearchService bean reference. */
+   private SearchService searchService;
+   
+   /** The NamespaceService bean reference. */
+   private NamespaceService namespaceService;
+   
+   /** The browse bean */
+   private BrowseBean browseBean;
+   
+   /** The NavigationBean bean reference */
+   private NavigationBean navigator;
+   
+   /** Client configuration object */
+   private ClientConfigElement clientConfig = null;
+   
+   /** Component references */
+   private UIRichList forumsRichList;
+   private UIRichList forumRichList;
+   private UIRichList topicRichList;
+
+   /** Node lists */
+   private List<Node> forums;
+   private List<Node> topics;
+   private List<Node> posts;
+   
+   /** The current forums view mode - set to a well known IRichListRenderer identifier */
+   private String forumsViewMode;
+   
+   /** The current forums view page size */
+   private int forumsPageSize;
+   
+   /** The current forum view mode - set to a well known IRichListRenderer identifier */
+   private String forumViewMode;
+   
+   /** The current forum view page size */
+   private int forumPageSize;
+   
+   /** The current topic view mode - set to a well known IRichListRenderer identifier */
+   private String topicViewMode;
+   
+   /** The current topic view page size */
+   private int topicPageSize;
+   
+   // ------------------------------------------------------------------------------
+   // Construction 
+
+   /**
+    * Default Constructor
+    */
+   public ForumsBean()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).registerBean(this);
+      
+      initFromClientConfig();
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * Sets the content service to use
+    * 
+    * @param contentService The ContentService
+    */
+   public void setContentService(ContentService contentService)
+   {
+      this.contentService = contentService;
+   }
+
+   /**
+    * @param dictionaryService The DictionaryService to set.
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+   
+   /**
+    * @param searchService The SearchService to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+
+   /**
+    * @param namespaceService The NamespaceService to set.
+    */
+   public void setNamespaceService(NamespaceService namespaceService)
+   {
+      this.namespaceService = namespaceService;
+   }
+
+   /**
+    * Sets the BrowseBean instance to use to retrieve the current document
+    * 
+    * @param browseBean BrowseBean instance
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+   
+   /**
+    * @param forumsRichList The forumsRichList to set.
+    */
+   public void setForumsRichList(UIRichList forumsRichList)
+   {
+      this.forumsRichList = forumsRichList;
+      if (this.forumsRichList != null)
+      {
+         // set the initial sort column and direction
+         this.forumsRichList.setInitialSortColumn(
+               clientConfig.getDefaultSortColumn(PAGE_NAME_FORUMS));
+         this.forumsRichList.setInitialSortDescending(
+               clientConfig.hasDescendingSort(PAGE_NAME_FORUMS));
+      }
+   }
+   
+   /**
+    * @return Returns the forumsRichList.
+    */
+   public UIRichList getForumsRichList()
+   {
+      return this.forumsRichList;
+   }
+   
+   /**
+    * @return Returns the forums View mode. See UIRichList
+    */
+   public String getForumsViewMode()
+   {
+      return this.forumsViewMode;
+   }
+   
+   /**
+    * @param forumsViewMode      The forums View mode to set. See UIRichList.
+    */
+   public void setForumsViewMode(String forumsViewMode)
+   {
+      this.forumsViewMode = forumsViewMode;
+   }
+   
+   /**
+    * @return Returns the forumsPageSize.
+    */
+   public int getForumsPageSize()
+   {
+      return this.forumsPageSize;
+   }
+   
+   /**
+    * @param forumsPageSize The forumsPageSize to set.
+    */
+   public void setForumsPageSize(int forumsPageSize)
+   {
+      this.forumsPageSize = forumsPageSize;
+   }
+   
+   /**
+    * @param topicRichList The topicRichList to set.
+    */
+   public void setTopicRichList(UIRichList topicRichList)
+   {
+      this.topicRichList = topicRichList;
+      
+      if (this.topicRichList != null)
+      {
+         // set the initial sort column and direction
+         this.topicRichList.setInitialSortColumn(
+               clientConfig.getDefaultSortColumn(PAGE_NAME_TOPIC));
+         this.topicRichList.setInitialSortDescending(
+               clientConfig.hasDescendingSort(PAGE_NAME_TOPIC));
+      }
+   }
+   
+   /**
+    * @return Returns the topicRichList.
+    */
+   public UIRichList getTopicRichList()
+   {
+      return this.topicRichList;
+   }
+   
+   /**
+    * @return Returns the topics View mode. See UIRichList
+    */
+   public String getTopicViewMode()
+   {
+      return this.topicViewMode;
+   }
+   
+   /**
+    * @param topicViewMode      The topic View mode to set. See UIRichList.
+    */
+   public void setTopicViewMode(String topicViewMode)
+   {
+      this.topicViewMode = topicViewMode;
+   }
+   
+   /**
+    * @return Returns the topicsPageSize.
+    */
+   public int getTopicPageSize()
+   {
+      return this.topicPageSize;
+   }
+   
+   /**
+    * @param topicPageSize The topicPageSize to set.
+    */
+   public void setTopicPageSize(int topicPageSize)
+   {
+      this.topicPageSize = topicPageSize;
+   }
+   
+   /**
+    * @param forumRichList The forumRichList to set.
+    */
+   public void setForumRichList(UIRichList forumRichList)
+   {
+      this.forumRichList = forumRichList;
+      
+      if (this.forumRichList != null)
+      {
+         // set the initial sort column and direction
+         this.forumRichList.setInitialSortColumn(
+               clientConfig.getDefaultSortColumn(PAGE_NAME_FORUM));
+         this.forumRichList.setInitialSortDescending(
+               clientConfig.hasDescendingSort(PAGE_NAME_FORUM));
+      }
+   }
+   
+   /**
+    * @return Returns the forumRichList.
+    */
+   public UIRichList getForumRichList()
+   {
+      return this.forumRichList;
+   }
+   
+   /**
+    * @return Returns the forum View mode. See UIRichList
+    */
+   public String getForumViewMode()
+   {
+      return this.forumViewMode;
+   }
+   
+   /**
+    * @param forumViewMode      The forum View mode to set. See UIRichList.
+    */
+   public void setForumViewMode(String forumViewMode)
+   {
+      this.forumViewMode = forumViewMode;
+   }
+   
+   /**
+    * @return Returns the forumPageSize.
+    */
+   public int getForumPageSize()
+   {
+      return this.forumPageSize;
+   }
+   
+   /**
+    * @param forumPageSize The forumPageSize to set.
+    */
+   public void setForumPageSize(int forumPageSize)
+   {
+      this.forumPageSize = forumPageSize;
+   }
+   
+   public List<Node> getForums()
+   {
+      if (this.forums == null)
+      {
+         getNodes();
+      }
+      
+      return this.forums;
+   }
+   
+   public List<Node> getTopics()
+   {
+      if (this.topics == null)
+      {
+         getNodes();
+      }
+      
+      return this.topics;
+   }
+   
+   public List<Node> getPosts()
+   {
+      if (this.posts == null)
+      {
+         getNodes();
+      }
+      
+      return this.posts;
+   }
+   
+   private void getNodes()
+   {
+      long startTime = 0;
+      if (logger.isDebugEnabled())
+         startTime = System.currentTimeMillis();
+      
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         // get the current space from NavigationBean
+         String parentNodeId = this.navigator.getCurrentNodeId();
+         
+         NodeRef parentRef;
+         if (parentNodeId == null)
+         {
+            // no specific parent node specified - use the root node
+            parentRef = this.nodeService.getRootNode(Repository.getStoreRef());
+         }
+         else
+         {
+            // build a NodeRef for the specified Id and our store
+            parentRef = new NodeRef(Repository.getStoreRef(), parentNodeId);
+         }
+         
+         // TODO: can we improve the Get here with an API call for children of a specific type?
+         List<ChildAssociationRef> childRefs = this.nodeService.getChildAssocs(parentRef);
+         this.forums = new ArrayList<Node>(childRefs.size());
+         this.topics = new ArrayList<Node>(childRefs.size());
+         this.posts = new ArrayList<Node>(childRefs.size());
+         
+         for (ChildAssociationRef ref: childRefs)
+         {
+            // create our Node representation from the NodeRef
+            NodeRef nodeRef = ref.getChildRef();
+            
+            if (this.nodeService.exists(nodeRef))
+            {
+               // find it's type so we can see if it's a node we are interested in
+               QName type = this.nodeService.getType(nodeRef);
+               
+               // make sure the type is defined in the data dictionary
+               TypeDefinition typeDef = this.dictionaryService.getType(type);
+               
+               if (typeDef != null)
+               {
+                  // extract forums, forum, topic and post types
+                  
+                  if (this.dictionaryService.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
+                  {
+                     if (this.dictionaryService.isSubClass(type, ForumModel.TYPE_FORUMS) || 
+                         this.dictionaryService.isSubClass(type, ForumModel.TYPE_FORUM)) 
+                     {
+                        // create our Node representation
+                        MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                        node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon);
+                        
+                        this.forums.add(node);
+                     }
+                     if (this.dictionaryService.isSubClass(type, ForumModel.TYPE_TOPIC)) 
+                     {
+                        // create our Node representation
+                        MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                        node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon);
+                        node.addPropertyResolver("replies", this.resolverReplies);
+                        
+                        this.topics.add(node);
+                     }
+                     else if (this.dictionaryService.isSubClass(type, ForumModel.TYPE_POST))
+                     {
+                        // create our Node representation
+                        MapNode node = new MapNode(nodeRef, this.nodeService, true);
+                        
+                        this.browseBean.setupDataBindingProperties(node);
+                        node.addPropertyResolver("message", this.resolverContent);
+                        node.addPropertyResolver("replyTo", this.resolverReplyTo);
+                        
+                        this.posts.add(node);
+                     }
+                  }
+               }
+               else
+               {
+                  if (logger.isWarnEnabled())
+                     logger.warn("Found invalid object in database: id = " + nodeRef + ", type = " + type);
+               }
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {refErr.getNodeRef()}) );
+         this.forums = Collections.<Node>emptyList();
+         this.topics = Collections.<Node>emptyList();
+         this.posts = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Throwable err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         this.forums = Collections.<Node>emptyList();
+         this.topics = Collections.<Node>emptyList();
+         this.posts = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      
+      if (logger.isDebugEnabled())
+      {
+         long endTime = System.currentTimeMillis();
+         logger.debug("Time to query and build forums nodes: " + (endTime - startTime) + "ms");
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation 
+   
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      if (logger.isDebugEnabled())
+         logger.debug("Invalidating forums components...");
+      
+      // clear the value for the list components - will cause re-bind to it's data and refresh
+      if (this.forumsRichList != null)
+      {
+         this.forumsRichList.setValue(null);
+         if (this.forumsRichList.getInitialSortColumn() == null)
+         {
+            // set the initial sort column and direction
+            this.forumsRichList.setInitialSortColumn(
+                  clientConfig.getDefaultSortColumn(PAGE_NAME_FORUMS));
+            this.forumsRichList.setInitialSortDescending(
+                  clientConfig.hasDescendingSort(PAGE_NAME_FORUMS));
+         }
+      }
+      
+      if (this.forumRichList != null)
+      {
+         this.forumRichList.setValue(null);
+         if (this.forumRichList.getInitialSortColumn() == null)
+         {
+            // set the initial sort column and direction
+            this.forumRichList.setInitialSortColumn(
+                  clientConfig.getDefaultSortColumn(PAGE_NAME_FORUM));
+            this.forumRichList.setInitialSortDescending(
+                  clientConfig.hasDescendingSort(PAGE_NAME_FORUM));
+         }
+      }
+      
+      if (this.topicRichList != null)
+      {
+         this.topicRichList.setValue(null);
+         if (this.topicRichList.getInitialSortColumn() == null)
+         {
+            // set the initial sort column and direction
+            this.topicRichList.setInitialSortColumn(
+                  clientConfig.getDefaultSortColumn(PAGE_NAME_TOPIC));
+            this.topicRichList.setInitialSortDescending(
+                  clientConfig.hasDescendingSort(PAGE_NAME_TOPIC));
+         }
+      }
+      
+      // reset the lists
+      this.forums = null;
+      this.topics = null;
+      this.posts = null;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers 
+   
+   /**
+    * Change the current forums view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void forumsViewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      
+      // get the view mode ID
+      String viewMode = viewList.getValue().toString();
+      
+      // push the view mode into the lists
+      setForumsViewMode(viewMode);
+   }
+   
+   /**
+    * Change the current forum view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void forumViewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      
+      // get the view mode ID
+      String viewMode = viewList.getValue().toString();
+      
+      // push the view mode into the lists
+      setForumViewMode(viewMode);
+   }
+   
+   /**
+    * Change the current topic view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void topicViewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      
+      // get the view mode ID
+      String viewMode = viewList.getValue().toString();
+      
+      // push the view mode into the lists
+      setTopicViewMode(viewMode);
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Property Resolvers
+   
+   public NodePropertyResolver resolverReplies = new NodePropertyResolver() {
+      public Object get(Node node) 
+      {
+         // query for the number of posts within the given node
+         String repliesXPath = "./*[(subtypeOf('" + ForumModel.TYPE_POST + "'))]";         
+         List<NodeRef> replies = searchService.selectNodes(
+                node.getNodeRef(),
+                repliesXPath,
+                new QueryParameterDefinition[] {},
+                namespaceService,
+                false);
+         
+         // reduce the count by 1 as one of the posts will be the initial post
+         int noReplies = replies.size() - 1;
+         
+         if (noReplies < 0)
+         {
+            noReplies = 0;
+         }
+         
+         return new Integer(noReplies);
+      }
+   };
+   
+   public NodePropertyResolver resolverContent = new NodePropertyResolver() {
+      public Object get(Node node) 
+      {
+         String content = null;
+         
+         // get the content property from the node and retrieve the 
+         // full content as a string (obviously should only be used
+         // for small amounts of content)
+         
+         ContentReader reader = contentService.getReader(node.getNodeRef(), 
+               ContentModel.PROP_CONTENT);
+         
+         if (reader != null)
+         {
+            content = reader.getContentString();
+         }
+         
+         return content;
+      }
+   };
+   
+   public NodePropertyResolver resolverReplyTo = new NodePropertyResolver() {
+      public Object get(Node node) 
+      {
+         // determine if this node is a reply to another post, if so find
+         // the creator of the original poster
+         
+         String replyTo = null;
+         
+         List<AssociationRef> assocs = nodeService.getTargetAssocs(node.getNodeRef(),
+               ContentModel.ASSOC_REFERENCES);
+         
+         // there should only be one association, if there is more than one
+         // just get the first one
+         if (assocs.size() > 0)
+         {
+            AssociationRef assoc = assocs.get(0); 
+            NodeRef target = assoc.getTargetRef();
+            Node targetNode = new Node(target);
+            replyTo = (String)targetNode.getProperties().get("creator");
+         }
+         
+         return replyTo;
+      }
+   };
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Initialise default values from client configuration
+    */
+   private void initFromClientConfig()
+   {
+      this.clientConfig = (ClientConfigElement)Application.getConfigService(
+            FacesContext.getCurrentInstance()).getGlobalConfig().
+            getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      // get the defaults for the forums page
+      this.forumsViewMode = clientConfig.getDefaultView(PAGE_NAME_FORUMS);
+      this.forumsPageSize = this.clientConfig.getDefaultPageSize(PAGE_NAME_FORUMS,
+            this.forumsViewMode);
+      
+      // get the default for the forum page
+      this.forumViewMode = clientConfig.getDefaultView(PAGE_NAME_FORUM);
+      this.forumPageSize = this.clientConfig.getDefaultPageSize(PAGE_NAME_FORUM, 
+            this.forumViewMode);
+      
+      // get the default for the topic page
+      this.topicViewMode = clientConfig.getDefaultView(PAGE_NAME_TOPIC);
+      this.topicPageSize = this.clientConfig.getDefaultPageSize(PAGE_NAME_TOPIC, 
+            this.topicViewMode);
+      
+      if (logger.isDebugEnabled())
+      {
+         logger.debug("Set default forums view mode to: " + this.forumsViewMode);
+         logger.debug("Set default forums page size to: " + this.forumsPageSize);
+         logger.debug("Set default forum view mode to: " + this.forumViewMode);
+         logger.debug("Set default forum page size to: " + this.forumPageSize);
+         logger.debug("Set default topic view mode to: " + this.topicViewMode);
+         logger.debug("Set default topic page size to: " + this.topicPageSize);
+      }
+   }
+   
+   /**
+    * Class to implement a bubble view for the RichList component used in the topics screen
+    * 
+    * @author gavinc
+    */
+   public static class TopicBubbleViewRenderer implements IRichListRenderer
+   {
+      public static final String VIEWMODEID = "bubble";
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#getViewModeID()
+       */
+      public String getViewModeID()
+      {
+         return VIEWMODEID;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListBefore(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         // nothing to do
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListRow(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[], java.lang.Object)
+       */
+      public void renderListRow(FacesContext context, UIRichList richList, UIColumn[] columns, Object row)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // find primary column (which must exist) and the actions column (which doesn't 
+         // have to exist)
+         UIColumn primaryColumn = null;
+         UIColumn actionsColumn = null;
+         for (int i = 0; i < columns.length; i++)
+         {
+            if (columns[i].isRendered())
+            {
+               if (columns[i].getPrimary())
+               {
+                  primaryColumn = columns[i];
+               }
+               else if (columns[i].getActions())
+               {
+                  actionsColumn = columns[i];
+               }
+            }
+         }
+         
+         if (primaryColumn == null)
+         {
+            if (logger.isWarnEnabled())
+               logger.warn("No primary column found for RichList definition: " + richList.getId());
+         }
+         
+         out.write("<tr>");
+         
+         Node node = (Node)row;
+         if (node.getProperties().get("replyTo") == null)
+         {
+            renderNewPostBubble(context, out, node, primaryColumn, actionsColumn, columns);
+         }
+         else
+         {
+            renderReplyToBubble(context, out, node, primaryColumn, actionsColumn, columns);
+         }
+         
+         out.write("</tr>");
+         
+         // add a little padding
+         out.write("<tr><td><div style='padding:3px'></div></td></tr>");
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListAfter(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListAfter(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         out.write("<tr><td colspan='99' align='right'>");
+         for (Iterator i = richList.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            // output all remaining child components that are not UIColumn
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIColumn == false)
+            {
+               Utils.encodeRecursive(context, child);
+            }
+         }
+         out.write("</td></tr>");
+      }
+      
+      /**
+       * Renders the new post speech bubble
+       * 
+       * @param context Faces context
+       * @param out The response writer
+       * @param node The Node for the row being rendered
+       * @param primaryColumn The primary column containing the message content
+       * @param actionsColumn The actions column containing all the actions
+       * @param columns All configured columns
+       */
+      private void renderNewPostBubble(FacesContext context, ResponseWriter out, Node node, 
+            UIColumn primaryColumn, UIColumn actionsColumn, UIColumn[] columns) throws IOException
+      {
+         out.write("<td><table border='0' cellpadding='0' cellspacing='0' width='100%'><tr>");
+         out.write("<td><img src='");
+         out.write(context.getExternalContext().getRequestContextPath());
+         out.write("/images/icons/user_large.gif'/><br/>");
+         out.write((String)node.getProperties().get("creator"));
+         out.write("</td><td width='100%'>");
+         renderBubble(context, out, "orange", "#FCC75E", primaryColumn, actionsColumn, columns);
+         out.write("</td><td><div style='width:32px;' /></td></table></td>");
+      }
+      
+      /**
+       * Renders the reply to post speech bubble
+       * 
+       * @param context Faces context
+       * @param out The response writer
+       * @param node The Node for the row being rendered
+       * @param primaryColumn The primary column containing the message content
+       * @param actionsColumn The actions column containing all the actions
+       * @param columns All configured columns
+       */
+      private void renderReplyToBubble(FacesContext context, ResponseWriter out, Node node, 
+            UIColumn primaryColumn, UIColumn actionsColumn, UIColumn[] columns) throws IOException
+      {
+         out.write("<td width='100%'><table border='0' cellpadding='0' cellspacing='0' width='100%'><tr>");
+         out.write("<td><div style='width:32px;' /></td><td width='100%'>");
+         renderBubble(context, out, "yellow", "#FFF5A3", primaryColumn, actionsColumn, columns);
+         out.write("</td><td><img src='");
+         out.write(context.getExternalContext().getRequestContextPath());
+         out.write("/images/icons/user_large.gif'/><br/>");
+         out.write((String)node.getProperties().get("creator"));
+         out.write("</td></table></td>");
+      }
+
+      /**
+       * Renders the speech bubble
+       * 
+       * @param context Faces context
+       * @param out The response writer
+       * @param colour The colour of the bubble
+       * @param titleBgColour The colour of the background of the title area (#rrggbb)
+       * @param primaryColumn The primary column containing the message content
+       * @param actionsColumn The actions column containing all the actions
+       * @param columns All configured columns
+       */
+      private void renderBubble(FacesContext context, ResponseWriter out,
+            String colour, String titleBgColour, 
+            UIColumn primaryColumn, UIColumn actionsColumn, UIColumn[] columns)
+            throws IOException
+      {
+         String contextPath = context.getExternalContext().getRequestContextPath();
+         
+         out.write("<table border='0' cellpadding='0' cellspacing='0' width='100%'><tr>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("header_1.gif) no-repeat #FFFFFF;' width='24' height='24'></td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("header_2.gif) repeat-x ");
+         out.write(titleBgColour);
+         out.write("'>");
+         
+         // render the header area with the configured columns
+         out.write("<table width='100%' cellpadding='2' cellspacing='2' border='0'><tr>");
+         
+         for (int i = 0; i < columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            if (column.isRendered() == true &&
+                column.getPrimary() == false && 
+                column.getActions() == false)
+            {
+               // render the column header as the label
+               UIComponent header = column.getFacet("header");
+               if (header != null)
+               {
+                  out.write("<td><nobr><b>");
+                  Utils.encodeRecursive(context, header);
+                  out.write("</nobr></b></td>");
+               }
+               
+               // render the contents of the column
+               if (column.getChildCount() != 0)
+               {
+                  out.write("<td><nobr>");
+                  Utils.encodeRecursive(context, column);
+                  out.write("</nobr></td>");
+               }
+            }
+         }
+         
+         // render the actions column
+         out.write("<td align='right' width='100%'>");
+         if (actionsColumn != null && actionsColumn.getChildCount() != 0)
+         {
+            Utils.encodeRecursive(context, actionsColumn);
+         }
+         out.write("</td></tr></table>");
+         
+         out.write("</td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("header_3.gif) no-repeat #FFFFFF;' width='24' height='24'></td>");
+         out.write("</tr></tr>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_1.gif) no-repeat #FFFFFF;' width='24' height='13'></td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_2.gif) repeat-x #FFFFFF;'></td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_3.gif) no-repeat #FFFFFF;' width='24' height='13'></td>");
+         out.write("</tr><tr>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_4.gif) repeat-y #FFFFFF;' width='24' height='13'></td>");
+         out.write("<td>");
+         
+         // render the primary column
+         if (primaryColumn != null && primaryColumn.getChildCount() != 0)
+         {
+            Utils.encodeRecursive(context, primaryColumn);
+         }
+         
+         out.write("</td>");
+         
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_6.gif) repeat-y #FFFFFF;' width='24' height='13'></td>");
+         out.write("</tr><tr>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_7.gif) no-repeat #FFFFFF;' width='24' height='13'></td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_8.gif) repeat-x #FFFFFF;'></td>");
+         out.write("<td style='background: url(");
+         out.write(contextPath);
+         out.write("/images/parts/");
+         out.write(colour);
+         out.write("body_9.gif) no-repeat #FFFFFF;' width='24' height='13'></td>");
+         out.write("</tr></table>");
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/ImportBean.java b/source/java/org/alfresco/web/bean/ImportBean.java
new file mode 100644
index 0000000000..abc3bd32b3
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/ImportBean.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.ImporterActionExecuter;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Backing bean implementation for the Import dialog.
+ * 
+ * @author gavinc
+ */
+public class ImportBean
+{
+   private static final Log logger = LogFactory.getLog(ImportBean.class);
+
+   private static final String DEFAULT_OUTCOME = "browse";
+   
+   private static final String MSG_ERROR = "error_import";
+   private static final String MSG_ERROR_NO_FILE = "error_import_no_file";
+   private static final String MSG_ERROR_EMPTY_FILE = "error_import_empty_file";
+   
+   private BrowseBean browseBean;
+   private NodeService nodeService;
+   private ActionService actionService;
+   private ContentService contentService;
+   
+   private File file;
+   private String fileName;
+   private String encoding = "UTF-8";
+   private boolean runInBackground = true;
+   
+   /**
+    * Performs the import operation using the current state of the bean
+    * 
+    * @return The outcome
+    */
+   public String performImport()
+   {
+      String outcome = DEFAULT_OUTCOME;
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Called import for file: " + this.file);
+      
+      if (this.file != null && this.file.exists())
+      {
+         // check the file actually has contents
+         if (this.file.length() > 0)
+         {
+            UserTransaction tx = null;
+            
+            try
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               tx = Repository.getUserTransaction(context);
+               tx.begin();
+               
+               // first of all we need to add the uploaded ACP file to the repository
+               NodeRef acpNodeRef = addACPToRepository(context);
+               
+               // build the action params map based on the bean's current state
+               Map<String, Serializable> params = new HashMap<String, Serializable>(3);
+               params.put(ImporterActionExecuter.PARAM_DESTINATION_FOLDER, this.browseBean.getActionSpace().getNodeRef());
+               params.put(ImporterActionExecuter.PARAM_ENCODING, this.encoding);
+                
+               // build the action to execute
+               Action action = this.actionService.createAction(ImporterActionExecuter.NAME, params);
+               action.setExecuteAsynchronously(this.runInBackground);
+               
+               // execute the action on the ACP file
+               this.actionService.executeAction(action, acpNodeRef);
+               
+               if (logger.isDebugEnabled())
+               {
+                  logger.debug("Executed import action with action params of " + params);
+               }
+               
+               // commit the transaction
+               tx.commit();
+               
+               // reset the bean
+               reset();
+            }
+            catch (Exception e)
+            {
+               // rollback the transaction
+               try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+               Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+                     FacesContext.getCurrentInstance(), MSG_ERROR), e.toString()), e);
+               outcome = null;
+            }
+         }
+         else
+         {
+            Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_EMPTY_FILE));
+            outcome = null;
+         }
+      }
+      else
+      {
+         Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_NO_FILE));
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action called when the dialog is cancelled, just resets the bean's state
+    * 
+    * @return The outcome
+    */
+   public String cancel()
+   {
+      reset();
+      
+      return DEFAULT_OUTCOME;
+   }
+   
+   /**
+    * Resets the dialog state back to the default
+    */
+   public void reset()
+   {
+      this.file = null;
+      this.fileName = null;
+      this.runInBackground = true;
+      
+      // delete the temporary file we uploaded earlier
+      if (this.file != null)
+      {
+         this.file.delete();
+      }
+      
+      // remove the file upload bean from the session
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      ctx.getExternalContext().getSessionMap().remove(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+   }
+   
+   /**
+    * @return Returns the message to display when a file has been uploaded
+    */
+   public String getFileUploadSuccessMsg()
+   {
+      String msg = Application.getMessage(FacesContext.getCurrentInstance(), "file_upload_success");
+      return MessageFormat.format(msg, new Object[] {getFileName()});
+   }
+   
+   /**
+    * @return Returns the name of the file
+    */
+   public String getFileName()
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)ctx.getExternalContext().getSessionMap().
+         get(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+      if (fileBean != null)
+      {
+         this.fileName = fileBean.getFileName();
+         this.file = fileBean.getFile();
+      }
+      
+      return this.fileName;
+   }
+   
+   /**
+    * Returns the encoding to use for the export
+    *  
+    * @return The encoding
+    */
+   public String getEncoding()
+   {
+      return this.encoding;
+   }
+
+   /**
+    * Sets the encoding to use for the export package
+    * 
+    * @param encoding The encoding
+    */
+   public void setEncoding(String encoding)
+   {
+      this.encoding = encoding;
+   }
+
+   /**
+    * Determines whether the import should run in the background
+    * 
+    * @return true means the import will run in the background 
+    */
+   public boolean getRunInBackground()
+   {
+      return this.runInBackground;
+   }
+
+   /**
+    * Determines whether the import will run in the background
+    * 
+    * @param runInBackground true to run the import in the background
+    */
+   public void setRunInBackground(boolean runInBackground)
+   {
+      this.runInBackground = runInBackground;
+   }
+
+   /**
+    * Sets the BrowseBean instance to use to retrieve the current document
+    * 
+    * @param browseBean BrowseBean instance
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * Sets the action service
+    * 
+    * @param actionService  the action service
+    */
+   public void setActionService(ActionService actionService)
+   {
+      this.actionService = actionService;
+   }
+   
+   /**
+    * Sets the node service
+    * 
+    * @param nodeService  the node service
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * Sets the content service
+    * 
+    * @param contentService the content service
+    */
+   public void setContentService(ContentService contentService)
+   {
+      this.contentService = contentService;
+   }
+   
+   /**
+    * Adds the uploaded ACP file to the repository
+    *  
+    * @param context Faces context
+    * @return NodeRef representing the ACP file in the repository
+    */
+   private NodeRef addACPToRepository(FacesContext context)
+   {
+      // set the name for the new node
+      Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>(1);
+      contentProps.put(ContentModel.PROP_NAME, this.fileName);
+      
+      // create the node to represent the zip file
+      String assocName = QName.createValidLocalName(this.fileName);
+      ChildAssociationRef assocRef = this.nodeService.createNode(
+           this.browseBean.getActionSpace().getNodeRef(), ContentModel.ASSOC_CONTAINS,
+           QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, assocName),
+           ContentModel.TYPE_CONTENT, contentProps);
+      
+      NodeRef acpNodeRef = assocRef.getChildRef();
+     
+      // apply the titled aspect to behave in the web client
+      Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(3, 1.0f);
+      titledProps.put(ContentModel.PROP_TITLE, this.fileName);
+      titledProps.put(ContentModel.PROP_DESCRIPTION, Application.getMessage(context, "import_package_description"));
+      this.nodeService.addAspect(acpNodeRef, ContentModel.ASPECT_TITLED, titledProps);
+     
+      // add the content to the node
+      ContentWriter writer = this.contentService.getWriter(acpNodeRef, ContentModel.PROP_CONTENT, true);
+      writer.setEncoding(this.encoding);
+      writer.setMimetype(MimetypeMap.MIMETYPE_ACP);
+      writer.putContent(this.file);
+            
+      return acpNodeRef;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java
new file mode 100644
index 0000000000..0cae177aa5
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/LoginBean.java
@@ -0,0 +1,565 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.faces.validator.ValidatorException;
+import javax.portlet.PortletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.webdav.WebDAVServlet;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.AuthenticationHelper;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * JSF Managed Bean. Backs the "login.jsp" view to provide the form fields used
+ * to enter user data for login. Also contains bean methods to validate form
+ * fields and action event fired in response to the Login button being pressed.
+ * 
+ * @author Kevin Roast
+ */
+public class LoginBean
+{
+   // ------------------------------------------------------------------------------
+   // Managed bean properties
+
+   /**
+    * @param authenticationService      The AuthenticationService to set.
+    */
+   public void setAuthenticationService(AuthenticationService authenticationService)
+   {
+      this.authenticationService = authenticationService;
+   }
+
+   /**
+    * @param personService             The personService to set.
+    */
+   public void setPersonService(PersonService personService)
+   {
+      this.personService = personService;
+   }
+
+   /**
+    * @param nodeService                The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param browseBean                 The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+
+   /**
+    * @param configService              The ConfigService to set.
+    */
+   public void setConfigService(ConfigService configService)
+   {
+      this.configService = configService;
+   }
+   
+   /**
+    * @param fileFolderService          The FileFolderService to set.
+    */
+   public void setFileFolderService(FileFolderService fileFolderService)
+   {
+      this.fileFolderService = fileFolderService;
+   }
+
+   /**
+    * @param val        Username from login dialog
+    */
+   public void setUsername(String val)
+   {
+      this.username = val;
+   }
+
+   /**
+    * @return The username string from login dialog
+    */
+   public String getUsername()
+   {
+      return this.username;
+   }
+
+   /**
+    * @param val         Password from login dialog
+    */
+   public void setPassword(String val)
+   {
+      this.password = val;
+   }
+
+   /**
+    * @return The password string from login dialog
+    */
+   public String getPassword()
+   {
+      return this.password;
+   }
+
+   /**
+    * @return the available languages
+    */
+   public SelectItem[] getLanguages()
+   {
+      ClientConfigElement config = (ClientConfigElement) this.configService.getGlobalConfig()
+            .getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      List<String> languages = config.getLanguages();
+      SelectItem[] items = new SelectItem[languages.size()];
+      int count = 0;
+      for (String locale : languages)
+      {
+         // get label associated to the locale
+         String label = config.getLabelForLanguage(locale);
+
+         // set default selection
+         if (count == 0 && this.language == null)
+         {
+            // first try to get the language that the current user is using
+            Locale lastLocale = Application.getLanguage(FacesContext.getCurrentInstance());
+            if (lastLocale != null)
+            {
+               this.language = lastLocale.toString();
+            }
+            // else we default to the first item in the list
+            else
+            {
+               this.language = locale;
+            }
+         }
+         
+         items[count++] = new SelectItem(locale, label);
+      }
+      
+      return items;
+   }
+
+   /**
+    * @return Returns the language selection.
+    */
+   public String getLanguage()
+   {
+      return this.language;
+   }
+
+   /**
+    * @param language       The language selection to set.
+    */
+   public void setLanguage(String language)
+   {
+      this.language = language;
+      Application.setLanguage(FacesContext.getCurrentInstance(), this.language);
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Validator methods
+
+   /**
+    * Validate password field data is acceptable
+    */
+   public void validatePassword(FacesContext context, UIComponent component, Object value)
+         throws ValidatorException
+   {
+      String pass = (String) value;
+      if (pass.length() < 3 || pass.length() > 32)
+      {
+         String err = MessageFormat.format(Application.getMessage(context, MSG_PASSWORD_LENGTH),
+               new Object[]{3, 32});
+         throw new ValidatorException(new FacesMessage(err));
+      }
+   }
+
+   /**
+    * Validate Username field data is acceptable
+    */
+   public void validateUsername(FacesContext context, UIComponent component, Object value)
+         throws ValidatorException
+   {
+      String pass = (String) value;
+      if (pass.length() < 3 || pass.length() > 32)
+      {
+         String err = MessageFormat.format(Application.getMessage(context, MSG_USERNAME_LENGTH),
+               new Object[]{3, 32});
+         throw new ValidatorException(new FacesMessage(err));
+      }
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Action event methods
+
+   /**
+    * Login action handler
+    * 
+    * @return outcome view name
+    */
+   public String login()
+   {
+      String outcome = null;
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      
+      if (this.username != null && this.password != null)
+      {
+         // Authenticate via the authentication service, then save the details of user in an object
+         // in the session - this is used by the servlet filter etc. on each page to check for login
+         try
+         {
+            this.authenticationService.authenticate(this.username, this.password.toCharArray());
+            
+            // setup User object and Home space ID
+            User user = new User(this.authenticationService.getCurrentUserName(), this.authenticationService.getCurrentTicket(),
+                  personService.getPerson(this.username));
+            NodeRef homeSpaceRef = (NodeRef) this.nodeService.getProperty(personService.getPerson(this.username), ContentModel.PROP_HOMEFOLDER);
+            
+            // check that the home space node exists - else user cannot login
+            if (this.nodeService.exists(homeSpaceRef) == false)
+            {
+               throw new InvalidNodeRefException(homeSpaceRef);
+            }
+            user.setHomeSpaceId(homeSpaceRef.getId());
+            
+            // put the User object in the Session - the authentication servlet will then allow
+            // the app to continue without redirecting to the login page
+            Map session = fc.getExternalContext().getSessionMap();
+            session.put(AuthenticationHelper.AUTHENTICATION_USER, user);
+            
+            // if an external outcome has been provided then use that, else use default
+            String externalOutcome = (String)fc.getExternalContext().getSessionMap().get(LOGIN_OUTCOME_KEY);
+            if (externalOutcome != null)
+            {
+               // TODO: This is a quick solution. It would be better to specify the (identifier?)
+               // of a handler class that would be responsible for processing specific outcome arguments.
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("External outcome found: " + externalOutcome);
+               
+               // setup is required for certain outcome requests
+               if (OUTCOME_DOCDETAILS.equals(externalOutcome))
+               {
+                  NodeRef nodeRef = null;
+                  
+                  String[] args = (String[]) fc.getExternalContext().getSessionMap().get(LOGIN_OUTCOME_ARGS);
+                  if (args[0].equals(WebDAVServlet.WEBDAV_PREFIX))
+                  {
+                     nodeRef = resolveWebDAVPath(fc, args);
+                  }
+                  else if (args.length == 3)
+                  {
+                     StoreRef storeRef = new StoreRef(args[0], args[1]);
+                     nodeRef = new NodeRef(storeRef, args[2]);
+                  }
+                  
+                  if (nodeRef != null)
+                  {
+                     // setup the Document on the browse bean
+                     // TODO: the browse bean should accept a full NodeRef - not just an ID
+                     this.browseBean.setupContentAction(nodeRef.getId(), true);
+                  }
+               }
+               else if (OUTCOME_SPACEDETAILS.equals(externalOutcome))
+               {
+                  NodeRef nodeRef = null;
+                  
+                  String[] args = (String[]) fc.getExternalContext().getSessionMap().get(LOGIN_OUTCOME_ARGS);
+                  if (args[0].equals(WebDAVServlet.WEBDAV_PREFIX))
+                  {
+                     nodeRef = resolveWebDAVPath(fc, args);
+                  }
+                  else if (args.length == 3)
+                  {
+                     StoreRef storeRef = new StoreRef(args[0], args[1]);
+                     nodeRef = new NodeRef(storeRef, args[2]);
+                  }
+                  
+                  if (nodeRef != null)
+                  {
+                     // setup the Space on the browse bean
+                     // TODO: the browse bean should accept a full NodeRef - not just an ID
+                     this.browseBean.setupSpaceAction(nodeRef.getId(), true);
+                  }
+               }
+               else if (OUTCOME_BROWSE.equals(externalOutcome))
+               {
+                  String[] args = (String[]) fc.getExternalContext().getSessionMap().get(LOGIN_OUTCOME_ARGS);
+                  if (args != null)
+                  {
+                     NodeRef nodeRef = null;
+                     int offset = 0;
+                     if (args.length >= 3)
+                     {
+                        offset = args.length - 3;
+                        StoreRef storeRef = new StoreRef(args[0+offset], args[1+offset]);
+                        nodeRef = new NodeRef(storeRef, args[2+offset]);
+                        
+                        // setup the ref as current Id in the global navigation bean
+                        this.navigator.setCurrentNodeId(nodeRef.getId());
+                        
+                        // check for view mode first argument
+                        if (args[0].equals(LOGIN_ARG_TEMPLATE))
+                        {
+                           this.browseBean.setDashboardView(true);
+                           // the above call will auto-navigate to the correct outcome - so we don't!
+                           externalOutcome = null;
+                        }
+                     }
+                  }
+               }
+               
+               fc.getExternalContext().getSessionMap().remove(LOGIN_OUTCOME_KEY);
+               return externalOutcome;
+            }
+            else
+            {
+               // if a redirect URL has been provided then use that
+               String redirectURL = (String)fc.getExternalContext().getSessionMap().get(LOGIN_REDIRECT_KEY);
+               if (redirectURL != null)
+               {
+                  if (logger.isDebugEnabled())
+                     logger.debug("Redirect URL found: " + redirectURL);
+                  
+                  // remove URL from session
+                  fc.getExternalContext().getSessionMap().remove(LOGIN_REDIRECT_KEY);
+                  
+                  try
+                  {
+                     fc.getExternalContext().redirect(redirectURL);
+                     fc.responseComplete();
+                     return null;
+                  }
+                  catch (IOException ioErr)
+                  {
+                     logger.warn("Unable to redirect to url: " + redirectURL);
+                  }
+               }
+               else
+               {
+                  return "success";
+               }
+            }
+         }
+         catch (AuthenticationException aerr)
+         {
+            Utils.addErrorMessage(Application.getMessage(fc, MSG_ERROR_UNKNOWN_USER));
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(fc,
+                  Repository.ERROR_NOHOME), refErr.getNodeRef().getId()));
+         }
+      }
+      else
+      {
+         Utils.addErrorMessage(Application.getMessage(fc, MSG_ERROR_MISSING));
+      }
+
+      return outcome;
+   }
+
+   /**
+    * Invalidate ticket and logout user
+    */
+   public String logout()
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      
+      Map session = context.getExternalContext().getSessionMap();
+      User user = (User) session.get(AuthenticationHelper.AUTHENTICATION_USER);
+      
+      boolean alfrescoAuth = (session.get(LOGIN_EXTERNAL_AUTH) == null);
+      
+      // invalidate Session for this user
+      if (Application.inPortalServer() == false)
+      {
+         HttpServletRequest request = (HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
+         request.getSession().invalidate();
+      }
+      else
+      {
+         PortletRequest request = (PortletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
+         request.getPortletSession().invalidate();
+      }
+      
+      // invalidate User ticket
+      if (user != null)
+      {
+         this.authenticationService.invalidateTicket(user.getTicket());
+      }
+      
+      // set language to last used
+      if (this.language != null && this.language.length() != 0)
+      {
+         Application.setLanguage(context, this.language);
+      }
+      
+      return alfrescoAuth ? "logout" : "relogin";
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Resolves the given path elements to a NodeRef in the current repository
+    * 
+    * @param context Faces context
+    * @param args The elements of the path to lookup
+    */
+   private NodeRef resolveWebDAVPath(FacesContext context, String[] args)
+   {
+      NodeRef nodeRef = null;
+
+      List<String> paths = new ArrayList<String>(args.length-1);
+      
+      FileInfo file = null;
+      try
+      {
+         // create a list of path elements (decode the URL as we go)
+         for (int x = 1; x < args.length; x++)
+         {
+            paths.add(URLDecoder.decode(args[x], "UTF-8"));
+         }
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Attempting to resolve webdav path to NodeRef: " + paths);
+         
+         // get the company home node to start the search from
+         NodeRef companyHome = new NodeRef(Repository.getStoreRef(), 
+               Application.getCompanyRootId());
+         
+         file = this.fileFolderService.resolveNamePath(companyHome, paths);
+         nodeRef = file.getNodeRef();
+      }
+      catch (UnsupportedEncodingException uee)
+      {
+         if (logger.isWarnEnabled())
+            logger.warn("Failed to resolve webdav path", uee);
+         
+         nodeRef = null;
+      }
+      catch (FileNotFoundException fne)
+      {
+         if (logger.isWarnEnabled())
+            logger.debug("Failed to resolve webdav path", fne);
+         
+         nodeRef = null;
+      }
+      
+      return nodeRef;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+
+   private static final Log logger = LogFactory.getLog(LoginBean.class);
+   
+   /** I18N messages */
+   private static final String MSG_ERROR_MISSING = "error_login_missing";
+   private static final String MSG_ERROR_UNKNOWN_USER = "error_login_user";
+   private static final String MSG_USERNAME_CHARS = "login_err_username_chars";
+   private static final String MSG_USERNAME_LENGTH = "login_err_username_length";
+   private static final String MSG_PASSWORD_CHARS = "login_err_password_chars";
+   private static final String MSG_PASSWORD_LENGTH = "login_err_password_length";
+
+   public static final String LOGIN_REDIRECT_KEY = "_alfRedirect";
+   public static final String LOGIN_OUTCOME_KEY  = "_alfOutcome";
+   public static final String LOGIN_OUTCOME_ARGS = "_alfOutcomeArgs";
+   public static final String LOGIN_EXTERNAL_AUTH= "_alfExternalAuth";
+
+   public final static String OUTCOME_DOCDETAILS   = "showDocDetails";
+   public final static String OUTCOME_SPACEDETAILS = "showSpaceDetails";
+   public final static String OUTCOME_BROWSE       = "browse";
+   
+   private static final String LOGIN_ARG_TEMPLATE  = "template";
+
+   /** user name */
+   private String username = null;
+
+   /** password */
+   private String password = null;
+
+   /** language locale selection */
+   private String language = null;
+
+   /** PersonService bean reference */
+   private PersonService personService;
+   
+   /** AuthenticationService bean reference */
+   private AuthenticationService authenticationService;
+
+   /** NodeService bean reference */
+   private NodeService nodeService;
+
+   /** The BrowseBean reference */
+   private BrowseBean browseBean;
+   
+   /** The NavigationBean bean reference */
+   private NavigationBean navigator;
+
+   /** ConfigService bean reference */
+   private ConfigService configService;
+   
+   /** FileFolderService bean reference */
+   private FileFolderService fileFolderService;
+}
diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
new file mode 100644
index 0000000000..86d30b93b2
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -0,0 +1,674 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.filesys.CIFSServer;
+import org.alfresco.filesys.server.filesys.DiskSharedDevice;
+import org.alfresco.filesys.smb.server.repo.ContentContext;
+import org.alfresco.filesys.smb.server.repo.ContentDiskInterface;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.bean.wizard.NewSpaceWizard;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
+import org.alfresco.web.ui.common.component.UIBreadcrumb;
+import org.alfresco.web.ui.common.component.UIModeList;
+import org.alfresco.web.ui.repo.component.IRepoBreadcrumbHandler;
+import org.alfresco.web.ui.repo.component.shelf.UIShelf;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Kevin Roast
+ */
+public class NavigationBean
+{
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+
+   /**
+    * @param nodeService The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param searchService The searchService to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * @param namespaceService The namespaceService to set.
+    */
+   public void setNamespaceService(NamespaceService namespaceService)
+   {
+      this.namespaceService = namespaceService;
+   }
+   
+   /**
+    * @param cifsServer The cifsServer to set.
+    */
+   public void setCifsServer(CIFSServer cifsServer)
+   {
+      this.cifsServer = cifsServer;
+   }
+
+   /**
+    * @param contentDiskDriver The contentDiskDriver to set.
+    */
+   public void setContentDiskDriver(ContentDiskInterface contentDiskDriver)
+   {
+      this.contentDiskDriver = contentDiskDriver;
+   }
+   
+   /**
+    * @param configService The ConfigService to set.
+    */
+   public void setConfigService(ConfigService configService)
+   {
+      this.configService = configService;
+   }
+   
+   /**
+    * @return the User object representing the current instance for this user 
+    */
+   public User getCurrentUser()
+   {
+      return Application.getCurrentUser(FacesContext.getCurrentInstance());
+   }
+
+   /**
+    * Return the expanded state of the Shelf panel wrapper component
+    * 
+    * @return the expanded state of the Shelf panel wrapper component
+    */
+   public boolean isShelfExpanded()
+   {
+      return this.shelfExpanded;
+   }
+   
+   /**
+    * Set the expanded state of the Shelf panel wrapper component
+    * 
+    * @param expanded      true to expanded the Shelf panel area, false to hide it
+    */
+   public void setShelfExpanded(boolean expanded)
+   {
+      this.shelfExpanded = expanded;
+   }
+   
+   /**
+    * @return Returns the array containing the expanded state of the shelf items
+    */
+   public boolean[] getShelfItemExpanded()
+   {
+      return this.shelfItemExpanded;
+   }
+
+   /**
+    * @param shelfItemExpanded The array containing the expanded state of the shelf items
+    */
+   public void setShelfItemExpanded(boolean[] shelfItemExpanded)
+   {
+      this.shelfItemExpanded = shelfItemExpanded;
+   }
+   
+   /**
+    * @return Returns the toolbar Location.
+    */
+   public String getToolbarLocation()
+   {
+      return this.toolbarLocation;
+   }
+   
+   /**
+    * @param toolbarLocation  The toolbar Location to set.
+    */
+   public void setToolbarLocation(String toolbarLocation)
+   {
+      this.toolbarLocation = toolbarLocation;
+   }
+   
+   /**
+    * @return Returns the helpUrl.
+    */
+   public String getHelpUrl()
+   {
+      if (this.clientConfig == null)
+      {
+         initFromClientConfig();
+      }
+      return this.helpUrl;
+   }
+
+   /**
+    * @param helpUrl The helpUrl to set.
+    */
+   public void setHelpUrl(String helpUrl)
+   {
+      this.helpUrl = helpUrl;
+   }
+   
+   /**
+    * @return Returns the search context object if any.
+    */
+   public SearchContext getSearchContext()
+   {
+      return this.searchContext;
+   }
+   
+   /**
+    * @param searchContext    The search context object to set or null to clear search.
+    */
+   public void setSearchContext(SearchContext searchContext)
+   {
+      this.searchContext = searchContext;
+      
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+   }
+   
+   /**
+    * @return Returns the currently browsing node Id.
+    */
+   public String getCurrentNodeId()
+   {
+      return this.currentNodeId;
+   }
+
+   /**
+    * Set the node Id of the current folder/space container node.
+    * <p>
+    * Setting this value causes the UI to update and display the specified node as current.
+    * 
+    * @param currentNodeId    The currently browsing node Id.
+    */
+   public void setCurrentNodeId(String currentNodeId)
+   {
+      if (s_logger.isDebugEnabled())
+         s_logger.debug("Setting current node id to: " + currentNodeId);
+      
+      if (currentNodeId == null)
+      {
+         throw new AlfrescoRuntimeException("Can not set the current node id to null");
+      }
+      
+      // set the current Node Id for our UI context operations
+      this.currentNodeId = currentNodeId;
+      
+      // clear other context that is based on or relevant to the Node id
+      this.currentNode = null;
+      this.searchContext = null;
+      
+      // inform any interested beans that the UI needs updating after this change 
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      
+      // clear current node context after the notify - this is to ensure that if any delegates
+      // performed operations on the current node, that we have fresh data for the next View
+      this.currentNode = null;
+   }
+   
+   /**
+    * @return true if the current node has a template view available
+    */
+   public boolean getCurrentNodeHasTemplate()
+   {
+      boolean templateView = false;
+      Node node = getCurrentNode();
+      if (node.hasAspect(ContentModel.ASPECT_TEMPLATABLE))
+      {
+         NodeRef templateRef = (NodeRef)node.getProperties().get(ContentModel.PROP_TEMPLATE);
+         templateView = (templateRef != null && this.nodeService.exists(templateRef));
+      }
+      return templateView;
+   }
+   
+   /**
+    * @return the NodeRef.toString() for the current node template view if it has one set 
+    */
+   public String getCurrentNodeTemplate()
+   {
+      String strRef = null;
+      if (getCurrentNodeHasTemplate() == true)
+      {
+         strRef = getCurrentNode().getProperties().get(ContentModel.PROP_TEMPLATE).toString();
+      }
+      return strRef;
+   }
+   
+   /**
+    * Returns a model for use by a template on a space Dashboard page.
+    * 
+    * @return model containing current current space info.
+    */
+   public Map getTemplateModel()
+   {
+      HashMap model = new HashMap(1, 1.0f);
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      TemplateNode spaceNode = new TemplateNode(getCurrentNode().getNodeRef(), Repository.getServiceRegistry(fc),
+            new TemplateImageResolver() {
+               public String resolveImagePathForName(String filename, boolean small) {
+                  return Utils.getFileTypeImage(filename, small);
+               }
+            });
+      model.put("space", spaceNode);
+      
+      return model;
+   }
+   
+   /**
+    * Clear state so that the current node properties cache for the next time they are requested
+    */
+   public void resetCurrentNodeProperties()
+   {
+      this.currentNode = null;
+   }
+   
+   /**
+    * @return The Map of properties for the current Node. 
+    */
+   public Map<String, Object> getNodeProperties()
+   {
+      return getCurrentNode().getProperties();
+   }
+   
+   /**
+    * @return The current Node object for UI context operations
+    */
+   public Node getCurrentNode()
+   {
+      if (this.currentNode == null)
+      {
+         if (this.currentNodeId == null)
+         {
+            throw new AlfrescoRuntimeException("Cannot retrieve current Node if NodeId is null!");
+         }
+         
+         if (s_logger.isDebugEnabled())
+            s_logger.debug("Caching properties for node id: " + this.currentNodeId);
+         
+         NodeRef nodeRef;
+         Node node;
+         Map<String, Object> props;
+         try
+         {
+            // build a node which components on the JSP page can bind too
+            nodeRef = new NodeRef(Repository.getStoreRef(), this.currentNodeId);
+            node = new Node(nodeRef);
+            
+            // early init properties for this node (by getProperties() call)
+            // resolve icon in-case one has not been set
+            props = node.getProperties();
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+                  FacesContext.getCurrentInstance(), ERROR_DELETED_FOLDER), new Object[] {this.currentNodeId}) );
+            
+            nodeRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+            node = new Node(nodeRef);
+            props = node.getProperties();
+         }
+         String icon = (String)props.get("app:icon");
+         props.put("icon", icon != null ? icon : NewSpaceWizard.SPACE_ICON_DEFAULT);
+         Path path = this.nodeService.getPath(nodeRef);
+         
+         // resolve CIFS network folder location for this node
+         
+         DiskSharedDevice diskShare = cifsServer.getConfiguration().getPrimaryFilesystem();
+         
+         if (diskShare != null)
+         {
+             ContentContext contentCtx = (ContentContext) diskShare.getContext();
+             NodeRef rootNode = contentCtx.getRootNode();
+             String cifsPath = Repository.getNamePath(this.nodeService, path, rootNode, "\\", "file:///" + getCIFSServerPath(diskShare));
+              
+             node.getProperties().put("cifsPath", cifsPath);
+             node.getProperties().put("cifsPathLabel", cifsPath.substring(8));  // strip file:/// part
+         }
+         
+         this.currentNode = node;
+      }
+      
+      return this.currentNode;
+   }
+
+   /**
+    * @return Returns the breadcrumb handler elements representing the location path of the UI.
+    */
+   public List<IBreadcrumbHandler> getLocation()
+   {
+      if (this.location == null)
+      {
+         // init the location from the User object for the first time
+         User user = Application.getCurrentUser(FacesContext.getCurrentInstance());
+         
+         NodeRef homeSpaceRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
+         String homeSpaceName = Repository.getNameForNode(this.nodeService, homeSpaceRef);
+         
+         // set the current node to the users Home Space Id
+         setCurrentNodeId(user.getHomeSpaceId());
+         
+         // setup the breadcrumb with the same location
+         List<IBreadcrumbHandler> elements = new ArrayList<IBreadcrumbHandler>(1);
+         elements.add(new NavigationBreadcrumbHandler(homeSpaceRef, homeSpaceName));
+         setLocation(elements);
+      }
+      
+      return this.location;
+   }
+   
+   /**
+    * @param location      The UI location representation to set.
+    */
+   public void setLocation(List<IBreadcrumbHandler> location)
+   {
+      this.location = location;
+   }
+   
+   /**
+    * Sets up the dispatch context so that the navigation handler knows
+    * what object is being acted upon
+    * 
+    * @param node The node to be added to the dispatch context
+    */
+   public void setupDispatchContext(Node node)
+   {
+      this.dispatchContext = node;
+   }
+   
+   /**
+    * Resets the dispatch context
+    */
+   public void resetDispatchContext()
+   {
+      this.dispatchContext = null;
+   }
+   
+   /**
+    * Returns the node currently set in the dispatch context
+    * 
+    * @return The node being dispatched or null if there is no 
+    *         dispatch context
+    */
+   public Node getDispatchContextNode()
+   {
+      return this.dispatchContext;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers
+   
+   /**
+    * Action handler to toggle the expanded state of the shelf.
+    * The panel component wrapping the shelf area of the UI is value bound to the shelfExpanded property.
+    */
+   public void toggleShelf(ActionEvent event)
+   {
+      this.shelfExpanded = !this.shelfExpanded;
+   }
+   
+   /**
+    * Action handler called after a Shelf Group has had its expanded state toggled by the user
+    */
+   public void shelfGroupToggled(ActionEvent event)
+   {
+      UIShelf.ShelfEvent shelfEvent = (UIShelf.ShelfEvent)event;
+      this.shelfItemExpanded[shelfEvent.Index] = shelfEvent.Expanded;
+   }
+   
+   /**
+    * Action to change the toolbar location
+    * Currently this will changed the location from Company to the users Home space
+    */
+   public void toolbarLocationChanged(ActionEvent event)
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      try
+      {
+         UIModeList locationList = (UIModeList)event.getComponent();
+         String location = locationList.getValue().toString();
+         setToolbarLocation(location);
+         
+         if (LOCATION_COMPANY.equals(location))
+         {
+            List<IBreadcrumbHandler> elements = new ArrayList<IBreadcrumbHandler>(1);
+            NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+            String companySpaceName = Repository.getNameForNode(this.nodeService, companyRootRef);
+            elements.add(new NavigationBreadcrumbHandler(companyRootRef, companySpaceName));
+            setLocation(elements);
+            setCurrentNodeId(companyRootRef.getId());
+         }
+         else if (LOCATION_HOME.equals(location))
+         {
+            List<IBreadcrumbHandler> elements = new ArrayList<IBreadcrumbHandler>(1);
+            String homeSpaceId = Application.getCurrentUser(context).getHomeSpaceId();
+            NodeRef homeSpaceRef = new NodeRef(Repository.getStoreRef(), homeSpaceId);
+            String homeSpaceName = Repository.getNameForNode(this.nodeService, homeSpaceRef);
+            elements.add(new NavigationBreadcrumbHandler(homeSpaceRef, homeSpaceName));
+            setLocation(elements);
+            setCurrentNodeId(homeSpaceRef.getId());
+         }
+         
+         // we need to force a navigation to refresh the browse screen breadcrumb
+         context.getApplication().getNavigationHandler().handleNavigation(context, null, "browse");
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NOHOME), Application.getCurrentUser(context).getHomeSpaceId()), refErr );
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+      }
+   }
+   
+   /**
+    * @param diskShare Filesystem shared device
+    * @return CIFS server path as network style string label
+    */
+   public String getCIFSServerPath(DiskSharedDevice diskShare)
+   {
+      if (this.cifsServerPath == null)
+      {
+         StringBuilder buf = new StringBuilder(24);
+         
+         String serverName = this.cifsServer.getConfiguration().getServerName();
+         if (serverName != null && serverName.length() != 0)
+         {
+            buf.append("\\\\")
+               .append(serverName)
+               .append("\\");
+            buf.append(diskShare.getName());
+         }
+         
+         this.cifsServerPath = buf.toString();
+      }
+      
+      return this.cifsServerPath;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Initialise default values from client configuration
+    */
+   private void initFromClientConfig()
+   {
+      this.clientConfig = (ClientConfigElement)this.configService.getGlobalConfig().getConfigElement(
+            ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      this.helpUrl = clientConfig.getHelpUrl();
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class to handle breadcrumb interaction for top-level navigation pages
+    */
+   public class NavigationBreadcrumbHandler implements IRepoBreadcrumbHandler
+   {
+      private static final long serialVersionUID = 4833194653193016638L;
+      
+      /**
+       * Constructor
+       * 
+       * @param label      Element label
+       */
+      public NavigationBreadcrumbHandler(NodeRef ref, String label)
+      {
+         this.label = label;
+         this.ref = ref;
+      }
+      
+      /**
+       * @see java.lang.Object#toString()
+       */
+      public String toString()
+      {
+         return this.label;
+      }
+
+      /**
+       * @see org.alfresco.web.ui.common.component.IBreadcrumbHandler#navigationOutcome(org.alfresco.web.ui.common.component.UIBreadcrumb)
+       */
+      public String navigationOutcome(UIBreadcrumb breadcrumb)
+      {
+         // set the current node to the specified top level node ID
+         FacesContext fc = FacesContext.getCurrentInstance();
+         setCurrentNodeId(ref.getId());
+         setLocation( (List)breadcrumb.getValue() );
+         
+         // setup the dispatch context
+         setupDispatchContext(new Node(ref));
+         
+         if (fc.getViewRoot().getViewId().equals(BrowseBean.BROWSE_VIEW_ID))
+         {
+            return null;
+         }
+         else
+         {
+            return "browse";
+         }
+      }
+      
+      public NodeRef getNodeRef()
+      {
+         return this.ref;
+      }
+      
+      private String label;
+      private NodeRef ref;
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   private static Logger s_logger = Logger.getLogger(NavigationBean.class);
+   
+   /** constant values used by the toolbar location modelist control */
+   private static final String LOCATION_COMPANY = "company";
+   private static final String LOCATION_HOME = "home";
+   
+   private static final String ERROR_DELETED_FOLDER = "error_deleted_folder";
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The SearchService to be used by the bean */
+   private SearchService searchService;
+   
+   /** NamespaceService bean reference */
+   private NamespaceService namespaceService;
+   
+   /** CIFSServer bean reference */
+   private CIFSServer cifsServer;
+   
+   /** CIFS content disk driver bean reference */
+   private ContentDiskInterface contentDiskDriver;
+   
+   /** ConfigService bean reference */
+   private ConfigService configService;
+   
+   /** Client configuration object */
+   private ClientConfigElement clientConfig = null;
+   
+   /** Cached path to our CIFS server and top level node DIR */
+   private String cifsServerPath;
+   
+   /** Node Id we are using for UI context operations */
+   private String currentNodeId;
+   
+   /** Node we are using for UI context operations */
+   private Node currentNode = null;
+   
+   /** Node we are using for dispatching */
+   private Node dispatchContext = null;
+   
+   /** Current toolbar location */
+   private String toolbarLocation = LOCATION_HOME;
+   
+   /** Search context object we are currently using or null for no search */
+   private SearchContext searchContext;
+   
+   /** expanded state of the Shelf panel wrapper component */
+   private boolean shelfExpanded = true;
+   
+   /** expanded state of the Shelf item components */
+   private boolean[] shelfItemExpanded = new boolean[] {true, true, true, false, false};
+   
+   /** list of the breadcrumb handler elements representing the location path of the UI */
+   private List<IBreadcrumbHandler> location = null;
+   
+   /** The client Help file url */
+   private String helpUrl;
+}
diff --git a/source/java/org/alfresco/web/bean/RecentSpacesBean.java b/source/java/org/alfresco/web/bean/RecentSpacesBean.java
new file mode 100644
index 0000000000..8b0542e76d
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/RecentSpacesBean.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.text.MessageFormat;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.repo.component.shelf.UIRecentSpacesShelfItem;
+import org.apache.log4j.Logger;
+
+/**
+ * This bean manages the real-time updated list of Recent Spaces in the Shelf component.
+ * <p>
+ * Registers itself as a UI Context Listener so it is informed as to when the current Node ID
+ * has changed in the NavigationBeans. This is used to keep the list of spaces up-to-date. 
+ * 
+ * @author Kevin Roast
+ */
+public class RecentSpacesBean implements IContextListener
+{
+   private static Logger logger = Logger.getLogger(RecentSpacesBean.class);
+   
+   /** The NavigationBean reference */
+   private NavigationBean navigator;
+   
+   /** The BrowseBean reference */
+   private BrowseBean browseBean;
+   
+   /** ConfigService bean reference */
+   private ConfigService configService;
+   
+   /** Maximum number of recent spaces to show */
+   private Integer maxRecentSpaces = null;
+   
+   /** List of recent space nodes */
+   private List<Node> recentSpaces = new LinkedList<Node>();
+   
+   
+   // ------------------------------------------------------------------------------
+   // Construction 
+   
+   /**
+    * Default Constructor
+    */
+   public RecentSpacesBean()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).registerBean(this);
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param configService The ConfigService to set.
+    */
+   public void setConfigService(ConfigService configService)
+   {
+      this.configService = configService;
+   }
+   
+   /**
+    * @return the List of recent spaces
+    */
+   public List<Node> getRecentSpaces()
+   {
+      return this.recentSpaces;
+   }
+   
+   /**
+    * @param spaces     List of Nodes
+    */
+   public void setRecentSpaces(List<Node> spaces)
+   {
+      this.recentSpaces = spaces;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action method handlers
+   
+   /**
+    * Action handler bound to the recent spaces Shelf component called when a Space is clicked
+    */
+   public void navigate(ActionEvent event)
+   {
+      // work out which node was clicked from the event data
+      UIRecentSpacesShelfItem.RecentSpacesEvent spaceEvent = (UIRecentSpacesShelfItem.RecentSpacesEvent)event;
+      Node selectedNode = this.recentSpaces.get(spaceEvent.Index);
+      NodeRef nodeRef = selectedNode.getNodeRef();
+      try
+      {
+         // then navigate to the appropriate node in UI
+         // use browse bean functionality for this as it will update the breadcrumb for us
+         this.browseBean.updateUILocation(nodeRef);
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {nodeRef.getId()}) );
+         
+         // remove invalid node from recent spaces list
+         this.recentSpaces.remove(spaceEvent.Index);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation
+   
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      // We use this listener handler to refresh the recent spaces list. At the point
+      // where this method is called, the current node Id in UI will probably have changed.
+      Node node = this.navigator.getCurrentNode();
+      
+      // search for this node - if it's already in the list remove it so
+      // that it appears at the top for us
+      for (int i=0; i<this.recentSpaces.size(); i++)
+      {
+         if (node.getId().equals(this.recentSpaces.get(i).getId()))
+         {
+            // found same node already in the list - remove it
+            this.recentSpaces.remove(i);
+            break;
+         }
+      }
+      
+      // remove an item if the list is at the maximum length
+      int maxItems = getMaxRecentSpaces();
+      if (this.recentSpaces.size() == maxItems)
+      {
+         this.recentSpaces.remove(maxItems - 1);
+      }
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Inserting node: " + node.getName() + " at top of recent spaces list.");
+      
+      // insert our Node at the top of the list so it's most relevent
+      this.recentSpaces.add(0, node);
+   }
+   
+   /**
+    * @return the max number of recent spaces to show, retrieved from client config
+    */
+   private int getMaxRecentSpaces()
+   {
+      if (maxRecentSpaces == null)
+      {
+         ClientConfigElement config = (ClientConfigElement)this.configService.getGlobalConfig().getConfigElement(
+               ClientConfigElement.CONFIG_ELEMENT_ID);
+         maxRecentSpaces = Integer.valueOf(config.getRecentSpacesItems());
+      }
+      
+      return maxRecentSpaces.intValue();
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/RulesBean.java b/source/java/org/alfresco/web/bean/RulesBean.java
new file mode 100644
index 0000000000..5729d1202b
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/RulesBean.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIModeList;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Backing bean for the manage content rules dialog
+ *  
+ * @author gavinc
+ */
+public class RulesBean
+{
+   private static final String MSG_ERROR_DELETE_RULE = "error_delete_rule";
+   private static final String LOCAL = "local";
+   private static final String INHERITED = "inherited";
+   
+   private static Log logger = LogFactory.getLog(RulesBean.class);
+   
+   private String viewMode = INHERITED;
+   private BrowseBean browseBean;
+   private RuleService ruleService;
+   private List<WrappedRule> rules;
+   private Rule currentRule;
+   private UIRichList richList;
+   
+   /**
+    * Returns the current view mode the list of rules is in
+    * 
+    * @return The current view mode
+    */
+   public String getViewMode()
+   {
+      return this.viewMode;
+   }
+   
+   /**
+    * @return The space to work against
+    */
+   public Node getSpace()
+   {
+      return this.browseBean.getActionSpace();
+   }
+   
+   /**
+    * Returns the list of rules to display
+    * 
+    * @return
+    */
+   public List<WrappedRule> getRules()
+   {
+      boolean includeInherited = true;
+      
+      if (this.viewMode.equals(LOCAL))
+      {
+         includeInherited = false;
+      }
+
+      // get the rules from the repository
+      List<Rule> repoRules = this.ruleService.getRules(getSpace().getNodeRef(), includeInherited);
+      this.rules = new ArrayList<WrappedRule>(repoRules.size());
+      
+      // wrap them all passing the current space
+      for (Rule rule : repoRules)
+      {
+         WrappedRule wrapped = new WrappedRule(rule, getSpace().getNodeRef());
+         this.rules.add(wrapped);
+      }
+      
+      return this.rules;
+   }
+   
+   /**
+    * Handles a rule being clicked ready for an action i.e. edit or delete
+    * 
+    * @param event The event representing the click
+    */
+   public void setupRuleAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Rule clicked, it's id is: " + id);
+         
+         this.currentRule = this.ruleService.getRule(
+               getSpace().getNodeRef(), id);
+      }
+   }
+   
+   /**
+    * Returns the current rule 
+    * 
+    * @return The current rule
+    */
+   public Rule getCurrentRule()
+   {
+      return this.currentRule;
+   }
+   
+   /**
+    * Handler called upon the completion of the Delete Rule page
+    * 
+    * @return outcome
+    */
+   public String deleteOK()
+   {
+      String outcome = null;
+      
+      if (this.currentRule != null)
+      {
+         try
+         {
+            String ruleTitle = this.currentRule.getTitle();
+            
+            this.ruleService.removeRule(getSpace().getNodeRef(),
+                  this.currentRule);
+            
+            // clear the current rule
+            this.currentRule = null;
+            
+            // setting the outcome will show the browse view again
+            outcome = "manageRules";
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Deleted rule '" + ruleTitle + "'");
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage(Application.getMessage(
+                  FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_RULE) + err.getMessage(), err);
+         }
+      }
+      else
+      {
+         logger.warn("WARNING: deleteOK called without a current Rule!");
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Change the current view mode based on user selection
+    * 
+    * @param event      ActionEvent
+    */
+   public void viewModeChanged(ActionEvent event)
+   {
+      UIModeList viewList = (UIModeList)event.getComponent();
+      this.viewMode = viewList.getValue().toString();
+      
+      // force the list to be re-queried when the page is refreshed
+      if (this.richList != null)
+      {
+         this.richList.setValue(null);
+      }
+   }
+
+   /**
+    * Sets the UIRichList component being used by this backing bean
+    * 
+    * @param richList UIRichList component
+    */
+   public void setRichList(UIRichList richList)
+   {
+      this.richList = richList;
+      this.richList.setValue(null);
+   }
+   
+   /**
+    * Returns the UIRichList component being used by this backing bean
+    * 
+    * @return UIRichList component
+    */
+   public UIRichList getRichList()
+   {
+      return this.richList;
+   }
+   
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param ruleService Sets the rule service to use
+    */
+   public void setRuleService(RuleService ruleService)
+   {
+      this.ruleService = ruleService;
+   }
+   
+   /**
+    * Inner class to wrap the Rule objects so we can expose a flag to indicate whether
+    * the rule is a local or inherited rule
+    */
+   public class WrappedRule
+   {
+      private Rule rule;
+      private NodeRef ruleNode;
+      
+      /**
+       * Constructs a RuleWrapper object
+       * 
+       * @param rule The rule we are wrapping
+       * @param ruleNode The node the rules belong to 
+       */
+      public WrappedRule(Rule rule, NodeRef ruleNode)
+      {
+         this.rule = rule;
+         this.ruleNode = ruleNode;
+      }
+      
+      /**
+       * Returns the rule being wrapped
+       * 
+       * @return The wrapped Rule
+       */
+      public Rule getRule()
+      {
+         return this.rule;
+      }
+      
+      /**
+       * Determines whether the current rule is a local rule or
+       * has been inherited from a parent
+       * 
+       * @return true if the rule is defined on the current node
+       */
+      public boolean getLocal()
+      {
+         return ruleNode.equals(this.rule.getOwningNodeRef());
+      }
+
+      /** Methods to support sorting of the rules list in a table  */
+      
+      /**
+       * Returns the rule id
+       * 
+       * @return The id
+       */
+      public String getId()
+      {
+         return this.rule.getId();
+      }
+      
+      /**
+       * Returns the rule title
+       * 
+       * @return The title
+       */
+      public String getTitle()
+      {
+         return this.rule.getTitle();
+      }
+      
+      /**
+       * Returns the rule description
+       * 
+       * @return The description
+       */
+      public String getDescription()
+      {
+         return this.rule.getDescription();
+      }
+      
+      /**
+       * Returns the created date
+       * 
+       * @return The created date
+       */
+      public Date getCreatedDate()
+      {
+         return this.rule.getCreatedDate();
+      }
+      
+      /**
+       * Returns the modfified date
+       * 
+       * @return The modified date
+       */
+      public Date getModifiedDate()
+      {
+         return this.rule.getModifiedDate();
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/SearchContext.java b/source/java/org/alfresco/web/bean/SearchContext.java
new file mode 100644
index 0000000000..4384080094
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/SearchContext.java
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.search.ISO9075;
+import org.alfresco.repo.search.impl.lucene.QueryParser;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Holds the context required to build a search query and can return the populated query.
+ * 
+ * @author Kevin Roast
+ */
+public final class SearchContext implements Serializable
+{
+   /** Search mode constants */
+   public final static int SEARCH_ALL = 0;
+   public final static int SEARCH_FILE_NAMES_CONTENTS = 1;
+   public final static int SEARCH_FILE_NAMES = 2;
+   public final static int SEARCH_SPACE_NAMES = 3;
+   
+   /** the search text string */
+   private String text = "";
+   
+   /** mode for the search */
+   private int mode = SearchContext.SEARCH_ALL;
+   
+   /** folder node location for the search */
+   private String location = null;
+   
+   /** categories to add to the search */
+   private String[] categories = new String[0];
+   
+   /** true to search location children as well as location */
+   private boolean locationChildren = true;
+   
+   /** true to search category children as well as category */
+   private boolean categoryChildren = true;
+   
+   /** content type to restrict search against */
+   private String contentType = null;
+   
+   /** content mimetype to restrict search against */
+   private String mimeType = null;
+   
+   /** any extra query attributes to add to the search */
+   private Map<QName, String> queryAttributes = new HashMap<QName, String>(5, 1.0f);
+   
+   /** any additional range attribute to add to the search */
+   private Map<QName, RangeProperties> rangeAttributes = new HashMap<QName, RangeProperties>(5, 1.0f);
+   
+   /** any additional fixed value attributes to add to the search, such as boolean or noderef */
+   private Map<QName, String> queryFixedValues = new HashMap<QName, String>(5, 1.0f);
+   
+   /** logger */
+   private static Log logger = LogFactory.getLog(SearchContext.class);
+   
+   
+   /**
+    * Build the search query string based on the current search context members.
+    * 
+    * @return prepared search query string
+    */
+   public String buildQuery()
+   {
+      String query;
+      
+      // the QName for the well known "name" attribute
+      String nameAttr = Repository.escapeQName(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "name"));
+      
+      // match against content text
+      String text = this.text.trim();
+      String fullTextQuery;
+      String nameAttrQuery;
+      
+      if (text.indexOf(' ') == -1)
+      {
+         // simple single word text search
+         if (text.charAt(0) != '*')
+         {
+            // escape characters and append the wildcard character
+            String safeText = QueryParser.escape(text);
+            fullTextQuery = " TEXT:" + safeText + '*';
+            nameAttrQuery = " @" + nameAttr + ":" + safeText + '*';
+         }
+         else
+         {
+            // found a leading wildcard - prepend it again after escaping the other characters
+            String safeText = QueryParser.escape(text.substring(1));
+            fullTextQuery = " TEXT:*" + safeText + '*';
+            nameAttrQuery = " @" + nameAttr + ":*" + safeText + '*';
+         }
+      }
+      else
+      {
+         // multiple word search
+         if (text.charAt(0) == '"' && text.charAt(text.length() - 1) == '"')
+         {
+            // as quoted phrase
+            String quotedSafeText = '"' + QueryParser.escape(text.substring(1, text.length() - 1)) + '"';
+            fullTextQuery = " TEXT:" + quotedSafeText;
+            nameAttrQuery = " @" + nameAttr + ":" + quotedSafeText;
+         }
+         else
+         {
+            // as individual search terms
+            StringTokenizer t = new StringTokenizer(text, " ");
+            StringBuilder fullTextBuf = new StringBuilder(64);
+            StringBuilder nameAttrBuf = new StringBuilder(64);
+            fullTextBuf.append('(');
+            nameAttrBuf.append('(');
+            while (t.hasMoreTokens())
+            {
+               String term = t.nextToken();
+               if (term.charAt(0) != '*')
+               {
+                  String safeTerm = QueryParser.escape(term);
+                  fullTextBuf.append("TEXT:").append(safeTerm).append('*');
+                  nameAttrBuf.append("@").append(nameAttr).append(":").append(safeTerm).append('*');
+               }
+               else
+               {
+                  String safeTerm = QueryParser.escape(term.substring(1));
+                  fullTextBuf.append("TEXT:*").append(safeTerm).append('*');
+                  nameAttrBuf.append("@").append(nameAttr).append(":*").append(safeTerm).append('*');
+               }
+               if (t.hasMoreTokens())
+               {
+                  fullTextBuf.append(" OR ");
+                  nameAttrBuf.append(" OR ");
+               }
+            }
+            fullTextBuf.append(')');
+            nameAttrBuf.append(')');
+            fullTextQuery = fullTextBuf.toString();
+            nameAttrQuery = nameAttrBuf.toString();
+         }
+      }
+      
+      // match a specific PATH for space location or categories
+      StringBuilder pathQuery = null;
+      if (location != null || (categories != null && categories.length !=0))
+      {
+         pathQuery = new StringBuilder(128);
+         if (location != null)
+         {
+            pathQuery.append(" PATH:\"").append(location).append("\" ");
+         }
+         if (categories != null && categories.length != 0)
+         {
+            for (int i=0; i<categories.length; i++)
+            {
+               if (pathQuery.length() != 0)
+               {
+                  pathQuery.append("OR");
+               }
+               pathQuery.append(" PATH:\"").append(categories[i]).append("\" "); 
+            }
+         }
+      }
+      
+      // match any extra query attribute values specified
+      StringBuilder attributeQuery = null;
+      if (queryAttributes.size() != 0)
+      {
+         attributeQuery = new StringBuilder(queryAttributes.size() << 6);
+         for (QName qname : queryAttributes.keySet())
+         {
+            String escapedName = Repository.escapeQName(qname);
+            String value = QueryParser.escape(queryAttributes.get(qname));
+            attributeQuery.append(" +@").append(escapedName)
+                          .append(":").append(value).append('*');
+         }
+      }
+      
+      // match any extra fixed value attributes specified
+      if (queryFixedValues.size() != 0)
+      {
+         if (attributeQuery == null)
+         {
+            attributeQuery = new StringBuilder(queryFixedValues.size() << 6);
+         }
+         for (QName qname : queryFixedValues.keySet())
+         {
+            String escapedName = Repository.escapeQName(qname);
+            String value = queryFixedValues.get(qname);
+            attributeQuery.append(" +@").append(escapedName)
+                          .append(":\"").append(value).append('"');
+         }
+      }
+      
+      // range attributes are a special case also
+      if (rangeAttributes.size() != 0)
+      {
+         if (attributeQuery == null)
+         {
+            attributeQuery = new StringBuilder(rangeAttributes.size() << 6);
+         }
+         for (QName qname : rangeAttributes.keySet())
+         {
+            String escapedName = Repository.escapeQName(qname);
+            RangeProperties rp = rangeAttributes.get(qname);
+            String value1 = QueryParser.escape(rp.lower);
+            String value2 = QueryParser.escape(rp.upper);
+            attributeQuery.append(" +@").append(escapedName)
+                          .append(":").append(rp.inclusive ? "[" : "{").append(value1)
+                          .append(" TO ").append(value2).append(rp.inclusive ? "]" : "}");
+         }
+      }
+      
+      // mimetype is a special case - it is indexed as a special attribute it comes from the combined
+      // ContentData attribute of cm:content - ContentData string cannot be searched directly
+      if (mimeType != null && mimeType.length() != 0)
+      {
+         if (attributeQuery == null)
+         {
+            attributeQuery = new StringBuilder(64);
+         }
+         String escapedName = Repository.escapeQName(QName.createQName(ContentModel.PROP_CONTENT + ".mimetype"));
+         attributeQuery.append(" +@").append(escapedName)
+                       .append(":").append(mimeType);
+      }
+      
+      // match against appropriate content type
+      String fileTypeQuery;
+      if (contentType != null)
+      {
+         fileTypeQuery = " +TYPE:\"" + contentType + "\" ";
+      }
+      else
+      {
+         // default to cm:content
+         fileTypeQuery = " +TYPE:\"{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}content\" ";
+      }
+      
+      // match against FOLDER type
+      String folderTypeQuery = " +TYPE:\"{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}folder\" ";
+      
+      switch (mode)
+      {
+         case SearchContext.SEARCH_ALL:
+            query = '(' + fileTypeQuery + " AND " + '(' + nameAttrQuery + fullTextQuery + ')' + ')' + " OR " +
+                    '(' + folderTypeQuery + " AND " + nameAttrQuery + ')';
+            break;
+         
+         case SearchContext.SEARCH_FILE_NAMES:
+            query = fileTypeQuery + " AND " + nameAttrQuery;
+            break;
+         
+         case SearchContext.SEARCH_FILE_NAMES_CONTENTS:
+            query = fileTypeQuery + " AND " + '(' + nameAttrQuery + fullTextQuery + ')';
+            break;
+         
+         case SearchContext.SEARCH_SPACE_NAMES:
+            query = folderTypeQuery + " AND " + nameAttrQuery;
+            break;
+         
+         default:
+            throw new IllegalStateException("Unknown search mode specified: " + mode);
+      }
+      
+      // match entire query against any additional attributes specified
+      if (attributeQuery != null)
+      {
+         query = attributeQuery + " AND (" + query + ')';
+      }
+      
+      // match entire query against specified Space path
+      if (pathQuery != null)
+      {
+         query = pathQuery + " AND (" + query + ')';
+      }
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Query: " + query);
+      
+      return query;
+   }
+   
+   /**
+    * Generate a search XPATH pointing to the specified node Id, optionally return an XPATH
+    * that includes the child nodes.
+    *  
+    * @param id         Of the node to generate path too
+    * @param children   Whether to include children of the node
+    * 
+    * @return the path
+    */
+   /*package*/ static String getPathFromSpaceRef(NodeRef ref, boolean children)
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      Path path = Repository.getServiceRegistry(context).getNodeService().getPath(ref);
+      NamespaceService ns = Repository.getServiceRegistry(context).getNamespaceService();
+      StringBuilder buf = new StringBuilder(64);
+      for (int i=0; i<path.size(); i++)
+      {
+         String elementString = "";
+         Path.Element element = path.get(i);
+         if (element instanceof Path.ChildAssocElement)
+         {
+            ChildAssociationRef elementRef = ((Path.ChildAssocElement)element).getRef();
+            if (elementRef.getParentRef() != null)
+            {
+               Collection prefixes = ns.getPrefixes(elementRef.getQName().getNamespaceURI());
+               if (prefixes.size() >0)
+               {
+                  elementString = '/' + (String)prefixes.iterator().next() + ':' + ISO9075.encode(elementRef.getQName().getLocalName());
+               }
+            }
+         }
+         
+         buf.append(elementString);
+      }
+      if (children == true)
+      {
+         // append syntax to get all children of the path
+         buf.append("//*");
+      }
+      else
+      {
+         // append syntax to just represent the path, not the children
+         buf.append("/*");
+      }
+      
+      return buf.toString();
+   }
+   
+   /**
+    * @return Returns the categories to use for the search
+    */
+   public String[] getCategories()
+   {
+      return this.categories;
+   }
+   
+   /**
+    * @param categories    The categories to set.
+    */
+   public void setCategories(String[] categories)
+   {
+      if (categories != null)
+      {
+         this.categories = categories;
+      }
+   }
+   
+   /**
+    * @return Returns the node to search from or null for all.
+    */
+   public String getLocation()
+   {
+      return this.location;
+   }
+   
+   /**
+    * @param location      The node to search from or null for all..
+    */
+   public void setLocation(String location)
+   {
+      this.location = location;
+   }
+   
+   /**
+    * @return Returns the mode to use during the search (see constants)
+    */
+   public int getMode()
+   {
+      return this.mode;
+   }
+   
+   /**
+    * @param mode The mode to use during the search (see constants)
+    */
+   public void setMode(int mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * @return Returns the search text string.
+    */
+   public String getText()
+   {
+      return this.text;
+   }
+   
+   /**
+    * @param text       The search text string.
+    */
+   public void setText(String text)
+   {
+      this.text = text;
+   }
+
+   /**
+    * @return Returns the contentType.
+    */
+   public String getContentType()
+   {
+      return this.contentType;
+   }
+
+   /**
+    * @param contentType The content type to restrict attribute search against.
+    */
+   public void setContentType(String contentType)
+   {
+      this.contentType = contentType;
+   }
+   
+   /**
+    * @return Returns the mimeType.
+    */
+   public String getMimeType()
+   {
+      return this.mimeType;
+   }
+   /**
+    * @param mimeType The mimeType to set.
+    */
+   public void setMimeType(String mimeType)
+   {
+      this.mimeType = mimeType;
+   }
+
+   /**
+    * @return Returns true to search location children, false for just the specified location.
+    */
+   public boolean getLocationChildren()
+   {
+      return this.locationChildren;
+   }
+   
+   /**
+    * @param locationChildren    True to search location children, false for just the specified location.
+    */
+   public void setLocationChildren(boolean locationChildren)
+   {
+      this.locationChildren = locationChildren;
+   }
+   
+   /**
+    * @return Returns true to search category children, false for just the specified category.
+    */
+   public boolean getCategoryChildren()
+   {
+      return this.categoryChildren;
+   }
+   
+   /**
+    * @param categoryChildren    True to search category children, false for just the specified category.
+    */
+   public void setCategoryChildren(boolean categoryChildren)
+   {
+      this.categoryChildren = categoryChildren;
+   }
+   
+   /**
+    * Add an additional attribute to search against
+    * 
+    * @param qname      QName of the attribute to search against
+    * @param value      Value of the attribute to use
+    */
+   public void addAttributeQuery(QName qname, String value)
+   {
+      this.queryAttributes.put(qname, value);
+   }
+   
+   /**
+    * Add an additional range attribute to search against
+    * 
+    * @param qname      QName of the attribute to search against
+    * @param lower      Lower value for range
+    * @param upper      Upper value for range
+    * @param inclusive  True for inclusive within the range, false otherwise
+    */
+   public void addRangeQuery(QName qname, String lower, String upper, boolean inclusive)
+   {
+      this.rangeAttributes.put(qname, new RangeProperties(qname, lower, upper, inclusive));
+   }
+   
+   /**
+    * Add an additional fixed value attribute to search against
+    * 
+    * @param qname      QName of the attribute to search against
+    * @param value      Fixed value of the attribute to use
+    */
+   public void addFixedValueQuery(QName qname, String value)
+   {
+      this.queryFixedValues.put(qname, value);
+   }
+   
+   
+   /**
+    * Simple wrapper class for range query attribute properties 
+    */
+   private static class RangeProperties
+   {
+      QName qname;
+      String lower;
+      String upper;
+      boolean inclusive;
+      
+      RangeProperties(QName qname, String lower, String upper, boolean inclusive)
+      {
+         this.qname = qname;
+         this.lower = lower;
+         this.upper = upper;
+         this.inclusive = inclusive;
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/SpaceDetailsBean.java b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java
new file mode 100644
index 0000000000..7598615a40
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.Utils.URLMode;
+import org.alfresco.web.ui.common.component.UIActionLink;
+
+/**
+ * Back bean provided access to the details of a Space
+ * 
+ * @author Kevin Roast
+ */
+public class SpaceDetailsBean
+{
+   private static final String OUTCOME_RETURN = "showSpaceDetails";
+
+   /** BrowseBean instance */
+   private BrowseBean browseBean;
+   
+   /** The NavigationBean bean reference */
+   private NavigationBean navigator;
+   
+   /** PermissionService bean reference */
+   private PermissionService permissionService;
+   
+   /** NodeServuce bean reference */
+   private NodeService nodeService;
+   
+   /** Selected template Id */
+   private String template;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * Sets the BrowseBean instance to use to retrieve the current Space
+    * 
+    * @param browseBean BrowseBean instance
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+   
+   /**
+    * @param nodeService   The NodeService to set
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * @param permissionService      The PermissionService to set.
+    */
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+   
+   /**
+    * Returns the Space this bean is currently representing
+    * 
+    * @return The Space Node
+    */
+   public Node getSpace()
+   {
+      return this.browseBean.getActionSpace();
+   }
+   
+   /**
+    * Returns the id of the current document
+    * 
+    * @return The id
+    */
+   public String getId()
+   {
+      return getSpace().getId();
+   }
+   
+   /**
+    * Returns the name of the current document
+    * 
+    * @return Name of the current document
+    */
+   public String getName()
+   {
+      return getSpace().getName();
+   }
+   
+   /**
+    * Returns the WebDAV URL for the current document
+    * 
+    * @return The WebDAV url
+    */
+   public String getWebdavUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getSpace(), URLMode.WEBDAV);
+   }
+
+   /**
+    * Returns the URL to access the details page for the current document
+    * 
+    * @return The bookmark URL
+    */
+   public String getBookmarkUrl()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getSpace(), URLMode.SHOW_DETAILS);
+   }
+   
+   /**
+    * Returns the CIFS path for the current document
+    * 
+    * @return The CIFS path
+    */
+   public String getCifsPath()
+   {
+      return Utils.generateURL(FacesContext.getCurrentInstance(), getSpace(), URLMode.CIFS);
+   }
+
+   /**
+    * @return Returns the template Id.
+    */
+   public String getTemplate()
+   {
+      // return current template if it exists
+      NodeRef ref = (NodeRef)getSpace().getProperties().get(ContentModel.PROP_TEMPLATE);
+      return ref != null ? ref.getId() : this.template;
+   }
+
+   /**
+    * @param template The template Id to set.
+    */
+   public void setTemplate(String template)
+   {
+      this.template = template;
+   }
+   
+   /**
+    * @return true if the current document has the 'templatable' aspect applied and
+    *         references a template that currently exists in the system.
+    */
+   public boolean isTemplatable()
+   {
+      NodeRef templateRef = (NodeRef)getSpace().getProperties().get(ContentModel.PROP_TEMPLATE);
+      return (getSpace().hasAspect(ContentModel.ASPECT_TEMPLATABLE) &&
+              templateRef != null && nodeService.exists(templateRef));
+   }
+   
+   /**
+    * @return String of the NodeRef for the dashboard template used by the space if any 
+    */
+   public String getTemplateRef()
+   {
+      NodeRef ref = (NodeRef)getSpace().getProperties().get(ContentModel.PROP_TEMPLATE);
+      return ref != null ? ref.toString() : null;
+   }
+   
+   /**
+    * Returns a model for use by a template on the Space Details page.
+    * 
+    * @return model containing current current space info.
+    */
+   public Map getTemplateModel()
+   {
+      HashMap model = new HashMap(1, 1.0f);
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      TemplateNode spaceNode = new TemplateNode(getSpace().getNodeRef(), Repository.getServiceRegistry(fc),
+            new TemplateImageResolver() {
+               public String resolveImagePathForName(String filename, boolean small) {
+                  return Utils.getFileTypeImage(filename, small);
+               }
+            });
+      model.put("space", spaceNode);
+      
+      return model;
+   }
+   
+   /**
+    * @return the list of available Content Templates that can be applied to the current document.
+    */
+   public SelectItem[] getTemplates()
+   {
+      // get the template from the special Content Templates folder
+      FacesContext context = FacesContext.getCurrentInstance();
+      String xpath = Application.getRootPath(context) + "/" + 
+            Application.getGlossaryFolderName(context) + "/" +
+            Application.getContentTemplatesFolderName(context) + "//*";
+      NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+      NamespaceService resolver = Repository.getServiceRegistry(context).getNamespaceService();
+      List<NodeRef> results = Repository.getServiceRegistry(context).getSearchService().selectNodes(
+            rootNodeRef, xpath, null, resolver, false);
+      
+      List<SelectItem> templates = new ArrayList<SelectItem>(results.size());
+      if (results.size() != 0)
+      {
+         DictionaryService dd = Repository.getServiceRegistry(context).getDictionaryService();
+         for (NodeRef ref : results)
+         {
+            Node childNode = new Node(ref);
+            if (dd.isSubClass(childNode.getType(), ContentModel.TYPE_CONTENT))
+            {
+               templates.add(new SelectItem(childNode.getId(), childNode.getName()));
+            }
+         }
+         
+         // make sure the list is sorted by the label
+         QuickSort sorter = new QuickSort(templates, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      return templates.toArray(new SelectItem[templates.size()]);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action event handlers
+   
+   /**
+    * Action handler to apply the selected Template and Templatable aspect to the current Space
+    */
+   public String applyTemplate()
+   {
+      try
+      {
+         // apply the templatable aspect if required 
+         if (getSpace().hasAspect(ContentModel.ASPECT_TEMPLATABLE) == false)
+         {
+            this.nodeService.addAspect(getSpace().getNodeRef(), ContentModel.ASPECT_TEMPLATABLE, null);
+         }
+         
+         // get the selected template from the Template Picker
+         NodeRef templateRef = new NodeRef(Repository.getStoreRef(), this.template);
+         
+         // set the template NodeRef into the templatable aspect property
+         this.nodeService.setProperty(getSpace().getNodeRef(), ContentModel.PROP_TEMPLATE, templateRef); 
+         
+         // reset space details for next refresh of details page
+         getSpace().reset();
+      }
+      catch (Exception e)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+      }
+      return OUTCOME_RETURN;
+   }
+   
+   /**
+    * Action handler to remove a dashboard template from the current Space
+    */
+   public String removeTemplate()
+   {
+      try
+      {
+         // clear template property
+         this.nodeService.setProperty(getSpace().getNodeRef(), ContentModel.PROP_TEMPLATE, null);
+         this.nodeService.removeAspect(getSpace().getNodeRef(), ContentModel.ASPECT_TEMPLATABLE);
+         
+         // reset space details for next refresh of details page
+         getSpace().reset();
+      }
+      catch (Exception e)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+      }
+      return OUTCOME_RETURN;
+   }
+   
+   /**
+    * Navigates to next item in the list of Spaces
+    */
+   public void nextItem(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         List<Node> nodes = this.browseBean.getNodes();
+         if (nodes.size() > 1)
+         {
+            // perform a linear search - this is slow but stateless
+            // otherwise we would have to manage state of last selected node
+            // this gets very tricky as this bean is instantiated once and never
+            // reset - it does not know when the document has changed etc.
+            for (int i=0; i<nodes.size(); i++)
+            {
+               if (id.equals(nodes.get(i).getId()) == true)
+               {
+                  Node next;
+                  // found our item - navigate to next
+                  if (i != nodes.size() - 1)
+                  {
+                     next = nodes.get(i + 1);
+                  }
+                  else
+                  {
+                     // handle wrapping case
+                     next = nodes.get(0);
+                  }
+                  
+                  // prepare for showing details for this node
+                  this.browseBean.setupSpaceAction(next.getId(), false);
+               }
+            }
+        }
+      }
+   }
+   
+   /**
+    * Navigates to the previous item in the list Spaces
+    */
+   public void previousItem(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         List<Node> nodes = this.browseBean.getNodes();
+         if (nodes.size() > 1)
+         {
+            // see above
+            for (int i=0; i<nodes.size(); i++)
+            {
+               if (id.equals(nodes.get(i).getId()) == true)
+               {
+                  Node previous;
+                  // found our item - navigate to previous
+                  if (i != 0)
+                  {
+                     previous = nodes.get(i - 1);
+                  }
+                  else
+                  {
+                     // handle wrapping case
+                     previous = nodes.get(nodes.size() - 1);
+                  }
+                  
+                  // show details for this node
+                  this.browseBean.setupSpaceAction(previous.getId(), false);
+               }
+            }
+         }
+      }
+   }
+   
+   /**
+    * Action handler to clear the current Space properties before returning to the browse screen,
+    * as the user may have modified the properties! 
+    */
+   public String closeDialog()
+   {
+      this.navigator.resetCurrentNodeProperties();
+      return "browse";
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/UserShortcutsBean.java b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
new file mode 100644
index 0000000000..14e39b8e91
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
@@ -0,0 +1,352 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.repo.component.shelf.UIShortcutsShelfItem;
+import org.apache.log4j.Logger;
+
+/**
+ * This bean manages the user defined list of Recent Spaces in the Shelf component.
+ * 
+ * @author Kevin Roast
+ */
+public class UserShortcutsBean
+{
+   private static Logger logger = Logger.getLogger(UserShortcutsBean.class);
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The BrowseBean reference */
+   private BrowseBean browseBean;
+   
+   /** List of shortcut nodes */
+   private List<Node> shortcuts = null;
+   
+   private QName QNAME_SHORTCUTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "shortcuts");
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters
+   
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @return the List of shortcut Nodes
+    */
+   public List<Node> getShortcuts()
+   {
+      if (this.shortcuts == null)
+      {
+         UserTransaction tx = null;
+         try
+         {
+            FacesContext context = FacesContext.getCurrentInstance();
+            tx = Repository.getUserTransaction(context);
+            tx.begin();
+            
+            // get the shortcuts from the preferences for this user
+            NodeRef prefRef = getShortcutsNodeRef();
+            List<String> shortcuts = (List<String>)this.nodeService.getProperty(prefRef, QNAME_SHORTCUTS);
+            if (shortcuts != null)
+            {
+               // each shortcut node ID is persisted as a list item in a well known property
+               this.shortcuts = new ArrayList<Node>(shortcuts.size());
+               for (int i=0; i<shortcuts.size(); i++)
+               {
+                  NodeRef ref = new NodeRef(Repository.getStoreRef(), shortcuts.get(i));
+                  if (this.nodeService.exists(ref) == true)
+                  {
+                     Node node = new Node(ref);
+                     
+                     // quick init properties while in the usertransaction
+                     node.getProperties();
+                     
+                     // save ref to the Node for rendering
+                     this.shortcuts.add(node);
+                  }
+                  else
+                  {
+                     // ignore this shortcut node - no longer exists in the system!
+                     // we write the node list back again afterwards to correct this
+                     if (logger.isDebugEnabled())
+                        logger.debug("Found invalid shortcut node Id: " + ref.getId());
+                  }
+               }
+               
+               // if the count of accessable shortcuts is different to our original list then
+               // write the valid shortcut IDs back to correct invalid node refs
+               if (this.shortcuts.size() != shortcuts.size())
+               {
+                  shortcuts = new ArrayList<String>(this.shortcuts.size());
+                  for (int i=0; i<this.shortcuts.size(); i++)
+                  {
+                     shortcuts.add(this.shortcuts.get(i).getId());
+                  }
+                  this.nodeService.setProperty(prefRef, QNAME_SHORTCUTS, (Serializable)shortcuts);
+               }
+            }
+            else
+            {
+               this.shortcuts = new ArrayList<Node>(5);
+            }
+            
+            tx.commit();
+         }
+         catch (Exception err)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+                  FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         }
+      }
+      
+      return this.shortcuts;
+   }
+   
+   /**
+    * @param spaces     List of shortcuts Nodes
+    */
+   public void setShortcuts(List<Node> nodes)
+   {
+      this.shortcuts = nodes;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action method handlers
+   
+   /**
+    * Action handler called when a new shortcut is to be added to the list
+    */
+   public void createShortcut(ActionEvent event)
+   {
+      // TODO: add this action to the Details screen for Space and Document
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         try
+         {
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+            
+            boolean foundShortcut = false;
+            for (int i=0; i<getShortcuts().size(); i++)
+            {
+               if (node.getId().equals(getShortcuts().get(i).getId()))
+               {
+                  // found same node already in the list - so we don't need to add it again
+                  foundShortcut = true;
+                  break;
+               }
+            }
+            
+            if (foundShortcut == false)
+            {
+               // add to persistent store
+               UserTransaction tx = null;
+               try
+               {
+                  FacesContext context = FacesContext.getCurrentInstance();
+                  tx = Repository.getUserTransaction(context);
+                  tx.begin();
+                  
+                  NodeRef prefRef = getShortcutsNodeRef();
+                  List<String> shortcuts = (List<String>)this.nodeService.getProperty(prefRef, QNAME_SHORTCUTS);
+                  if (shortcuts == null)
+                  {
+                     shortcuts = new ArrayList<String>(1);
+                  }
+                  shortcuts.add(node.getNodeRef().getId());
+                  this.nodeService.setProperty(prefRef, QNAME_SHORTCUTS, (Serializable)shortcuts);
+                  
+                  // commit the transaction
+                  tx.commit();
+                  
+                  // add our new shortcut Node to the in-memory list
+                  getShortcuts().add(node);
+                  
+                  if (logger.isDebugEnabled())
+                     logger.debug("Added node: " + node.getName() + " to the user shortcuts list.");
+               }
+               catch (Exception err)
+               {
+                  Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+                        FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+                  try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+               }
+            }
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+         }
+      }
+   }
+   
+   /**
+    * Get the node we need to store our user preferences
+    */
+   private NodeRef getShortcutsNodeRef()
+   {
+      return Application.getCurrentUser(FacesContext.getCurrentInstance()).getUserPreferencesRef();
+   }
+   
+   /**
+    * Action handler bound to the user shortcuts Shelf component called when a node is removed
+    */
+   public void removeShortcut(ActionEvent event)
+   {
+      UIShortcutsShelfItem.ShortcutEvent shortcutEvent = (UIShortcutsShelfItem.ShortcutEvent)event;
+      
+      // remove from persistent store
+      UserTransaction tx = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         NodeRef prefRef = getShortcutsNodeRef();
+         List<String> shortcuts = (List<String>)this.nodeService.getProperty(prefRef, QNAME_SHORTCUTS);
+         if (shortcuts != null && shortcuts.size() > shortcutEvent.Index)
+         {
+            // remove the shortcut from the saved list and persist back
+            shortcuts.remove(shortcutEvent.Index);
+            this.nodeService.setProperty(prefRef, QNAME_SHORTCUTS, (Serializable)shortcuts);
+            
+            // commit the transaction
+            tx.commit();
+            
+            // remove shortcut Node from the in-memory list
+            Node node = getShortcuts().remove(shortcutEvent.Index);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Removed node: " + node.getName() + " from the user shortcuts list.");
+         }
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+   }
+   
+   /**
+    * Action handler bound to the user shortcuts Shelf component called when a node is clicked
+    */
+   public void click(ActionEvent event)
+   {
+      // work out which node was clicked from the event data
+      UIShortcutsShelfItem.ShortcutEvent shortcutEvent = (UIShortcutsShelfItem.ShortcutEvent)event;
+      Node selectedNode = getShortcuts().get(shortcutEvent.Index);
+      
+      try
+      {
+         DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
+         if (dd.isSubClass(selectedNode.getType(), ContentModel.TYPE_FOLDER))
+         {
+            // then navigate to the appropriate node in UI
+            // use browse bean functionality for this as it will update the breadcrumb for us
+            this.browseBean.updateUILocation(selectedNode.getNodeRef());
+         }
+         else if (dd.isSubClass(selectedNode.getType(), ContentModel.TYPE_CONTENT))
+         {
+            // view details for document
+            this.browseBean.setupContentAction(selectedNode.getId(), true);
+            FacesContext fc = FacesContext.getCurrentInstance();
+            fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "showDocDetails");
+         }
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {selectedNode.getId()}) );
+         
+         // remove item from the shortcut list
+         UserTransaction tx = null;
+         try
+         {
+            FacesContext context = FacesContext.getCurrentInstance();
+            tx = Repository.getUserTransaction(context);
+            tx.begin();
+            
+            NodeRef prefRef = getShortcutsNodeRef();
+            List<String> shortcuts = (List<String>)this.nodeService.getProperty(prefRef, QNAME_SHORTCUTS);
+            if (shortcuts != null && shortcuts.size() > shortcutEvent.Index)
+            {
+               // remove the shortcut from the saved list and persist back
+               shortcuts.remove(shortcutEvent.Index);
+               this.nodeService.setProperty(prefRef, QNAME_SHORTCUTS, (Serializable)shortcuts);
+               
+               // commit the transaction
+               tx.commit();
+               
+               // remove shortcut Node from the in-memory list
+               Node node = getShortcuts().remove(shortcutEvent.Index);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Removed deleted node: " + node.getName() + " from the user shortcuts list.");
+            }
+         }
+         catch (Exception err)
+         {
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
new file mode 100644
index 0000000000..e507fdfc4c
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.clipboard;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.CopyService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.repo.component.shelf.UIClipboardShelfItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Kevin Roast
+ */
+public class ClipboardBean
+{
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters 
+   
+   /**
+    * @return Returns the NodeService.
+    */
+   public NodeService getNodeService()
+   {
+      return this.nodeService;
+   }
+
+   /**
+    * @param nodeService The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+   
+   /**
+    * @return Returns the NodeOperationsService.
+    */
+   public CopyService getNodeOperationsService()
+   {
+      return this.nodeOperationsService;
+   }
+
+   /**
+    * @param nodeOperationsService   The NodeOperationsService to set.
+    */
+   public void setNodeOperationsService(CopyService nodeOperationsService)
+   {
+      this.nodeOperationsService = nodeOperationsService;
+   }
+   
+   /**
+    * @return Returns the navigation bean instance.
+    */
+   public NavigationBean getNavigator()
+   {
+      return this.navigator;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+   
+   /**
+    * @return Returns the clipboard items.
+    */
+   public List<ClipboardItem> getItems()
+   {
+      return this.items;
+   }
+   
+   /**
+    * @param items   The clipboard items to set.
+    */
+   public void setItems(List<ClipboardItem> items)
+   {
+      this.items = items;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Navigation action event handlers 
+   
+   /**
+    * Action handler called to add a node to the clipboard for a Copy operation
+    */
+   public void copyNode(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         addClipboardNode(id, ClipboardStatus.COPY);
+      }
+   }
+   
+   /**
+    * Action handler called to add a node to the clipboard for a Cut operation
+    */
+   public void cutNode(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         addClipboardNode(id, ClipboardStatus.CUT);
+      }
+   }
+   
+   /**
+    * Action handler call from the browse screen to Paste All clipboard items into the current Space
+    */
+   public void pasteAll(ActionEvent event)
+   {
+      performPasteItems(-1);
+   }
+   
+   /**
+    * Action handler called to paste one or all items from the clipboard
+    */
+   public void pasteItem(ActionEvent event)
+   {
+      UIClipboardShelfItem.ClipboardEvent clipEvent = (UIClipboardShelfItem.ClipboardEvent)event;
+      
+      int index = clipEvent.Index;
+      if (index >= this.items.size())
+      {
+         throw new IllegalStateException("Clipboard attempting paste a non existent item index: " + index);
+      }
+      
+      performPasteItems(index);
+   }
+   
+   /**
+    * Perform a paste for the specified clipboard item(s)
+    * 
+    * @param index      of clipboard item to paste or -1 for all
+    */
+   private void performPasteItems(int index)
+   {
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         if (index == -1)
+         {
+            // paste all
+            for (int i=0; i<this.items.size(); i++)
+            {
+               performClipboardOperation(this.items.get(i));
+            }
+            // remove the cut operation item from the clipboard
+            List<ClipboardItem> newItems = new ArrayList<ClipboardItem>(this.items.size());
+            for (int i=0; i<this.items.size(); i++)
+            {
+               ClipboardItem item = this.items.get(i);
+               if (item.Mode != ClipboardStatus.CUT)
+               {
+                  newItems.add(item);
+               }
+            }
+            setItems(newItems);
+            // TODO: after a paste all - remove items from the clipboard...? or not. ask linton
+         }
+         else
+         {
+            // single paste operation
+            ClipboardItem item = this.items.get(index);
+            performClipboardOperation(item);
+            if (item.Mode == ClipboardStatus.CUT)
+            {
+               this.items.remove(index);
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // refresh UI on success
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      }
+      catch (Exception err)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(Application.getMessage(
+               FacesContext.getCurrentInstance(), MSG_ERROR_PASTE) + err.getMessage(), err);
+      }
+   }
+
+   /**
+    * Perform the operation for the specified clipboard item
+    * 
+    * @param item
+    */
+   private void performClipboardOperation(ClipboardItem item)
+   {
+      NodeRef parentRef = new NodeRef(Repository.getStoreRef(), 
+            this.navigator.getCurrentNodeId());
+      
+      // TODO: should we use primary parent here?
+      //       The problem is we can't pass round ChildAssocRefs as form params etc. in the UI!
+      //       It's tricky if we need to pass childassocref around everywhere...!
+      ChildAssociationRef assocRef = this.nodeService.getPrimaryParent(item.Node.getNodeRef());
+      
+      if (item.Mode == ClipboardStatus.COPY)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Trying to copy node ID: " + item.Node.getId() + " into node ID: " + parentRef.getId());
+         
+         // call the node ops service to initiate the copy
+         // TODO: should the assoc qname be derived from the type...?
+         DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
+         boolean copyChildren = dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER);
+         NodeRef copyRef = this.nodeOperationsService.copy(
+               item.Node.getNodeRef(),
+               parentRef,
+               ContentModel.ASSOC_CONTAINS,
+               assocRef.getQName(),
+               copyChildren);
+      }
+      else
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Trying to move node ID: " + item.Node.getId() + " into node ID: " + parentRef.getId());
+         
+         // move the node
+         this.nodeService.moveNode(
+               item.Node.getNodeRef(),
+               parentRef,
+               ContentModel.ASSOC_CONTAINS,
+               assocRef.getQName());
+      }
+   }
+   
+   /**
+    * Add a clipboard node for an operation to the clipboard
+    * 
+    * @param id      ID of the node for the operation
+    * @param mode    ClipboardStatus for the operation
+    */
+   private void addClipboardNode(String id, ClipboardStatus mode)
+   {
+      try
+      {
+         NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+         
+         // check for duplicates first
+         ClipboardItem item = new ClipboardItem(new Node(ref), mode);
+         boolean foundDuplicate = false;
+         for (int i=0; i<items.size(); i++)
+         {
+            if (items.get(i).equals(item))
+            {
+               // found a duplicate replace with new instance as copy mode may have changed
+               items.set(i, item);
+               foundDuplicate = true;
+               break;
+            }
+         }
+         // if duplicate not found, then append to list
+         if (foundDuplicate == false)
+         {
+            items.add(item);
+         }
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {id}) );
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   private static Log logger = LogFactory.getLog(ClipboardBean.class);
+   
+   /** I18N messages */
+   private static final String MSG_ERROR_PASTE = "error_paste";
+   
+   /** The NodeService to be used by the bean */
+   private NodeService nodeService;
+   
+   /** The NodeOperationsService to be used by the bean */
+   private CopyService nodeOperationsService;
+   
+   /** The NavigationBean reference */
+   private NavigationBean navigator;
+   
+   /** Current state of the clipboard items */
+   private List<ClipboardItem> items = new ArrayList<ClipboardItem>(4);
+}
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
new file mode 100644
index 0000000000..2a82910c93
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.clipboard;
+
+import org.alfresco.web.bean.repository.Node;
+
+/**
+ * @author Kevin Roast
+ */
+public class ClipboardItem
+{
+   /**
+    * Constructor
+    * 
+    * @param node       The node on the clipboard
+    * @param mode       The ClipboardStatus enum value
+    */
+   public ClipboardItem(Node node, ClipboardStatus mode)
+   {
+      this.Node = node;
+      this.Mode = mode;
+   }
+   
+   /**
+    * Override equals() to compare NodeRefs
+    */
+   public boolean equals(Object obj)
+   {
+      if (obj == this)
+      {
+         return true;
+      }
+      if (obj instanceof ClipboardItem)
+      {
+         return ((ClipboardItem)obj).Node.getNodeRef().equals(Node.getNodeRef());
+      }
+      else
+      {
+         return false;
+      }
+   }
+   
+   /**
+    * Override hashCode() to use the internal NodeRef hashcode instead
+    */
+   public int hashCode()
+   {
+      return Node.getNodeRef().hashCode();
+   }
+   
+   
+   public Node Node;
+   public ClipboardStatus Mode;
+}
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java
new file mode 100644
index 0000000000..6e746efbf3
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardStatus.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.clipboard;
+
+/**
+ * @author Kevin Roast
+ * 
+ * Clipboard status for an item.
+ */
+public enum ClipboardStatus {CUT, COPY}
diff --git a/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java b/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java
new file mode 100644
index 0000000000..b1d7ca09f6
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/preview/BasePreviewBean.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.preview;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.BrowseBean;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+
+/**
+ * Backing bean for the Preview Document in Template action page
+ * 
+ * @author Kevin Roast
+ */
+public abstract class BasePreviewBean
+{
+   private static final String NO_SELECTION = "none";
+
+   /** BrowseBean instance */
+   protected BrowseBean browseBean;
+   
+   /** NodeService instance */
+   protected NodeService nodeService;
+   
+   /** The SearchService instance */
+   protected SearchService searchService;
+   
+   /** The NavigationBean bean reference */
+   protected NavigationBean navigator;
+   
+   protected NodeRef template;
+   
+   
+   /**
+    * @param nodeService The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @param searchService The searchService to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+   
+   /**
+    * Returns the node this bean is currently working with
+    * 
+    * @return The current Node
+    */
+   public abstract Node getNode();
+   
+   /**
+    * Returns the id of the current node
+    * 
+    * @return The id
+    */
+   public String getId()
+   {
+      return getNode().getId();
+   }
+   
+   /**
+    * Returns the name of the current node
+    * 
+    * @return Name of the current node
+    */
+   public String getName()
+   {
+      return getNode().getName();
+   }
+   
+   /**
+    * @return the list of available Content Templates that can be applied to the current document.
+    */
+   public SelectItem[] getTemplates()
+   {
+      // TODO: could cache this last for say 1 minute before requerying
+      
+      // get the template from the special Content Templates folder
+      FacesContext context = FacesContext.getCurrentInstance();
+      String xpath = Application.getRootPath(context) + "/" + 
+            Application.getGlossaryFolderName(context) + "/" +
+            Application.getContentTemplatesFolderName(context) + "//*";
+      NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+      NamespaceService resolver = Repository.getServiceRegistry(context).getNamespaceService();
+      List<NodeRef> results = this.searchService.selectNodes(rootNodeRef, xpath, null, resolver, false);
+      
+      List<SelectItem> templates = new ArrayList<SelectItem>(results.size());
+      if (results.size() != 0)
+      {
+         DictionaryService dd = Repository.getServiceRegistry(context).getDictionaryService();
+         for (NodeRef ref : results)
+         {
+            Node childNode = new Node(ref);
+            if (dd.isSubClass(childNode.getType(), ContentModel.TYPE_CONTENT))
+            {
+               templates.add(new SelectItem(childNode.getId(), childNode.getName()));
+            }
+         }
+         
+         // make sure the list is sorted by the label
+         QuickSort sorter = new QuickSort(templates, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      // add an entry (at the start) to instruct the user to select a template
+      templates.add(0, new SelectItem(NO_SELECTION, Application.getMessage(FacesContext.getCurrentInstance(), "select_a_template")));
+      
+      return templates.toArray(new SelectItem[templates.size()]);
+   }
+   
+   /**
+    * Returns a model for use by the template on the Preview page.
+    * 
+    * @return model containing current document/space info.
+    */
+   public abstract Map getTemplateModel();
+   
+   /** Template Image resolver helper */
+   protected TemplateImageResolver imageResolver = new TemplateImageResolver()
+   {
+       public String resolveImagePathForName(String filename, boolean small)
+       {
+           return Utils.getFileTypeImage(filename, small);
+       }
+   };
+
+   /**
+    * @return the current template as a full NodeRef
+    */
+   public NodeRef getTemplateRef()
+   {
+      return this.template;
+   }
+   
+   /**
+    * @return Returns the template Id.
+    */
+   public String getTemplate()
+   {
+      return (this.template != null ? this.template.getId() : null);
+   }
+
+   /**
+    * @param template The template Id to set.
+    */
+   public void setTemplate(String template)
+   {
+      if (template != null && template.equals(NO_SELECTION) == false)
+      {
+         this.template = new NodeRef(Repository.getStoreRef(), template);
+      }
+   }
+   
+   private int findNextPreviewNode(List<Node> nodes, int start)
+   {
+      // search from start to end of list
+      for (int i=start; i<nodes.size(); i++)
+      {
+         Node next = nodes.get(i);
+         if (next.hasAspect(ContentModel.ASPECT_TEMPLATABLE))
+         {
+            return i;
+         }
+      }
+      // search from zero index to start - 1 (to skip original node)
+      for (int i=0; i<start - 1; i++)
+      {
+         Node next = nodes.get(i);
+         if (next.hasAspect(ContentModel.ASPECT_TEMPLATABLE))
+         {
+            return i;
+         }
+      }
+      return -1;
+   }
+   
+   private int findPrevPreviewNode(List<Node> nodes, int start)
+   {
+      // search from start to beginning of list
+      for (int i=start; i>=0; i--)
+      {
+         Node next = nodes.get(i);
+         if (next.hasAspect(ContentModel.ASPECT_TEMPLATABLE))
+         {
+            return i;
+         }
+      }
+      // end of list to start + 1 (to skip original node)
+      for (int i=nodes.size() - 1; i>start; i--)
+      {
+         Node next = nodes.get(i);
+         if (next.hasAspect(ContentModel.ASPECT_TEMPLATABLE))
+         {
+            return i;
+         }
+      }
+      return -1;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java b/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java
new file mode 100644
index 0000000000..99e2e1c5e2
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/preview/DocumentPreviewBean.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.preview;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.BrowseBean;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+
+/**
+ * Backing bean for the Preview Document in Template action page
+ * 
+ * @author Kevin Roast
+ */
+public class DocumentPreviewBean extends BasePreviewBean
+{
+   /**
+    * Returns the document this bean is currently representing
+    * 
+    * @return The document Node
+    */
+   public Node getNode()
+   {
+      return this.browseBean.getDocument();
+   }
+   
+   /**
+    * Returns a model for use by a template on the Document Details page.
+    * 
+    * @return model containing current document and current space info.
+    */
+   public Map getTemplateModel()
+   {
+      HashMap model = new HashMap(3, 1.0f);
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      TemplateNode documentNode = new TemplateNode(getNode().getNodeRef(),
+              Repository.getServiceRegistry(fc), imageResolver);
+      model.put("document", documentNode);
+      TemplateNode spaceNode = new TemplateNode(this.navigator.getCurrentNode().getNodeRef(),
+              Repository.getServiceRegistry(fc), imageResolver);
+      model.put("space", spaceNode);
+      
+      return model;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java b/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java
new file mode 100644
index 0000000000..a9cbba1611
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/preview/SpacePreviewBean.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.preview;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.BrowseBean;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+
+/**
+ * Backing bean for the Preview Space in Template action page
+ * 
+ * @author Kevin Roast
+ */
+public class SpacePreviewBean extends BasePreviewBean
+{
+   /**
+    * Returns the Space this bean is currently representing
+    * 
+    * @return The Space Node
+    */
+   public Node getNode()
+   {
+      return this.browseBean.getActionSpace();
+   }
+   
+   /**
+    * Returns a model for use by a template on the Document Details page.
+    * 
+    * @return model containing current document and current space info.
+    */
+   public Map getTemplateModel()
+   {
+      HashMap model = new HashMap(3, 1.0f);
+      
+      FacesContext fc = FacesContext.getCurrentInstance();
+      TemplateNode spaceNode = new TemplateNode(getNode().getNodeRef(),
+              Repository.getServiceRegistry(fc), imageResolver);
+      model.put("space", spaceNode);
+      
+      return model;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/DataDictionary.java b/source/java/org/alfresco/web/bean/repository/DataDictionary.java
new file mode 100644
index 0000000000..3d3927e19e
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/DataDictionary.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Lighweight client side representation of the repository data dictionary. 
+ * This allows service calls to be kept to a minimum and for bean access, thus enabling JSF
+ * value binding expressions.
+ * 
+ * @author gavinc
+ */
+public final class DataDictionary
+{
+   private static Log logger = LogFactory.getLog(DataDictionary.class);
+   private DictionaryService dictionaryService;
+   private NamespaceService namespaceService;
+   private Map<QName, TypeDefinition> types = new HashMap<QName, TypeDefinition>(11, 1.0f);
+
+   /**
+    * Constructor
+    * 
+    * @param dictionaryService The dictionary service to use to retrieve the data 
+    */
+   public DataDictionary(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+   
+   /**
+    * Returns the type definition for the type represented by the given qname
+    * 
+    * @param type The qname of the type to lookup the definition for
+    * @return The type definition for the requested type
+    */
+   public TypeDefinition getTypeDef(QName type)
+   {
+      TypeDefinition typeDef = types.get(type);
+      
+      if (typeDef == null)
+      {
+         typeDef = this.dictionaryService.getType(type);
+         
+         if (typeDef != null)
+         {
+            types.put(type, typeDef);
+         }
+      }
+      
+      return typeDef;
+   }
+   
+   /**
+    * Returns the type definition for the type represented by the given qname
+    * and for all the given aspects
+    * 
+    * @param type The type to retrieve the definition for 
+    * @param optionalAspects A list of aspects to retrieve the definition for 
+    * @return A unified type definition of the given type and aspects 
+    */
+   public TypeDefinition getTypeDef(QName type, Collection<QName> optionalAspects)
+   {
+      return this.dictionaryService.getAnonymousType(type, optionalAspects);
+   }
+   
+   /**
+    * Returns the property definition for the given property on the given node 
+    * 
+    * @param node The node from which to get the property
+    * @param property The property to find the definition for
+    * @return The property definition or null if the property is not known
+    */
+   public PropertyDefinition getPropertyDefinition(Node node, String property)
+   {
+      PropertyDefinition propDef = null;
+      
+      TypeDefinition typeDef = getTypeDef(node.getType(), node.getAspects());
+      
+      if (typeDef != null)
+      {
+         Map<QName, PropertyDefinition> properties = typeDef.getProperties();
+         propDef = properties.get(Repository.resolveToQName(property));
+      }
+      
+      return propDef;
+   }
+   
+   /**
+    * Returns the association definition for the given association on the given node
+    * 
+    * @param node The node from which to get the association
+    * @param association The association to find the definition for
+    * @return The association definition or null if the association is not known
+    */
+   public AssociationDefinition getAssociationDefinition(Node node, String association)
+   {
+      AssociationDefinition assocDef = null;
+      
+      TypeDefinition typeDef = getTypeDef(node.getType(), node.getAspects());
+      
+      if (typeDef != null)
+      {
+         Map<QName, AssociationDefinition> assocs = typeDef.getAssociations();
+         assocDef = assocs.get(Repository.resolveToQName(association));
+      }
+      
+      return assocDef;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/MapNode.java b/source/java/org/alfresco/web/bean/repository/MapNode.java
new file mode 100644
index 0000000000..53efb4c9f1
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/MapNode.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+
+/**
+ * Lighweight client side representation of a node held in the repository, which
+ * is modelled as a map for use in the data tables. 
+ * 
+ * @author gavinc
+ */
+public class MapNode extends Node implements Map<String, Object>
+{
+   private static final long serialVersionUID = 4051322327734433079L;
+   
+   private boolean propsInitialised = false;
+   
+   
+   /**
+    * Constructor
+    * 
+    * @param nodeRef        The NodeRef this Node wrapper represents
+    */
+   public MapNode(NodeRef nodeRef)
+   {
+      super(nodeRef);
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param nodeRef        The NodeRef this Node wrapper represents
+    * @param nodeService    The node service to use to retrieve data for this node
+    * @param initProps      True to immediately init the properties of the node, false to do nothing
+    */
+   public MapNode(NodeRef nodeRef, NodeService nodeService, boolean initProps)
+   {
+      super(nodeRef);
+      if (initProps == true)
+      {
+         getProperties();
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Map implementation - allows the Node bean to be accessed using JSF expression syntax 
+   
+   /**
+    * @see java.util.Map#clear()
+    */
+   public void clear()
+   {
+      getProperties().clear();
+   }
+
+   /**
+    * @see java.util.Map#containsKey(java.lang.Object)
+    */
+   public boolean containsKey(Object key)
+   {
+      return getProperties().containsKey(key);
+   }
+
+   /**
+    * @see java.util.Map#containsValue(java.lang.Object)
+    */
+   public boolean containsValue(Object value)
+   {
+      return getProperties().containsKey(value);
+   }
+
+   /**
+    * @see java.util.Map#entrySet()
+    */
+   public Set entrySet()
+   {
+      return getProperties().entrySet();
+   }
+
+   /**
+    * @see java.util.Map#get(java.lang.Object)
+    */
+   public Object get(Object key)
+   {
+      Object obj = null;
+      
+      // there are some things that aren't available as properties
+      // but from method calls, so for these handle them individually
+      Map<String, Object> props = getProperties();
+      if (propsInitialised == false)
+      {
+         // well known properties required as publically accessable map attributes
+         props.put("id", this.getId());
+         props.put("name", this.getName());     // TODO: perf test pulling back single prop here instead of all!
+         props.put("nodeRef", this.getNodeRef());
+         
+         propsInitialised = true;
+      }
+      
+      return props.get(key);
+   }
+
+   /**
+    * @see java.util.Map#isEmpty()
+    */
+   public boolean isEmpty()
+   {
+      return getProperties().isEmpty();
+   }
+
+   /**
+    * @see java.util.Map#keySet()
+    */
+   public Set keySet()
+   {
+      return getProperties().keySet();
+   }
+
+   /**
+    * @see java.util.Map#put(K, V)
+    */
+   public Object put(String key, Object value)
+   {
+      return getProperties().put(key, value);
+   }
+
+   /**
+    * @see java.util.Map#putAll(java.util.Map)
+    */
+   public void putAll(Map t)
+   {
+      getProperties().putAll(t);
+   }
+
+   /**
+    * @see java.util.Map#remove(java.lang.Object)
+    */
+   public Object remove(Object key)
+   {
+      return getProperties().remove(key);
+   }
+
+   /**
+    * @see java.util.Map#size()
+    */
+   public int size()
+   {
+      return getProperties().size();
+   }
+
+   /**
+    * @see java.util.Map#values()
+    */
+   public Collection values()
+   {
+      return getProperties().values();
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/Node.java b/source/java/org/alfresco/web/bean/repository/Node.java
new file mode 100644
index 0000000000..f257be38c4
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/Node.java
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Lighweight client side representation of a node held in the repository. 
+ * 
+ * @author gavinc
+ */
+public class Node implements Serializable
+{
+   private static final long serialVersionUID = 3544390322739034169L;
+
+   protected static Log logger = LogFactory.getLog(Node.class);
+   
+   protected NodeRef nodeRef;
+   private String name;
+   private QName type;
+   private String path;
+   private String id;
+   private Set<QName> aspects = null;
+   private Map<String, Boolean> permissions;
+   protected QNameNodeMap<String, Object> properties;
+   protected boolean propsRetrieved = false;
+   protected ServiceRegistry services = null;
+   
+   private boolean childAssocsRetrieved = false;
+   private QNameNodeMap childAssociations;
+   private Map<String, Map<String, ChildAssociationRef>> childAssociationsAdded;
+   private Map<String, Map<String, ChildAssociationRef>> childAssociationsRemoved;
+   
+   private boolean assocsRetrieved = false;
+   private QNameNodeMap associations;
+   private Map<String, Map<String, AssociationRef>> associationsAdded;
+   private Map<String, Map<String, AssociationRef>> associationsRemoved;
+   
+   /**
+    * Constructor
+    * 
+    * @param nodeRef The NodeRef this Node wrapper represents
+    */
+   public Node(NodeRef nodeRef)
+   {
+      if (nodeRef == null)
+      {
+         throw new IllegalArgumentException("NodeRef must be supplied for creation of a Node.");
+      }
+      
+      this.nodeRef = nodeRef;
+      this.id = nodeRef.getId();
+      
+      this.properties = new QNameNodeMap<String, Object>(getServiceRegistry().getNamespaceService(), this);
+   }
+
+   /**
+    * @return All the properties known about this node.
+    */
+   public Map<String, Object> getProperties()
+   {
+      if (this.propsRetrieved == false)
+      {
+         Map<QName, Serializable> props = getServiceRegistry().getNodeService().getProperties(this.nodeRef);
+         
+         for (QName qname: props.keySet())
+         {
+            Serializable propValue = props.get(qname);
+            this.properties.put(qname.toString(), propValue);
+         }
+         
+         this.propsRetrieved = true;
+      }
+      
+      return this.properties;
+   }
+   
+   /**
+    * @return All the associations this node has as a Map, using the association
+    *         type as the key
+    */
+   public final Map getAssociations()
+   {
+      if (this.assocsRetrieved == false)
+      {
+         associations = new QNameNodeMap(getServiceRegistry().getNamespaceService(), this);
+         
+         List<AssociationRef> assocs = getServiceRegistry().getNodeService().getTargetAssocs(this.nodeRef, RegexQNamePattern.MATCH_ALL);
+         
+         for (AssociationRef assocRef: assocs)
+         {
+            String assocName = assocRef.getTypeQName().toString();
+            
+            List list = (List)this.associations.get(assocName);
+            // create the list if this is first association with 'assocName'
+            if (list == null)
+            {
+               list = new ArrayList<AssociationRef>();
+               this.associations.put(assocName, list);
+            }
+            
+            // add the association to the list
+            list.add(assocRef);
+         }
+         
+         this.assocsRetrieved = true;
+      }
+      
+      return this.associations;
+   }
+   
+   /**
+    * Returns all the associations added to this node in this UI session
+    * 
+    * @return Map of Maps of AssociationRefs
+    */
+   public final Map<String, Map<String, AssociationRef>> getAddedAssociations()
+   {
+      if (this.associationsAdded == null)
+      {
+         this.associationsAdded = new HashMap<String, Map<String, AssociationRef>>();
+      }
+      return this.associationsAdded;
+   }
+   
+   /**
+    * Returns all the associations removed from this node is this UI session
+    * 
+    * @return Map of Maps of AssociationRefs
+    */
+   public final Map<String, Map<String, AssociationRef>> getRemovedAssociations()
+   {
+      if (this.associationsRemoved == null)
+      {
+         this.associationsRemoved = new HashMap<String, Map<String, AssociationRef>>();
+      }
+      return this.associationsRemoved;
+   }
+   
+   /**
+    * @return All the child associations this node has as a Map, using the association
+    *         type as the key
+    */
+   public final Map getChildAssociations()
+   {
+      if (this.childAssocsRetrieved == false)
+      {
+         this.childAssociations = new QNameNodeMap(getServiceRegistry().getNamespaceService(), this);
+         
+         List<ChildAssociationRef> assocs = getServiceRegistry().getNodeService().getChildAssocs(this.nodeRef);
+         
+         for (ChildAssociationRef assocRef: assocs)
+         {
+            String assocName = assocRef.getTypeQName().toString();
+            
+            List list = (List)this.childAssociations.get(assocName);
+            // create the list if this is first association with 'assocName'
+            if (list == null)
+            {
+               list = new ArrayList<ChildAssociationRef>();
+               this.childAssociations.put(assocName, list);
+            }
+            
+            // add the association to the list
+            list.add(assocRef);
+         }
+         
+         this.childAssocsRetrieved = true;
+      }
+      
+      return this.childAssociations;
+   }
+   
+   /**
+    * Returns all the child associations added to this node in this UI session
+    * 
+    * @return Map of Maps of ChildAssociationRefs
+    */
+   public final Map<String, Map<String, ChildAssociationRef>> getAddedChildAssociations()
+   {
+      if (this.childAssociationsAdded == null)
+      {
+         this.childAssociationsAdded = new HashMap<String, Map<String, ChildAssociationRef>>();
+      }
+      return this.childAssociationsAdded;
+   }
+   
+   /**
+    * Returns all the child associations removed from this node is this UI session
+    * 
+    * @return Map of Maps of ChildAssociationRefs
+    */
+   public final Map<String, Map<String, ChildAssociationRef>> getRemovedChildAssociations()
+   {
+      if (this.childAssociationsRemoved == null)
+      {
+         this.childAssociationsRemoved = new HashMap<String, Map<String, ChildAssociationRef>>();
+      }
+      return this.childAssociationsRemoved;
+   }
+   
+   /**
+    * Register a property resolver for the named property.
+    * 
+    * @param name       Name of the property this resolver is for
+    * @param resolver   Property resolver to register
+    */
+   public final void addPropertyResolver(String name, NodePropertyResolver resolver)
+   {
+      this.properties.addPropertyResolver(name, resolver);
+   }
+   
+   /**
+    * Determines whether the given property name is held by this node 
+    * 
+    * @param propertyName Property to test existence of
+    * @return true if property exists, false otherwise
+    */
+   public final boolean hasProperty(String propertyName)
+   {
+      return getProperties().containsKey(propertyName);
+   }
+
+   /**
+    * @return Returns the NodeRef this Node object represents
+    */
+   public final NodeRef getNodeRef()
+   {
+      return this.nodeRef;
+   }
+   
+   /**
+    * @return Returns the type.
+    */
+   public final QName getType()
+   {
+      if (this.type == null)
+      {
+         this.type = getServiceRegistry().getNodeService().getType(this.nodeRef);
+      }
+      
+      return type;
+   }
+   
+   /**
+    * @return The display name for the node
+    */
+   public final String getName()
+   {
+      if (this.name == null)
+      {
+         // try and get the name from the properties first
+         this.name = (String)getProperties().get("cm:name");
+         
+         // if we didn't find it as a property get the name from the association name
+         if (this.name == null)
+         {
+            this.name = getServiceRegistry().getNodeService().getPrimaryParent(this.nodeRef).getQName().getLocalName(); 
+         }
+      }
+      
+      return this.name;
+   }
+
+   /**
+    * @return The list of aspects applied to this node
+    */
+   public final Set<QName> getAspects()
+   {
+      if (this.aspects == null)
+      {
+         this.aspects = getServiceRegistry().getNodeService().getAspects(this.nodeRef);
+      }
+      
+      return this.aspects;
+   }
+   
+   /**
+    * @param aspect The aspect to test for
+    * @return true if the node has the aspect false otherwise
+    */
+   public final boolean hasAspect(QName aspect)
+   {
+      Set aspects = getAspects();
+      return aspects.contains(aspect);
+   }
+   
+   /**
+    * Return whether the current user has the specified access permission on this Node
+    * 
+    * @param permission     Permission to validate against
+    * 
+    * @return true if the permission is applied to the node for this user, false otherwise
+    */
+   public final boolean hasPermission(String permission)
+   {
+      Boolean valid = null;
+      if (permissions != null)
+      {
+         valid = permissions.get(permission);
+      }
+      else
+      {
+         permissions = new HashMap<String, Boolean>(5, 1.0f);
+      }
+      
+      if (valid == null)
+      {
+         PermissionService service = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getPermissionService();
+         valid = Boolean.valueOf(service.hasPermission(this.nodeRef, permission) == AccessStatus.ALLOWED);
+         permissions.put(permission, valid);
+      }
+      
+      return valid.booleanValue();
+   }
+
+   /**
+    * @return The GUID for the node
+    */
+   public final String getId()
+   {
+      return this.id;
+   }
+
+   /**
+    * @return The path for the node
+    */
+   public final String getPath()
+   {
+      if (this.path == null)
+      {
+         this.path = getServiceRegistry().getNodeService().getPath(this.nodeRef).toString();
+      }
+      
+      return this.path;
+   }
+   
+   /**
+    * Resets the state of the node to force re-retrieval of the data
+    */
+   public void reset()
+   {
+      this.name = null;
+      this.type = null;
+      this.path = null;
+      this.properties.clear();
+      this.propsRetrieved = false;
+      this.aspects = null;
+      this.permissions = null;
+      
+      this.associations = null;
+      this.associationsAdded = null;
+      this.associationsRemoved = null;
+      this.assocsRetrieved = false;
+      
+      this.childAssociations = null;
+      this.childAssociationsAdded = null;
+      this.childAssociationsRemoved = null;
+      this.childAssocsRetrieved = false;
+   }
+   
+   /**
+    * Override Object.toString() to provide useful debug output
+    */
+   public String toString()
+   {
+      if (getServiceRegistry().getNodeService() != null)
+      {
+         if (getServiceRegistry().getNodeService().exists(nodeRef))
+         {
+            return "Node Type: " + getType() + 
+                   "\nNode Properties: " + this.getProperties().toString() + 
+                   "\nNode Aspects: " + this.getAspects().toString();
+         }
+         else
+         {
+            return "Node no longer exists: " + nodeRef;
+         }
+      }
+      else
+      {
+         return super.toString();
+      }
+   }
+   
+   protected ServiceRegistry getServiceRegistry()
+   {
+      if (this.services == null)
+      {
+          this.services = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+      }
+      return this.services;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/NodePropertyResolver.java b/source/java/org/alfresco/web/bean/repository/NodePropertyResolver.java
new file mode 100644
index 0000000000..a56ee1e8fa
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/NodePropertyResolver.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+/**
+ * Simple interface used to implement small classes capable of calculating dynamic property values
+ * for Nodes at runtime. This allows bean responsible for building large lists of Nodes to
+ * encapsulate the code needed to retrieve non-standard Node properties. The values are then
+ * calculated on demand by the property resolver.
+ * 
+ * When a node is reset() the standard and other props are cleared. If property resolvers are used
+ * then the non-standard props will be restored automatically as well. 
+ * 
+ * @author Kevin Roast
+ */
+public interface NodePropertyResolver
+{
+   /**
+    * Get the property value for this resolver
+    * 
+    * @param node       Node this property is for
+    * 
+    * @return property value
+    */
+   public Object get(Node node);
+}
diff --git a/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java b/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java
new file mode 100644
index 0000000000..b8d9bb53ad
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.namespace.NamespacePrefixResolver;
+import org.alfresco.service.namespace.QNameMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A extension of the repo QNameMap to provide custom property resolving support for Node wrappers.
+ * 
+ * @author Kevin Roast
+ */
+public final class QNameNodeMap<K,V> extends QNameMap implements Map, Cloneable
+{
+   private Node parent = null;
+   private Map<String, NodePropertyResolver> resolvers = new HashMap<String, NodePropertyResolver>(11, 1.0f);
+   
+   /**
+    * Constructor
+    * 
+    * @param parent     Parent Node of the QNameNodeMap
+    */
+   public QNameNodeMap(NamespacePrefixResolver resolver, Node parent)
+   {
+      super(resolver);
+      if (parent == null)
+      {
+         throw new IllegalArgumentException("Parent Node cannot be null!");
+      }
+      this.parent = parent;
+   }
+   
+   /**
+    * Register a property resolver for the named property.
+    * 
+    * @param name       Name of the property this resolver is for
+    * @param resolver   Property resolver to register
+    */
+   public void addPropertyResolver(String name, NodePropertyResolver resolver)
+   {
+      this.resolvers.put(name, resolver);
+   }
+
+   /**
+    * @see java.util.Map#containsKey(java.lang.Object)
+    */
+   public boolean containsKey(Object key)
+   {
+      return (this.contents.containsKey(Repository.resolveToQNameString((String)key)) ||
+              this.resolvers.containsKey(key));
+   }
+
+   /**
+    * @see java.util.Map#get(java.lang.Object)
+    */
+   public Object get(Object key)
+   {
+      String qnameKey = Repository.resolveToQNameString(key.toString());
+      Object obj = this.contents.get(qnameKey);
+      if (obj == null)
+      {
+         // if a property resolver exists for this property name then invoke it
+         NodePropertyResolver resolver = this.resolvers.get(key.toString());
+         if (resolver != null)
+         {
+            obj = resolver.get(this.parent);
+            // cache the result
+            // obviously the cache is useless if the result is null, in most cases it shouldn't be
+            this.contents.put(qnameKey, obj);
+         }
+      }
+      
+      return obj;
+   }
+   
+   /**
+    * Perform a get without using property resolvers
+    * 
+    * @param key    item key
+    * @return object
+    */
+   public Object getRaw(Object key)
+   {
+      return this.contents.get(Repository.resolveToQNameString((String)key));
+   }
+   
+   /**
+    * Shallow copy the map by copying keys and values into a new QNameNodeMap
+    */
+   public Object clone()
+   {
+      QNameNodeMap map = new QNameNodeMap(this.resolver, this.parent);
+      map.putAll(this);
+      if (this.resolvers.size() != 0)
+      {
+         map.resolvers = (Map)((HashMap)this.resolvers).clone();
+      }
+      return map;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java
new file mode 100644
index 0000000000..be89f7b02e
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/Repository.java
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.configuration.ConfigurableService;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.metadata.MetadataExtracter;
+import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.log4j.Logger;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Helper class for accessing repository objects, convert values, escape values and service utilities.
+ * 
+ * @author gavinc
+ * @author kevinr
+ */
+public final class Repository
+{
+   /** I18N error messages */
+   public static final String ERROR_NODEREF = "error_noderef";
+   public static final String ERROR_GENERIC = "error_generic";
+   public static final String ERROR_NOHOME  = "error_homespace";
+   public static final String ERROR_SEARCH  = "error_search";
+   
+   private static final String METADATA_EXTACTER_REGISTRY = "metadataExtracterRegistry";  
+
+   private static Logger logger = Logger.getLogger(Repository.class);
+   
+   /** cache of client StoreRef */
+   private static StoreRef storeRef = null;
+   
+   /** reference to Person folder */
+   private static NodeRef peopleRef = null;
+   
+   /** reference to System folder */
+   private static NodeRef systemRef = null;
+   
+   /** reference to the namespace service */
+   private static NamespaceService namespaceService = null;
+   
+   /**
+    * Private constructor
+    */
+   private Repository()
+   {
+   }
+   
+   /**
+    * Returns a store reference object
+    * 
+    * @return A StoreRef object
+    */
+   public static StoreRef getStoreRef()
+   {
+      return storeRef;
+   }
+   
+   /**
+    * Returns a store reference object.
+    * This method is used to setup the cached value by the ContextListener initialisation methods
+    * 
+    * @return The StoreRef object
+    */
+   public static StoreRef getStoreRef(ServletContext context)
+   {
+      storeRef = Application.getRepositoryStoreRef(context);
+      
+      return storeRef;
+   }
+
+   /**
+    * Helper to get the display name for a Node.
+    * The method will attempt to use the "name" attribute, if not found it will revert to using
+    * the QName.getLocalName() retrieved from the primary parent relationship.
+    * 
+    * @param ref     NodeRef
+    * 
+    * @return display name string for the specified Node.
+    */
+   public static String getNameForNode(NodeService nodeService, NodeRef ref)
+   {
+      String name = null;
+      
+      // try to find a display "name" property for this node
+      Object nameProp = nodeService.getProperty(ref, ContentModel.PROP_NAME);
+      if (nameProp != null)
+      {
+         name = nameProp.toString();
+      }
+      else
+      {
+         // revert to using QName if not found
+         QName qname = nodeService.getPrimaryParent(ref).getQName();
+         if (qname != null)
+         {
+            name = qname.getLocalName();
+         }
+      }
+      
+      return name;
+   }
+
+   /**
+    * Escape a QName value so it can be used in lucene search strings
+    * 
+    * @param qName      QName to escape
+    * 
+    * @return escaped value
+    */
+   public static String escapeQName(QName qName)
+   {
+       String string = qName.toString();
+       StringBuilder buf = new StringBuilder(string.length() + 4);
+       for (int i = 0; i < string.length(); i++)
+       {
+           char c = string.charAt(i);
+           if ((c == '{') || (c == '}') || (c == ':') || (c == '-'))
+           {
+              buf.append('\\');
+           }
+   
+           buf.append(c);
+       }
+       return buf.toString();
+   }
+
+   /**
+    * Return whether a Node is currently locked
+    * 
+    * @param node             The Node wrapper to test against
+    * @param lockService      The LockService to use
+    * 
+    * @return whether a Node is currently locked
+    */
+   public static Boolean isNodeLocked(Node node, LockService lockService)
+   {
+      Boolean locked = Boolean.FALSE;
+      
+      if (node.hasAspect(ContentModel.ASPECT_LOCKABLE))
+      {
+         LockStatus lockStatus = lockService.getLockStatus(node.getNodeRef());
+         if (lockStatus == LockStatus.LOCKED || lockStatus == LockStatus.LOCK_OWNER)
+         {
+            locked = Boolean.TRUE;
+         }
+      }
+      
+      return locked;
+   }
+   
+   /**
+    * Return whether a Node is currently locked by the current user
+    * 
+    * @param node             The Node wrapper to test against
+    * @param lockService      The LockService to use
+    * 
+    * @return whether a Node is currently locked by the current user
+    */
+   public static Boolean isNodeOwnerLocked(Node node, LockService lockService)
+   {
+      Boolean locked = Boolean.FALSE;
+      
+      if (node.hasAspect(ContentModel.ASPECT_LOCKABLE) &&
+          lockService.getLockStatus(node.getNodeRef()) == LockStatus.LOCK_OWNER)
+      {
+         locked = Boolean.TRUE;
+      }
+      
+      return locked;
+   }
+   
+   /**
+    * Return whether a WorkingCopy Node is owned by the current User
+    * 
+    * @param node             The Node wrapper to test against
+    * @param lockService      The LockService to use
+    * 
+    * @return whether a WorkingCopy Node is owned by the current User
+    */
+   public static Boolean isNodeOwner(Node node, LockService lockService)
+   {
+      Boolean locked = Boolean.FALSE;
+      
+      if (node.hasAspect(ContentModel.ASPECT_WORKING_COPY))
+      {
+         Object obj = node.getProperties().get("workingCopyOwner");
+         if (obj instanceof String)
+         {
+            User user = Application.getCurrentUser(FacesContext.getCurrentInstance());
+            if ( ((String)obj).equals(user.getUserName()))
+            {
+               locked = Boolean.TRUE;
+            }
+         }
+      }
+      
+      return locked;
+   }
+   
+   /**
+    * Return the human readable form of the specified node Path. Fast version of the method that
+    * simply converts QName localname components to Strings.
+    * 
+    * @param path    Path to extract readable form from, excluding the final element
+    * 
+    * @return human readable form of the Path excluding the final element
+    */
+   public static String getDisplayPath(Path path)
+   {
+      StringBuilder buf = new StringBuilder(64);
+      
+      for (int i=0; i<path.size()-1; i++)
+      {
+         String elementString = null;
+         Path.Element element = path.get(i);
+         if (element instanceof Path.ChildAssocElement)
+         {
+            ChildAssociationRef elementRef = ((Path.ChildAssocElement)element).getRef();
+            if (elementRef.getParentRef() != null)
+            {
+               elementString = elementRef.getQName().getLocalName();
+            }
+         }
+         else
+         {
+            elementString = element.getElementString();
+         }
+         
+         if (elementString != null)
+         {
+            buf.append("/");
+            buf.append(elementString);
+         }
+      }
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Resolve a Path by converting each element into its display NAME attribute
+    * 
+    * @param path       Path to convert
+    * @param separator  Separator to user between path elements
+    * @param prefix     To prepend to the path
+    * 
+    * @return Path converted using NAME attribute on each element
+    */
+   public static String getNamePath(NodeService nodeService, Path path, NodeRef rootNode, String separator, String prefix)
+   {
+      StringBuilder buf = new StringBuilder(128);
+      
+      // ignore root node check if not passed in
+      boolean foundRoot = (rootNode == null);
+      
+      buf.append(prefix);
+      
+      // skip first element as it represents repo root '/'
+      for (int i=1; i<path.size(); i++)
+      {
+         Path.Element element = path.get(i);
+         String elementString = null;
+         if (element instanceof Path.ChildAssocElement)
+         {
+            ChildAssociationRef elementRef = ((Path.ChildAssocElement)element).getRef();
+            if (elementRef.getParentRef() != null)
+            {
+               // only append if we've found the root already
+               if (foundRoot == true)
+               {
+                  Object nameProp = nodeService.getProperty(elementRef.getChildRef(), ContentModel.PROP_NAME);
+                  if (nameProp != null)
+                  {
+                     elementString = nameProp.toString();
+                  }
+                  else
+                  {
+                     elementString = element.getElementString();
+                  }
+               }
+               
+               // either we've found root already or may have now
+               // check after as we want to skip the root as it represents the CIFS share name
+               foundRoot = (foundRoot || elementRef.getChildRef().equals(rootNode));
+            }
+         }
+         else
+         {
+            elementString = element.getElementString();
+         }
+         
+         if (elementString != null)
+         {
+            buf.append(separator);
+            buf.append(elementString);
+         }
+      }
+      
+      return buf.toString();
+   }
+
+   /**
+    * Return the mimetype code for the specified file name.
+    * <p>
+    * The file extension will be extracted from the filename and used to lookup the mimetype.
+    * 
+    * @param context       FacesContext
+    * @param filename      Non-null filename to process
+    * 
+    * @return mimetype for the specified filename - falls back to 'application/octet-stream' if not found.
+    */
+   public static String getMimeTypeForFileName(FacesContext context, String filename)
+   {
+      // base the mimetype from the file extension
+      MimetypeService mimetypeService = (MimetypeService)getServiceRegistry(context).getMimetypeService();
+      
+      // fall back to binary mimetype if no match found
+      String mimetype = MimetypeMap.MIMETYPE_BINARY;
+      int extIndex = filename.lastIndexOf('.');
+      if (extIndex != -1)
+      {
+         String ext = filename.substring(extIndex + 1).toLowerCase();
+         String mt = mimetypeService.getMimetypesByExtension().get(ext);
+         if (mt != null)
+         {
+            mimetype = mt;
+         }
+      }
+      
+      return mimetype;
+   }
+
+   /**
+    * Return a UserTransaction instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return UserTransaction
+    */
+   public static UserTransaction getUserTransaction(FacesContext context)
+   {
+      TransactionService transactionService = getServiceRegistry(context).getTransactionService(); 
+      return transactionService.getUserTransaction();
+   }
+   
+   /**
+    * Return a UserTransaction instance
+    * 
+    * @param context    FacesContext
+    * @param readonly   Transaction readonly state
+    * 
+    * @return UserTransaction
+    */
+   public static UserTransaction getUserTransaction(FacesContext context, boolean readonly)
+   {
+      TransactionService transactionService = getServiceRegistry(context).getTransactionService(); 
+      return transactionService.getUserTransaction(readonly);
+   }
+
+   /**
+    * Return the Repository Service Registry
+    * 
+    * @param context Faces Context
+    * @return the Service Registry
+    */
+   public static ServiceRegistry getServiceRegistry(FacesContext context)
+   {
+      return (ServiceRegistry)FacesContextUtils.getRequiredWebApplicationContext(
+            context).getBean(ServiceRegistry.SERVICE_REGISTRY);
+   }
+   
+   /**
+    * Return the Repository Service Registry
+    * 
+    * @param context Servlet Context
+    * @return the Service Registry
+    */
+   public static ServiceRegistry getServiceRegistry(ServletContext context)
+   {
+      return (ServiceRegistry)WebApplicationContextUtils.getRequiredWebApplicationContext(
+            context).getBean(ServiceRegistry.SERVICE_REGISTRY);
+   }
+   
+   /**
+    * Return the Configurable Service
+    * 
+    * @return the configurable service
+    */
+   public static ConfigurableService getConfigurableService(FacesContext context)
+   {
+      return (ConfigurableService)FacesContextUtils.getRequiredWebApplicationContext(context).getBean("configurableService");
+   }
+   
+   /**
+    * Return the Metadata Extracter Registry
+    * 
+    * @param context Faces Context
+    * @return the MetadataExtracterRegistry
+    */
+   public static MetadataExtracterRegistry getMetadataExtracterRegistry(FacesContext context)
+   {
+      return (MetadataExtracterRegistry)FacesContextUtils.getRequiredWebApplicationContext(
+            context).getBean(METADATA_EXTACTER_REGISTRY);
+   }
+   
+   /**
+    * Extracts the metadata of a "raw" piece of content into a map. 
+    * 
+    * @param context Faces Context
+    * @param reader Content reader for the source content to extract from 
+    * @param destination Map of metadata to set metadata values into
+    * @return True if an extracter was found
+    */
+   public static boolean extractMetadata(FacesContext context, ContentReader reader, Map<QName, Serializable> destination)
+   {
+      // check that source mimetype is available
+      String mimetype = reader.getMimetype();
+      if (mimetype == null)
+      {
+         throw new AlfrescoRuntimeException("The content reader mimetype must be set: " + reader);
+      }
+
+      // look for a transformer
+      MetadataExtracter extracter = getMetadataExtracterRegistry(context).getExtracter(mimetype);
+      if (extracter == null)
+      {
+         // No metadata extracter is not a failure, but we flag it 
+         return false;
+      }
+      
+      // we have a transformer, so do it
+      extracter.extract(reader, destination);
+      return true;
+   }
+
+   /**
+    * Query a list of Person type nodes from the repo
+    * It is currently assumed that all Person nodes exist below the Repository root node
+    * 
+    * @param context Faces Context
+    * @param nodeService The node service
+    * @param searchService used to perform the search
+    * @return List of Person node objects
+    */
+   public static List<Node> getUsers(FacesContext context, NodeService nodeService, SearchService searchService)
+   {
+      List<Node> personNodes = null;
+      
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         PersonService personService = (PersonService)FacesContextUtils.getRequiredWebApplicationContext(context).getBean("personService");
+         NodeRef peopleRef = personService.getPeopleContainer();
+         
+         // TODO: better to perform an XPath search or a get for a specific child type here?
+         List<ChildAssociationRef> childRefs = nodeService.getChildAssocs(peopleRef);
+         personNodes = new ArrayList<Node>(childRefs.size());
+         for (ChildAssociationRef ref: childRefs)
+         {
+            // create our Node representation from the NodeRef
+            NodeRef nodeRef = ref.getChildRef();
+            
+            if (nodeService.getType(nodeRef).equals(ContentModel.TYPE_PERSON))
+            {
+               // create our Node representation
+               MapNode node = new MapNode(nodeRef);
+               
+               // set data binding properties
+               // this will also force initialisation of the props now during the UserTransaction
+               // it is much better for performance to do this now rather than during page bind
+               Map<String, Object> props = node.getProperties(); 
+               props.put("fullName", ((String)props.get("firstName")) + ' ' + ((String)props.get("lastName")));
+               NodeRef homeFolderNodeRef = (NodeRef)props.get("homeFolder");
+               if (homeFolderNodeRef != null)
+               {
+                  props.put("homeSpace", homeFolderNodeRef);
+               }
+               
+               personNodes.add(node);
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               context, Repository.ERROR_NODEREF), new Object[] {"root"}) );
+         personNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               context, Repository.ERROR_GENERIC), err.getMessage()), err );
+         personNodes = Collections.<Node>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      
+      return personNodes;
+   }
+   
+   /**
+    * Convert a property of unknown type to a String value. A native String value will be
+    * returned directly, else toString() will be executed, null is returned as null. 
+    * 
+    * @param value      Property value
+    * 
+    * @return value to String or null
+    */
+   public static String safePropertyToString(Serializable value)
+   {
+      if (value == null)
+      {
+         return null;
+      }
+      else if (value instanceof String)
+      {
+         return (String)value;
+      }
+      else
+      {
+         return value.toString();
+      }
+   }
+   
+   /**
+    * Creates a QName representation for the given String.
+    * If the String has no namespace the Alfresco namespace is added.
+    * If the String has a prefix an attempt to resolve the prefix to the
+    * full URI will be made. 
+    * 
+    * @param str The string to convert
+    * @return A QName representation of the given string 
+    */
+   public static QName resolveToQName(String str)
+   {
+      return QName.resolveToQName(getNamespaceService(), str);
+   }
+   
+   /**
+    * Creates a string representation of a QName for the given string.
+    * If the given string already has a namespace, either a URL or a prefix,
+    * nothing the given string is returned. If it does not have a namespace
+    * the Alfresco namespace is added.
+    * 
+    * @param str The string to convert
+    * @return A QName String representation of the given string 
+    */
+   public static String resolveToQNameString(String str)
+   {
+      return QName.resolveToQNameString(getNamespaceService(), str);
+   }
+   
+   /**
+    * Returns an instance of the namespace service
+    * 
+    * @return The NamespaceService
+    */
+   private static NamespaceService getNamespaceService()
+   {
+      if (namespaceService == null)
+      {
+         ServiceRegistry svcReg = getServiceRegistry(FacesContext.getCurrentInstance());
+         namespaceService = svcReg.getNamespaceService();
+      }
+      
+      return namespaceService;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/repository/User.java b/source/java/org/alfresco/web/bean/repository/User.java
new file mode 100644
index 0000000000..8159119c6f
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/repository/User.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.repository;
+
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.configuration.ConfigurableService;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+
+/**
+ * Bean that represents the currently logged in user
+ * 
+ * @author gavinc
+ */
+public final class User
+{
+   private String homeSpaceId;
+   private String userName;
+   private String ticket;
+   private NodeRef person;
+   private String fullName = null;
+   private Boolean administrator = null;
+   
+   /** cached ref to our user preferences node */
+   private NodeRef preferencesFolderRef = null;
+   
+   /**
+    * Constructor
+    * 
+    * @param userName constructor for the user
+    */
+   public User(String userName, String ticket, NodeRef person)
+   {
+      if (userName == null || ticket == null || person == null)
+      {
+         throw new IllegalArgumentException("All user details are mandatory!");
+      }
+      
+      this.userName = userName;  
+      this.ticket = ticket;
+      this.person = person;
+   }
+   
+   /**
+    * @return The user name
+    */
+   public String getUserName()
+   {
+      return this.userName;
+   }
+   
+   /**
+    * Return the full name of the Person this User represents 
+    * 
+    * @param service        NodeService to use
+    * 
+    * @return The full name
+    */
+   public String getFullName(NodeService service)
+   {
+      if (this.fullName == null)
+      {
+         this.fullName = service.getProperty(this.person, ContentModel.PROP_FIRSTNAME) + " " +
+               service.getProperty(this.person, ContentModel.PROP_LASTNAME);
+      }
+      
+      return this.fullName;
+   }
+   
+   /**
+    * @return Retrieves the user's home space (this may be the id of the company home space)
+    */
+   public String getHomeSpaceId()
+   {
+      return this.homeSpaceId;
+   }
+
+   /**
+    * @param homeSpaceId Sets the id of the users home space
+    */
+   public void setHomeSpaceId(String homeSpaceId)
+   {
+      this.homeSpaceId = homeSpaceId;
+   }
+
+   /**
+    * @return Returns the ticket.
+    */
+   public String getTicket()
+   {
+      return this.ticket;
+   }
+
+   
+   /**
+    * @return Returns the person NodeRef
+    */
+   public NodeRef getPerson()
+   {
+      return this.person;
+   }
+   
+   /**
+    * @return If the current user has Admin Authority
+    */
+   public boolean isAdmin()
+   {
+      if (administrator == null)
+      {
+         administrator = Repository.getServiceRegistry(FacesContext.getCurrentInstance())
+               .getAuthorityService().hasAdminAuthority();
+      }
+      
+      return administrator;
+   }
+   
+   /**
+    * Get or create the node used to store user preferences.
+    * Utilises the 'configurable' aspect on the Person linked to this user.
+    */
+   public synchronized NodeRef getUserPreferencesRef()
+   {
+      if (this.preferencesFolderRef == null)
+      {
+         FacesContext fc = FacesContext.getCurrentInstance();
+         ServiceRegistry registry = Repository.getServiceRegistry(fc);
+         NodeService nodeService = registry.getNodeService();
+         SearchService searchService = registry.getSearchService();
+         NamespaceService namespaceService = registry.getNamespaceService();
+         ConfigurableService configurableService = Repository.getConfigurableService(fc);
+         
+         NodeRef person = Application.getCurrentUser(fc).getPerson();
+         if (nodeService.hasAspect(person, ContentModel.ASPECT_CONFIGURABLE) == false)
+         {
+            // create the configuration folder for this Person node
+        	 configurableService.makeConfigurable(person);
+         }
+         
+         // target of the assoc is the configurations folder ref
+         NodeRef configRef = configurableService.getConfigurationFolder(person);
+         if (configRef == null)
+         {
+            throw new IllegalStateException("Unable to find associated 'configurations' folder for node: " + person);
+         }
+         
+         String xpath = NamespaceService.APP_MODEL_PREFIX + ":" + "preferences";
+         List<NodeRef> nodes = searchService.selectNodes(
+               configRef,
+               xpath,
+               null,
+               namespaceService,
+               false);
+         
+         NodeRef prefRef;
+         if (nodes.size() == 1)
+         {
+            prefRef = nodes.get(0);
+         }
+         else
+         {
+            // create the preferences Node for this user
+            ChildAssociationRef childRef = nodeService.createNode(
+                  configRef,
+                  ContentModel.ASSOC_CONTAINS,
+                  QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "preferences"),
+                  ContentModel.TYPE_CMOBJECT);
+            
+            prefRef = childRef.getChildRef();
+         }
+         
+         this.preferencesFolderRef = prefRef;
+      }
+      
+      return this.preferencesFolderRef;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
new file mode 100644
index 0000000000..5b57b41e96
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
@@ -0,0 +1,633 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.users;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UISelectOne;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.BrowseBean;
+import org.alfresco.web.bean.repository.MapNode;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UserMembersBean
+{
+   private static final String MSG_SUCCESS_INHERIT_NOT = "success_not_inherit_permissions";
+   private static final String MSG_SUCCESS_INHERIT = "success_inherit_permissions";
+   
+   private static final String ERROR_DELETE = "error_remove_user";
+
+   private static final String OUTCOME_FINISH = "finish";
+
+   /** NodeService bean reference */
+   private NodeService nodeService;
+
+   /** SearchService bean reference */
+   private SearchService searchService;
+   
+   /** PermissionService bean reference */
+   private PermissionService permissionService;
+   
+   /** PersonService bean reference */
+   private PersonService personService;
+   
+   /** BrowseBean bean refernce */
+   private BrowseBean browseBean;
+   
+   /** OwnableService bean reference */
+   private OwnableService ownableService;
+   
+   /** Component reference for Users RichList control */
+   private UIRichList usersRichList;
+   
+   /** action context */
+   private String personAuthority = null;
+   
+   /** action context */
+   private String personName = null;
+   
+   /** datamodel for table of roles for current person */
+   private DataModel personRolesDataModel = null;
+   
+   /** roles for current person */
+   private List<PermissionWrapper> personRoles = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters
+
+   /**
+    * @param nodeService        The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param searchService      The search service
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * @param permissionService  The PermissionService to set.
+    */
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+   
+   /**
+    * @param ownableService         The ownableService to set.
+    */
+   public void setOwnableService(OwnableService ownableService)
+   {
+      this.ownableService = ownableService;
+   }
+   
+   /**
+    * @param personService             The personService to set.
+    */
+   public void setPersonService(PersonService personService)
+   {
+      this.personService = personService;
+   }
+   
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * @return The space to work against
+    */
+   public Node getSpace()
+   {
+      return this.browseBean.getActionSpace();
+   }
+   
+   /**
+    * @return Returns the usersRichList.
+    */
+   public UIRichList getUsersRichList()
+   {
+      return this.usersRichList;
+   }
+
+   /**
+    * @param usersRichList  The usersRichList to set.
+    */
+   public void setUsersRichList(UIRichList usersRichList)
+   {
+      this.usersRichList = usersRichList;
+      
+      // force refresh on exit of the page (as this property is set by JSF on view restore) 
+      this.usersRichList.setValue(null);
+   }
+   
+   /**
+    * Returns the properties for current Person roles JSF DataModel
+    * 
+    * @return JSF DataModel representing the current Person roles
+    */
+   public DataModel getPersonRolesDataModel()
+   {
+      if (this.personRolesDataModel == null)
+      {
+         this.personRolesDataModel = new ListDataModel();
+      }
+      
+      this.personRolesDataModel.setWrappedData(this.personRoles);
+      
+      return this.personRolesDataModel;
+   }
+   
+   /**
+    * @return Returns the current person authority.
+    */
+   public String getPersonAuthority()
+   {
+      return this.personAuthority;
+   }
+
+   /**
+    * @param person     The person person authority to set.
+    */
+   public void setPersonAuthority(String person)
+   {
+      this.personAuthority = person;
+   }
+   
+   /**
+    * @return Returns the personName.
+    */
+   public String getPersonName()
+   {
+      return this.personName;
+   }
+
+   /**
+    * @param personName The personName to set.
+    */
+   public void setPersonName(String personName)
+   {
+      this.personName = personName;
+   }
+   
+   /**
+    * @return true if the current user can change permissions on this Space
+    */
+   public boolean getHasChangePermissions()
+   {
+      return getSpace().hasPermission(PermissionService.CHANGE_PERMISSIONS);
+   }
+   
+   /**
+    * @return Returns the inherit parent permissions flag set for the current space.
+    */
+   public boolean isInheritPermissions()
+   {
+      return this.permissionService.getInheritParentPermissions(getSpace().getNodeRef());
+   }
+
+   /**
+    * @param inheritPermissions The inheritPermissions to set.
+    */
+   public void setInheritPermissions(boolean inheritPermissions)
+   {
+      // stub - no impl as changes are made immediately using a ValueChanged listener
+   }
+   
+   /**
+    * Return the owner username
+    */
+   public String getOwner()
+   {
+      return this.ownableService.getOwner(getSpace().getNodeRef());
+   }
+   
+   /**
+    * @return the list of user nodes for list data binding
+    */
+   public List<Map> getUsers()
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      
+      List<Map> personNodes = null;
+      
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         // Return all the permissions set against the current node
+         // for any authentication instance (user).
+         // Then combine them into a single list for each authentication found. 
+         User user = Application.getCurrentUser(context);
+         Map<String, List<String>> permissionMap = new HashMap<String, List<String>>(13, 1.0f);
+         Set<AccessPermission> permissions = permissionService.getAllSetPermissions(getSpace().getNodeRef());
+         if (permissions != null)
+         {
+            for (AccessPermission permission : permissions)
+            {
+               // we are only interested in Allow and not groups/owner etc.
+               if (permission.getAccessStatus() == AccessStatus.ALLOWED &&
+                   (permission.getAuthorityType() == AuthorityType.USER ||
+                    permission.getAuthorityType() == AuthorityType.GROUP ||
+                    permission.getAuthorityType() == AuthorityType.EVERYONE))
+               {
+                  String authority = permission.getAuthority();
+                  
+                  List<String> userPermissions = permissionMap.get(authority);
+                  if (userPermissions == null)
+                  {
+                     // create for first time
+                     userPermissions = new ArrayList<String>(4);
+                     permissionMap.put(authority, userPermissions);
+                  }
+                  // add the permission name for this authority
+                  userPermissions.add(permission.getPermission());
+               }
+            }
+         }
+         
+         // for each authentication (username key) found we get the Person
+         // node represented by it and use that for our list databinding object
+         personNodes = new ArrayList<Map>(permissionMap.size());
+         for (String authority : permissionMap.keySet())
+         {
+            // check if we are dealing with a person (User Authority)
+            if (personService.personExists(authority))
+            {
+               NodeRef nodeRef = personService.getPerson(authority);
+               if (nodeRef != null)
+               {
+                  // create our Node representation
+                  MapNode node = new MapNode(nodeRef);
+                  
+                  // set data binding properties
+                  // this will also force initialisation of the props now during the UserTransaction
+                  // it is much better for performance to do this now rather than during page bind
+                  Map<String, Object> props = node.getProperties(); 
+                  props.put("fullName", ((String)props.get("firstName")) + ' ' + ((String)props.get("lastName")));
+                  
+                  String userName = (String)props.get("userName");
+                  props.put("roles", listToString(context, permissionMap.get(authority)));
+                  
+                  props.put("icon", WebResources.IMAGE_PERSON);
+                  
+                  personNodes.add(node);
+               }
+            }
+            else
+            {
+               // need a map (dummy node) to represent props for this Group Authority
+               Map<String, Object> node = new HashMap<String, Object>(5, 1.0f);
+               node.put("fullName", authority.substring(PermissionService.GROUP_PREFIX.length()));
+               node.put("userName", authority);
+               node.put("id", authority);
+               node.put("roles", listToString(context, permissionMap.get(authority)));
+               node.put("icon", WebResources.IMAGE_GROUP);
+               personNodes.add(node);
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               context, Repository.ERROR_NODEREF), new Object[] {"root"}) );
+         personNodes = Collections.<Map>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               context, Repository.ERROR_GENERIC), err.getMessage()), err );
+         personNodes = Collections.<Map>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      
+      return personNodes;
+   }
+   
+   private static String listToString(FacesContext context, List<String> list)
+   {
+      StringBuilder buf = new StringBuilder();
+      
+      if (list != null)
+      {
+         for (int i=0; i<list.size(); i++)
+         {
+            if (buf.length() != 0)
+            {
+               buf.append(", ");
+            }
+            buf.append(Application.getMessage(context, list.get(i)));
+         }
+      }
+      
+      return buf.toString();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action event handlers
+   
+   /**
+    * Action event called by all actions that need to setup a Person context on
+    * the UserMembers bean before an action page is called. The context will be a
+    * Authority in setPersonAuthority() which can be retrieved on the action page from
+    * UserMembersBean.setPersonAuthority().
+    */
+   public void setupUserAction(ActionEvent event)
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      
+      UIActionLink link = (UIActionLink) event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String authority = params.get("userName");
+      if (authority != null && authority.length() != 0)
+      {
+         try
+         {
+            if (this.personService.personExists(authority))
+            {
+               // create the node ref, then our node representation
+               NodeRef ref = personService.getPerson(authority);
+               Node node = new Node(ref);
+               
+               // setup convience function for current user full name
+               setPersonName((String)node.getProperties().get(ContentModel.PROP_FIRSTNAME) + ' ' +
+                             (String)node.getProperties().get(ContentModel.PROP_LASTNAME));
+            }
+            else
+            {
+               setPersonName(authority);
+            }
+            
+            // setup roles for this Authority
+            List<PermissionWrapper> userPermissions = new ArrayList<PermissionWrapper>(4);
+            Set<AccessPermission> permissions = permissionService.getAllSetPermissions(getSpace().getNodeRef());
+            if (permissions != null)
+            {
+               for (AccessPermission permission : permissions)
+               {
+                  // we are only interested in Allow permissions
+                  if (permission.getAccessStatus() == AccessStatus.ALLOWED)
+                  {
+                     if (authority.equals(permission.getAuthority()))
+                     {
+                        // found a permission for this user authentiaction
+                        PermissionWrapper wrapper = new PermissionWrapper(
+                              permission.getPermission(),
+                              Application.getMessage(context, permission.getPermission()));
+                        userPermissions.add(wrapper);
+                     }
+                  }
+               }
+            }
+            // action context setup
+            this.personRoles = userPermissions;
+            setPersonAuthority(authority);
+         }
+         catch (Exception err)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext
+                  .getCurrentInstance(), Repository.ERROR_GENERIC), new Object[] { err.getMessage() }));
+         }
+      }
+      else
+      {
+         setPersonAuthority(null);
+      }
+   }
+   
+   
+   /**
+    * Inherit parent Space permissions value changed by the user
+    */
+   public void inheritPermissionsValueChanged(ValueChangeEvent event)
+   {
+      try
+      {
+         // change the value to the new selected value
+         boolean inheritPermissions = (Boolean)event.getNewValue();
+         this.permissionService.setInheritParentPermissions(getSpace().getNodeRef(), inheritPermissions);
+         
+         // inform the user that the change occured
+         FacesContext context = FacesContext.getCurrentInstance();
+         String msg;
+         if (inheritPermissions)
+         {
+            msg = Application.getMessage(context, MSG_SUCCESS_INHERIT);
+         }
+         else
+         {
+            msg = Application.getMessage(context, MSG_SUCCESS_INHERIT_NOT);
+         }
+         FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
+         context.addMessage(event.getComponent().getClientId(context), facesMsg);
+      }
+      catch (Throwable e)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+      }
+   }
+   
+   /**
+    * Action handler called when the Add Role button is pressed to process the current selection
+    */
+   public void addRole(ActionEvent event)
+   {
+      UISelectOne rolePicker = (UISelectOne)event.getComponent().findComponent("roles");
+      
+      String role = (String)rolePicker.getValue();
+      if (role != null)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         PermissionWrapper wrapper = new PermissionWrapper(role, Application.getMessage(context, role));
+         this.personRoles.add(wrapper);
+      }
+   }
+   
+   /**
+    * Action handler called when the Remove button is pressed to remove a role from current user
+    */
+   public void removeRole(ActionEvent event)
+   {
+      PermissionWrapper wrapper = (PermissionWrapper)this.personRolesDataModel.getRowData();
+      if (wrapper != null)
+      {
+         this.personRoles.remove(wrapper);
+      }
+   }
+   
+   /**
+    * Action handler called when the Finish button is clicked on the Edit User Roles page
+    */
+   public String finishOK()
+   {
+      String outcome = OUTCOME_FINISH;
+      
+      FacesContext context = FacesContext.getCurrentInstance();
+      
+      // persist new user permissions
+      if (this.personRoles != null && getPersonAuthority() != null)
+      {
+         UserTransaction tx = null;
+         try
+         {
+            tx = Repository.getUserTransaction(context);
+            tx.begin();
+            
+            // clear the currently set permissions for this user
+            // and add each of the new permissions in turn
+            NodeRef nodeRef = getSpace().getNodeRef();
+            this.permissionService.clearPermission(nodeRef, getPersonAuthority());
+            for (PermissionWrapper wrapper : personRoles)
+            {
+               this.permissionService.setPermission(
+                     nodeRef,
+                     getPersonAuthority(),
+                     wrapper.getPermission(),
+                     true);
+            }
+            
+            tx.commit();
+         }
+         catch (Exception err)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+                  context, Repository.ERROR_GENERIC), err.getMessage()), err );
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            
+            outcome = null;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Action handler called when the OK button is clicked on the Remove User page
+    */
+   public String removeOK()
+   {
+      UserTransaction tx = null;
+
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         // remove the invited User
+         if (getPersonAuthority() != null)
+         {
+            // clear permissions for the specified Authority
+            this.permissionService.clearPermission(getSpace().getNodeRef(), getPersonAuthority());
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext
+               .getCurrentInstance(), ERROR_DELETE), e.getMessage()), e);
+      }
+      
+      return OUTCOME_FINISH;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Wrapper class for list data model to display current roles for user
+    */
+   public static class PermissionWrapper
+   {
+      public PermissionWrapper(String permission, String label)
+      {
+         this.permission = permission;
+         this.label = label;
+      }
+      
+      public String getRole()
+      {
+         return this.label;
+      }
+      
+      public String getPermission()
+      {
+         return this.permission;
+      }
+      
+      private String label;
+      private String permission;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/users/UsersBean.java b/source/java/org/alfresco/web/bean/users/UsersBean.java
new file mode 100644
index 0000000000..80f1c52020
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/users/UsersBean.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.users;
+
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.LoginBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Kevin Roast
+ */
+public class UsersBean implements IContextListener
+{
+   private static Logger logger = Logger.getLogger(UsersBean.class);
+
+   public static final String ERROR_PASSWORD_MATCH = "error_password_match";
+   private static final String ERROR_DELETE = "error_delete_user";
+   
+   private static final String DEFAULT_OUTCOME = "manageUsers";
+
+   /** NodeService bean reference */
+   private NodeService nodeService;
+
+   /** SearchService bean reference */
+   private SearchService searchService;
+
+   /** AuthenticationService bean reference */
+   private AuthenticationService authenticationService;
+
+   /** Component reference for Users RichList control */
+   private UIRichList usersRichList;
+
+   /** action context */
+   private Node person = null;
+   
+   private String password = null;
+   private String confirm = null;
+
+   
+   // ------------------------------------------------------------------------------
+   // Construction
+
+   /**
+    * Default Constructor
+    */
+   public UsersBean()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).registerBean(this);
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters
+
+   /**
+    * @param nodeService        The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param searchService      the search service
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+
+   /**
+    * @param authenticationService  The AuthenticationService to set.
+    */
+   public void setAuthenticationService(AuthenticationService authenticationService)
+   {
+      this.authenticationService = authenticationService;
+   }
+
+   /**
+    * @return Returns the usersRichList.
+    */
+   public UIRichList getUsersRichList()
+   {
+      return this.usersRichList;
+   }
+
+   /**
+    * @param usersRichList  The usersRichList to set.
+    */
+   public void setUsersRichList(UIRichList usersRichList)
+   {
+      this.usersRichList = usersRichList;
+   }
+
+   /**
+    * @return the list of user Nodes to display
+    */
+   public List<Node> getUsers()
+   {
+      return Repository.getUsers(FacesContext.getCurrentInstance(), this.nodeService,
+            this.searchService);
+   }
+   
+   /**
+    * @return Returns the confirm password.
+    */
+   public String getConfirm()
+   {
+      return this.confirm;
+   }
+
+   /**
+    * @param confirm The confirm password to set.
+    */
+   public void setConfirm(String confirm)
+   {
+      this.confirm = confirm;
+   }
+
+   /**
+    * @return Returns the password.
+    */
+   public String getPassword()
+   {
+      return this.password;
+   }
+
+   /**
+    * @param password The password to set.
+    */
+   public void setPassword(String password)
+   {
+      this.password = password;
+   }
+
+   /**
+    * @return Returns the person context.
+    */
+   public Node getPerson()
+   {
+      return this.person;
+   }
+
+   /**
+    * @param person     The person context to set.
+    */
+   public void setPerson(Node person)
+   {
+      this.person = person;
+   }
+
+   /**
+    * Action event called by all actions that need to setup a Person context on
+    * the Users bean before an action page is called. The context will be a
+    * Person Node in setPerson() which can be retrieved on the action page from
+    * UsersBean.getPerson().
+    */
+   public void setupUserAction(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink) event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Setup for action, setting current Person to: " + id);
+
+         try
+         {
+            // create the node ref, then our node representation
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+
+            // remember the Person node
+            setPerson(node);
+
+            // clear the UI state in preparation for finishing the action
+            // and returning to the main page
+            contextUpdated();
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext
+                  .getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] { id }));
+         }
+      }
+      else
+      {
+         setPerson(null);
+      }
+   }
+
+   /**
+    * Action handler called when the OK button is clicked on the Delete User page
+    */
+   public String deleteOK()
+   {
+      UserTransaction tx = null;
+
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         // we only delete the user auth if Alfresco is managing the authentication 
+         Map session = context.getExternalContext().getSessionMap();
+         if (session.get(LoginBean.LOGIN_EXTERNAL_AUTH) == null)
+         {
+            // delete the User authentication
+            authenticationService.deleteAuthentication((String) getPerson().getProperties().get("userName"));
+         }
+         
+         // delete the associated Person
+         this.nodeService.deleteNode(getPerson().getNodeRef());
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext
+               .getCurrentInstance(), ERROR_DELETE), e.getMessage()), e);
+      }
+      
+      return DEFAULT_OUTCOME;
+   }
+   
+   /**
+    * Action handler called for OK button press on Change Password screen
+    */
+   public String changePasswordOK()
+   {
+      String outcome = DEFAULT_OUTCOME;
+      
+      if (this.password != null && this.confirm != null && this.password.equals(this.confirm))
+      {
+         try
+         {
+            String userName = (String)this.person.getProperties().get(ContentModel.PROP_USERNAME);
+            this.authenticationService.setAuthentication(userName, this.password.toCharArray());
+         }
+         catch (Exception e)
+         {
+            outcome = null;
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext
+                  .getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+         }
+      }
+      else
+      {
+         outcome = null;
+         Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(),
+               ERROR_PASSWORD_MATCH));
+      }
+      
+      return outcome;
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation
+
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      if (this.usersRichList != null)
+      {
+         this.usersRichList.setValue(null);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java b/source/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java
new file mode 100644
index 0000000000..d80b696486
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/AbstractWizardBean.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.BrowseBean;
+import org.alfresco.web.bean.NavigationBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Abstract bean used as the base class for all wizard backing beans.
+ * 
+ * @author gavinc
+ */
+public abstract class AbstractWizardBean
+{
+   private static Log logger = LogFactory.getLog(AbstractWizardBean.class);
+   
+   /** I18N messages */
+   private static final String MSG_NOT_SET = "value_not_set";
+   
+   protected static final String FINISH_OUTCOME = "finish";
+   protected static final String CANCEL_OUTCOME = "cancel";
+   protected static final String DEFAULT_INSTRUCTION_ID = "default_instruction";
+   protected static final String SUMMARY_TITLE_ID = "summary";
+   protected static final String SUMMARY_DESCRIPTION_ID = "summary_desc";
+   
+   // common wizard properties
+   protected int currentStep = 1;
+   protected boolean editMode = false;
+   protected NodeService nodeService;
+   protected FileFolderService fileFolderService;
+   protected SearchService searchService;
+   protected NavigationBean navigator;
+   protected BrowseBean browseBean;
+   
+   /**
+    * @return Returns the wizard description
+    */
+   public abstract String getWizardDescription();
+
+   /**
+    * @return Returns the wizard title
+    */
+   public abstract String getWizardTitle();
+   
+   /**
+    * @return Returns the title for the current step
+    */
+   public abstract String getStepTitle();
+
+   /**
+    * @return Returns the description for the current step
+    */
+   public abstract String getStepDescription();
+   
+   /**
+    * @return Returns the instructional text for the current step
+    */
+   public abstract String getStepInstructions();
+
+   /**
+    * Determines the outcome string for the given step number
+    * 
+    * @param step The step number to get the outcome for
+    * @return The outcome
+    */
+   protected abstract String determineOutcomeForStep(int step);
+   
+   /**
+    * Handles the finish button being pressed
+    * 
+    * @return The finish outcome
+    */
+   public abstract String finish();
+   
+   /**
+    * Action listener called when the wizard is being launched allowing
+    * state to be setup
+    */
+   public void startWizard(ActionEvent event)
+   {
+      // refresh the UI, calling this method now is fine as it basically makes sure certain
+      // beans clear the state - so when we finish the wizard other beans will have been reset
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      
+      // make sure the wizard is not in edit mode
+      this.editMode = false;
+      
+      // initialise the wizard in case we are launching 
+      // after it was navigated away from
+      init();
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Started wizard : " + getWizardTitle());
+   }
+   
+   /**
+    * Action listener called when the wizard is being launched for 
+    * editing an existing node.
+    */
+   public void startWizardForEdit(ActionEvent event)
+   {
+      // refresh the UI, calling this method now is fine as it basically makes sure certain
+      // beans clear the state - so when we finish the wizard other beans will have been reset
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+      
+      // set the wizard in edit mode
+      this.editMode = true;
+      
+      // populate the wizard's default values with the current value
+      // from the node being edited
+      init();
+      populate();
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Started wizard : " + getWizardTitle() + " for editing");
+   }
+ 
+   /**
+    * Deals with the next button being pressed
+    * 
+    * @return
+    */
+   public String next()
+   {  
+      this.currentStep++;
+      
+      // determine which page to go to next
+      String outcome = determineOutcomeForStep(this.currentStep);
+            
+      if (logger.isDebugEnabled())
+      {
+         logger.debug("current step is now: " + this.currentStep);
+         logger.debug("Next outcome: " + outcome);
+      }
+      
+      // return the outcome for navigation
+      return outcome;
+   }
+   
+   /**
+    * Deals with the back button being pressed
+    * 
+    * @return
+    */
+   public String back()
+   {      
+      this.currentStep--;
+      
+      // determine which page to go to next
+      String outcome = determineOutcomeForStep(this.currentStep);
+      
+      if (logger.isDebugEnabled())
+      {
+         logger.debug("current step is now: " + this.currentStep);
+         logger.debug("Back outcome: " + outcome);
+      }
+      
+      // return the outcome for navigation
+      return outcome;
+   }
+   
+   /**
+    * Handles the cancelling of the wizard
+    * 
+    * @return The cancel outcome
+    */
+   public String cancel()
+   {
+      // reset the state
+      init();
+      
+      return CANCEL_OUTCOME;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      this.currentStep = 1;
+   }
+   
+   /**
+    * Populates the wizard's values with the current values
+    * of the node about to be edited
+    */
+   public void populate()
+   {
+      // subclasses will override this method to setup accordingly
+   }
+
+   /**
+    * @return Returns the nodeService.
+    */
+   public NodeService getNodeService()
+   {
+      return this.nodeService;
+   }
+
+   /**
+    * @param nodeService The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param fileFolderService used to manipulate folder/folder model nodes
+    */
+   public void setFileFolderService(FileFolderService fileFolderService)
+   {
+      this.fileFolderService = fileFolderService;
+   }
+
+   /**
+    * @param searchService the service used to find nodes
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+
+   /**
+    * @return Returns the navigation bean instance.
+    */
+   public NavigationBean getNavigator()
+   {
+      return navigator;
+   }
+   
+   /**
+    * @param navigator The NavigationBean to set.
+    */
+   public void setNavigator(NavigationBean navigator)
+   {
+      this.navigator = navigator;
+   }
+
+   /**
+    * @return The BrowseBean
+    */
+   public BrowseBean getBrowseBean()
+   {
+      return this.browseBean;
+   }
+
+   /**
+    * @param browseBean The BrowseBean to set.
+    */
+   public void setBrowseBean(BrowseBean browseBean)
+   {
+      this.browseBean = browseBean;
+   }
+   
+   /**
+    * Build summary table from the specified list of Labels and Values
+    * 
+    * @param labels     Array of labels to display
+    * @param values     Array of values to display
+    * 
+    * @return summary table HTML
+    */
+   protected String buildSummary(String[] labels, String[] values)
+   {
+      if (labels == null || values == null || labels.length != values.length)
+      {
+         throw new IllegalArgumentException("Labels and Values passed to summary must be valid and of equal length.");
+      }
+      
+      String msg = Application.getMessage(FacesContext.getCurrentInstance(), MSG_NOT_SET);
+      String notSetMsg = "&lt;" + msg + "&gt;";
+      
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<table cellspacing='4' cellpadding='2' border='0' class='summary'>");
+      for (int i=0; i<labels.length; i++)
+      {
+         String value = values[i];
+         buf.append("<tr><td valign='top'><b>");
+         buf.append(labels[i]);
+         buf.append(":</b></td><td>");
+         buf.append(value != null ? value : notSetMsg);
+         buf.append("</td></tr>");
+      }
+      buf.append("</table>");
+      
+      return buf.toString();
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java b/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java
new file mode 100644
index 0000000000..e2a514f1f6
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.FileUploadBean;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Handler class used by the Add Content Wizard 
+ * 
+ * @author gavinc
+ */
+public class AddContentWizard extends BaseContentWizard
+{
+   private static Log logger = LogFactory.getLog(AddContentWizard.class);
+
+   // TODO: retrieve these from the config service
+   private static final String WIZARD_TITLE_ID = "add_content_title";
+   private static final String WIZARD_DESC_ID = "add_content_desc";
+   private static final String STEP1_TITLE_ID = "add_conent_step1_title";
+   private static final String STEP1_DESCRIPTION_ID = "add_conent_step1_desc";
+   private static final String STEP2_TITLE_ID = "add_conent_step2_title";
+   private static final String STEP2_DESCRIPTION_ID = "add_conent_step2_desc";
+   
+   // add content wizard specific properties
+   private File file;
+   
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#next()
+    */
+   public String next()
+   {
+      String outcome = super.next();
+      
+      // if the outcome is "properties" we pre-set the content type and other
+      // fields accordingly
+      if (outcome.equals("properties"))
+      {
+         this.contentType = Repository.getMimeTypeForFileName(
+               FacesContext.getCurrentInstance(), this.fileName);
+         
+         // set default for in-line editing flag
+         this.inlineEdit = (this.contentType.equals(MimetypeMap.MIMETYPE_HTML));
+         
+         // Try and extract metadata from the file
+         ContentReader cr = new FileContentReader(this.file);
+         cr.setMimetype(this.contentType);
+         // create properties for content type
+         Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>(5, 1.0f);
+         
+         if (Repository.extractMetadata(FacesContext.getCurrentInstance(), cr, contentProps))
+         {
+            this.author = (String)(contentProps.get(ContentModel.PROP_CREATOR));
+            this.title = (String)(contentProps.get(ContentModel.PROP_TITLE));
+            this.description = (String)(contentProps.get(ContentModel.PROP_DESCRIPTION));
+         }
+         if (this.title == null)
+         {
+            this.title = this.fileName;
+         }
+      }
+      
+      return outcome;
+   }
+
+   /**
+    * Deals with the finish button being pressed
+    * 
+    * @return outcome
+    */
+   public String finish()
+   {
+      String outcome = saveContent(this.file, null);
+      
+      // now we know the new details are in the repository, reset the
+      // client side node representation so the new details are retrieved
+      if (this.editMode)
+      {
+         this.browseBean.getDocument().reset();
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_DESCRIPTION_ID);
+            break;
+         }
+         case 2:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_DESCRIPTION_ID);
+            break;
+         }
+         case 3:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+      
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      clearUpload();
+      
+      this.file = null;
+   }
+
+   /**
+    * @return Returns the message to display when a file has been uploaded
+    */
+   public String getFileUploadSuccessMsg()
+   {
+      String msg = Application.getMessage(FacesContext.getCurrentInstance(), "file_upload_success");
+      return MessageFormat.format(msg, new Object[] {getFileName()});
+   }
+   
+   /**
+    * @return Returns the name of the file
+    */
+   public String getFileName()
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)ctx.getExternalContext().getSessionMap().
+         get(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+      if (fileBean != null)
+      {
+         this.file = fileBean.getFile();
+         this.fileName = fileBean.getFileName();
+      }
+      
+      return this.fileName;
+   }
+
+   /**
+    * @param fileName The name of the file
+    */
+   public void setFileName(String fileName)
+   {
+      this.fileName = fileName;
+      
+      // we also need to keep the file upload bean in sync
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)ctx.getExternalContext().getSessionMap().
+         get(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+      if (fileBean != null)
+      {
+         fileBean.setFileName(this.fileName);
+      }
+   }
+   
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      return buildSummary(
+            new String[] {bundle.getString("file_name"), bundle.getString("type"), 
+                          bundle.getString("content_type"), bundle.getString("title"), 
+                          bundle.getString("description"), bundle.getString("author"), 
+                          bundle.getString("inline_editable")},
+            new String[] {this.fileName, getSummaryObjectType(), getSummaryContentType(), this.title, 
+                          this.description, this.author, Boolean.toString(this.inlineEdit)});
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "upload";
+            break;
+         }
+         case 2:
+         {
+            outcome = "properties";
+            break;
+         }
+         case 3:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Deletes the uploaded file and removes the FileUploadBean from the session
+    */
+   private void clearUpload()
+   {
+      // delete the temporary file we uploaded earlier
+      if (this.file != null)
+      {
+         this.file.delete();
+      }
+      
+      // remove the file upload bean from the session
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      ctx.getExternalContext().getSessionMap().remove(FileUploadBean.FILE_UPLOAD_BEAN_NAME);
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java
new file mode 100644
index 0000000000..4a87c98508
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java
@@ -0,0 +1,921 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.AddFeaturesActionExecuter;
+import org.alfresco.repo.action.executer.CheckInActionExecuter;
+import org.alfresco.repo.action.executer.CheckOutActionExecuter;
+import org.alfresco.repo.action.executer.CopyActionExecuter;
+import org.alfresco.repo.action.executer.ImageTransformActionExecuter;
+import org.alfresco.repo.action.executer.ImporterActionExecuter;
+import org.alfresco.repo.action.executer.LinkCategoryActionExecuter;
+import org.alfresco.repo.action.executer.MailActionExecuter;
+import org.alfresco.repo.action.executer.MoveActionExecuter;
+import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter;
+import org.alfresco.repo.action.executer.SpecialiseTypeActionExecuter;
+import org.alfresco.repo.action.executer.TransformActionExecuter;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.action.ActionDefinition;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Base handler class containing common code used by the New Space Wizard and New Action Wizard
+ * 
+ * @author gavinc kevinr
+ */
+public abstract class BaseActionWizard extends AbstractWizardBean
+{
+   // parameter names for actions
+   public static final String PROP_CATEGORY = "category";
+   public static final String PROP_ASPECT = "aspect";
+   public static final String PROP_DESTINATION = "destinationLocation";
+   public static final String PROP_APPROVE_STEP_NAME = "approveStepName";
+   public static final String PROP_APPROVE_ACTION = "approveAction";
+   public static final String PROP_APPROVE_FOLDER = "approveFolder";
+   public static final String PROP_REJECT_STEP_PRESENT = "rejectStepPresent";
+   public static final String PROP_REJECT_STEP_NAME = "rejectStepName";
+   public static final String PROP_REJECT_ACTION = "rejectAction";
+   public static final String PROP_REJECT_FOLDER = "rejectFolder";
+   public static final String PROP_CHECKIN_DESC = "checkinDescription";
+   public static final String PROP_CHECKIN_MINOR = "checkinMinorChange";
+   public static final String PROP_TRANSFORMER = "transformer";
+   public static final String PROP_IMAGE_TRANSFORMER = "imageTransformer";
+   public static final String PROP_TRANSFORM_OPTIONS = "transformOptions";
+   public static final String PROP_ENCODING = "encoding";
+   public static final String PROP_MESSAGE = "message";
+   public static final String PROP_SUBJECT = "subject";
+   public static final String PROP_TO = "to";
+   public static final String PROP_OBJECT_TYPE = "objecttype";
+   
+   private static final Log logger = LogFactory.getLog(BaseActionWizard.class);
+   private static final String IMPORT_ENCODING = "UTF-8";
+   
+   // new rule/action wizard specific properties
+   protected boolean multiActionMode = false;
+   protected String action;
+   protected ActionService actionService;
+   protected DictionaryService dictionaryService;
+   protected MimetypeService mimetypeService;
+   protected List<SelectItem> actions;
+   protected List<SelectItem> transformers;
+   protected List<SelectItem> imageTransformers;
+   protected List<SelectItem> aspects;
+   protected List<SelectItem> users;
+   protected List<SelectItem> encodings;
+   protected Map<String, String> actionDescriptions;
+   protected Map<String, Serializable> currentActionProperties;
+   protected List<SelectItem> objectTypes;
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.action = "add-features";
+      this.users = null;
+      this.actions = null;
+      this.actionDescriptions = null;
+      
+      this.currentActionProperties = new HashMap<String, Serializable>(3);
+      
+      // default the approve and reject actions
+      this.currentActionProperties.put(PROP_APPROVE_ACTION, "move");
+      this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "yes");
+      this.currentActionProperties.put(PROP_REJECT_ACTION, "move");
+      
+      // default the checkin minor change
+      this.currentActionProperties.put(PROP_CHECKIN_MINOR, new Boolean(true));
+   }
+   
+   /**
+    * Build the param map for the current Action instance
+    * 
+    * @return param map
+    */
+   protected Map<String, Serializable> buildActionParams()
+   {
+      // set up parameters maps for the action
+      Map<String, Serializable> actionParams = new HashMap<String, Serializable>();
+      
+      if (this.action.equals(AddFeaturesActionExecuter.NAME))
+      {
+         QName aspect = Repository.resolveToQName((String)this.currentActionProperties.get(PROP_ASPECT));
+         actionParams.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, aspect);
+      }
+      else if (this.action.equals(CopyActionExecuter.NAME))
+      {
+         // add the destination space id to the action properties
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(CopyActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+         
+         // add the type and name of the association to create when the copy
+         // is performed
+         actionParams.put(CopyActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
+               ContentModel.ASSOC_CONTAINS);
+         actionParams.put(CopyActionExecuter.PARAM_ASSOC_QNAME, 
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "copy"));
+      }
+      else if (this.action.equals(MoveActionExecuter.NAME))
+      {
+         // add the destination space id to the action properties
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(MoveActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+         
+         // add the type and name of the association to create when the move
+         // is performed
+         actionParams.put(MoveActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
+               ContentModel.ASSOC_CONTAINS);
+         actionParams.put(MoveActionExecuter.PARAM_ASSOC_QNAME, 
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "move"));
+      }
+      else if (this.action.equals(SimpleWorkflowActionExecuter.NAME))
+      {
+         // add the approve step name
+         actionParams.put(SimpleWorkflowActionExecuter.PARAM_APPROVE_STEP,
+               (String)this.currentActionProperties.get(PROP_APPROVE_STEP_NAME));
+         
+         // add whether the approve step will copy or move the content
+         boolean approveMove = true;
+         String approveAction = (String)this.currentActionProperties.get(PROP_APPROVE_ACTION);
+         if (approveAction != null && approveAction.equals("copy"))
+         {
+            approveMove = false;
+         }
+         
+         actionParams.put(SimpleWorkflowActionExecuter.PARAM_APPROVE_MOVE, Boolean.valueOf(approveMove));
+         
+         // add the destination folder of the content
+         NodeRef approveDestNodeRef = null;
+         Object approveDestNode = this.currentActionProperties.get(PROP_APPROVE_FOLDER);
+         if (approveDestNode instanceof NodeRef)
+         {
+            approveDestNodeRef = (NodeRef)approveDestNode;
+         }
+         else if (approveDestNode instanceof String)
+         {
+            approveDestNodeRef = new NodeRef((String)approveDestNode);
+         }
+         actionParams.put(SimpleWorkflowActionExecuter.PARAM_APPROVE_FOLDER, approveDestNodeRef);
+         
+         // determine whether we have a reject step or not
+         boolean requireReject = true;
+         String rejectStepPresent = (String)this.currentActionProperties.get(PROP_REJECT_STEP_PRESENT);
+         if (rejectStepPresent != null && rejectStepPresent.equals("no"))
+         {
+            requireReject = false;
+         }
+
+         if (requireReject)
+         {
+            // add the reject step name
+            actionParams.put(SimpleWorkflowActionExecuter.PARAM_REJECT_STEP,
+                  (String)this.currentActionProperties.get(PROP_REJECT_STEP_NAME));
+         
+            // add whether the reject step will copy or move the content
+            boolean rejectMove = true;
+            String rejectAction = (String)this.currentActionProperties.get(PROP_REJECT_ACTION);
+            if (rejectAction != null && rejectAction.equals("copy"))
+            {
+               rejectMove = false;
+            }
+            
+            actionParams.put(SimpleWorkflowActionExecuter.PARAM_REJECT_MOVE, Boolean.valueOf(rejectMove));
+            
+            // add the destination folder of the content
+            NodeRef rejectDestNodeRef = null;
+            Object rejectDestNode = this.currentActionProperties.get(PROP_REJECT_FOLDER);
+            if (rejectDestNode instanceof NodeRef)
+            {
+               rejectDestNodeRef = (NodeRef)rejectDestNode;
+            }
+            else if (rejectDestNode instanceof String)
+            {
+               rejectDestNodeRef = new NodeRef((String)rejectDestNode);
+            }
+            actionParams.put(SimpleWorkflowActionExecuter.PARAM_REJECT_FOLDER, rejectDestNodeRef);
+         }
+      }
+      else if (this.action.equals(LinkCategoryActionExecuter.NAME))
+      {
+         // add the classifiable aspect
+         actionParams.put(LinkCategoryActionExecuter.PARAM_CATEGORY_ASPECT,
+               ContentModel.ASPECT_GEN_CLASSIFIABLE);
+         
+         // put the selected category in the action params
+         NodeRef catNodeRef = (NodeRef)this.currentActionProperties.get(PROP_CATEGORY);
+         actionParams.put(LinkCategoryActionExecuter.PARAM_CATEGORY_VALUE, 
+               catNodeRef);
+      }
+      else if (this.action.equals(CheckOutActionExecuter.NAME))
+      {
+         // specify the location the checked out working copy should go
+         // add the destination space id to the action properties
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(CheckOutActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+         
+         // add the type and name of the association to create when the 
+         // check out is performed
+         actionParams.put(CheckOutActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
+               ContentModel.ASSOC_CONTAINS);
+         actionParams.put(CheckOutActionExecuter.PARAM_ASSOC_QNAME, 
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "checkout"));
+      }
+      else if (this.action.equals(CheckInActionExecuter.NAME))
+      {
+         // add the description for the checkin to the action params
+         actionParams.put(CheckInActionExecuter.PARAM_DESCRIPTION, 
+               this.currentActionProperties.get(PROP_CHECKIN_DESC));
+         
+         // add the minor change flag
+         actionParams.put(CheckInActionExecuter.PARAM_MINOR_CHANGE,
+               this.currentActionProperties.get(PROP_CHECKIN_MINOR));
+      }
+      else if (this.action.equals(TransformActionExecuter.NAME))
+      {
+         // add the transformer to use
+         actionParams.put(TransformActionExecuter.PARAM_MIME_TYPE,
+               this.currentActionProperties.get(PROP_TRANSFORMER));
+         
+         // add the destination space id to the action properties
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(TransformActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+         
+         // add the type and name of the association to create when the copy
+         // is performed
+         actionParams.put(TransformActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
+               ContentModel.ASSOC_CONTAINS);
+         actionParams.put(TransformActionExecuter.PARAM_ASSOC_QNAME, 
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "copy"));
+      }
+      else if (this.action.equals(ImageTransformActionExecuter.NAME))
+      {
+         // add the transformer to use
+         actionParams.put(ImageTransformActionExecuter.PARAM_MIME_TYPE,
+               this.currentActionProperties.get(PROP_IMAGE_TRANSFORMER));
+         
+         // add the options
+         actionParams.put(ImageTransformActionExecuter.PARAM_CONVERT_COMMAND, 
+               this.currentActionProperties.get(PROP_TRANSFORM_OPTIONS));
+         
+         // add the destination space id to the action properties
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(TransformActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+         
+         // add the type and name of the association to create when the copy
+         // is performed
+         actionParams.put(TransformActionExecuter.PARAM_ASSOC_TYPE_QNAME, 
+               ContentModel.ASSOC_CONTAINS);
+         actionParams.put(TransformActionExecuter.PARAM_ASSOC_QNAME, 
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "copy"));
+      }
+      else if (this.action.equals(MailActionExecuter.NAME))
+      {
+         // add the actual email text to send
+         actionParams.put(MailActionExecuter.PARAM_TEXT, 
+               this.currentActionProperties.get(PROP_MESSAGE));
+            
+         // add the person it's going to
+         actionParams.put(MailActionExecuter.PARAM_TO, 
+               this.currentActionProperties.get(PROP_TO));
+         
+         // add the subject for the email
+         actionParams.put(MailActionExecuter.PARAM_SUBJECT,
+               this.currentActionProperties.get(PROP_SUBJECT));
+      }
+      else if (this.action.equals(ImporterActionExecuter.NAME))
+      {
+         // add the encoding
+         actionParams.put(ImporterActionExecuter.PARAM_ENCODING, IMPORT_ENCODING);
+         
+         // add the destination for the import
+         NodeRef destNodeRef = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+         actionParams.put(ImporterActionExecuter.PARAM_DESTINATION_FOLDER, destNodeRef);
+      }
+      else if (this.action.equals(SpecialiseTypeActionExecuter.NAME) == true)
+      {
+          // add the specialisation type
+          String objectType = (String)this.currentActionProperties.get(PROP_OBJECT_TYPE);
+          actionParams.put(SpecialiseTypeActionExecuter.PARAM_TYPE_NAME, QName.createQName(objectType));
+      }
+      
+      return actionParams;
+   }
+   
+   /**
+    * Populate the actionProperties member variable with correct props for the current action
+    * using the supplied property map.
+    * 
+    * @param actionProps Map to retrieve props appropriate to the current action from
+    */
+   protected void populateActionFromProperties(Map<String, Serializable> actionProps)
+   {
+      if (this.action.equals(AddFeaturesActionExecuter.NAME))
+      {
+         QName aspect = (QName)actionProps.get(AddFeaturesActionExecuter.PARAM_ASPECT_NAME);
+         this.currentActionProperties.put(PROP_ASPECT, aspect.toString());
+      }
+      else if (this.action.equals(CopyActionExecuter.NAME))
+      {
+         NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(MoveActionExecuter.NAME))
+      {
+         NodeRef destNodeRef = (NodeRef)actionProps.get(MoveActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(SimpleWorkflowActionExecuter.NAME))
+      {
+         String approveStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_STEP);
+         Boolean approveMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_APPROVE_MOVE);
+         NodeRef approveFolderNode = (NodeRef)actionProps.get(
+               SimpleWorkflowActionExecuter.PARAM_APPROVE_FOLDER);
+         
+         String rejectStep = (String)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_STEP);
+         Boolean rejectMove = (Boolean)actionProps.get(SimpleWorkflowActionExecuter.PARAM_REJECT_MOVE);
+         NodeRef rejectFolderNode = (NodeRef)actionProps.get(
+               SimpleWorkflowActionExecuter.PARAM_REJECT_FOLDER);
+         
+         this.currentActionProperties.put(PROP_APPROVE_STEP_NAME, approveStep);
+         this.currentActionProperties.put(PROP_APPROVE_ACTION, approveMove ? "move" : "copy");
+         this.currentActionProperties.put(PROP_APPROVE_FOLDER, approveFolderNode);
+         
+         if (rejectStep == null && rejectMove == null && rejectFolderNode == null)
+         {
+            this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "no");
+         }
+         else
+         {
+            this.currentActionProperties.put(PROP_REJECT_STEP_PRESENT, "yes");
+            this.currentActionProperties.put(PROP_REJECT_STEP_NAME, rejectStep);
+            this.currentActionProperties.put(PROP_REJECT_ACTION, rejectMove ? "move" : "copy");
+            this.currentActionProperties.put(PROP_REJECT_FOLDER, rejectFolderNode);
+         }
+      }
+      else if (this.action.equals(LinkCategoryActionExecuter.NAME))
+      {
+         NodeRef catNodeRef = (NodeRef)actionProps.get(LinkCategoryActionExecuter.PARAM_CATEGORY_VALUE);
+         this.currentActionProperties.put(PROP_CATEGORY, catNodeRef);
+      }
+      else if (this.action.equals(CheckOutActionExecuter.NAME))
+      {
+         NodeRef destNodeRef = (NodeRef)actionProps.get(CheckOutActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(CheckInActionExecuter.NAME))
+      {
+         String checkDesc = (String)actionProps.get(CheckInActionExecuter.PARAM_DESCRIPTION);
+         this.currentActionProperties.put(PROP_CHECKIN_DESC, checkDesc);
+         
+         Boolean minorChange = (Boolean)actionProps.get(CheckInActionExecuter.PARAM_MINOR_CHANGE);
+         this.currentActionProperties.put(PROP_CHECKIN_MINOR, minorChange);
+      }
+      else if (this.action.equals(TransformActionExecuter.NAME))
+      {
+         String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE);
+         this.currentActionProperties.put(PROP_TRANSFORMER, transformer);
+         
+         NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(ImageTransformActionExecuter.NAME))
+      {
+         String transformer = (String)actionProps.get(TransformActionExecuter.PARAM_MIME_TYPE);
+         this.currentActionProperties.put(PROP_IMAGE_TRANSFORMER, transformer);
+         
+         String options = (String)actionProps.get(ImageTransformActionExecuter.PARAM_CONVERT_COMMAND);
+         this.currentActionProperties.put(PROP_TRANSFORM_OPTIONS, options != null ? options : "");
+         
+         NodeRef destNodeRef = (NodeRef)actionProps.get(CopyActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(MailActionExecuter.NAME))
+      {
+         String subject = (String)actionProps.get(MailActionExecuter.PARAM_SUBJECT);
+         this.currentActionProperties.put(PROP_SUBJECT, subject);
+         
+         String message = (String)actionProps.get(MailActionExecuter.PARAM_TEXT);
+         this.currentActionProperties.put(PROP_MESSAGE, message);
+         
+         String to = (String)actionProps.get(MailActionExecuter.PARAM_TO);
+         this.currentActionProperties.put(PROP_TO, to);
+      }
+      else if (this.action.equals(ImporterActionExecuter.NAME))
+      {
+         NodeRef destNodeRef = (NodeRef)actionProps.get(ImporterActionExecuter.PARAM_DESTINATION_FOLDER);
+         this.currentActionProperties.put(PROP_DESTINATION, destNodeRef);
+      }
+      else if (this.action.equals(SpecialiseTypeActionExecuter.NAME) == true)
+      {
+          QName specialiseType = (QName)actionProps.get(SpecialiseTypeActionExecuter.PARAM_TYPE_NAME);
+          this.currentActionProperties.put(PROP_OBJECT_TYPE, specialiseType.toString());
+      }
+   }
+
+   /**
+    * @return Returns the selected action
+    */
+   public String getAction()
+   {
+      return this.action;
+   }
+
+   /**
+    * @param action Sets the selected action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Sets the action service
+    * 
+    * @param actionRegistration  the action service
+    */
+   public void setActionService(ActionService actionService)
+   {
+	  this.actionService = actionService;
+   }
+   
+   /**
+    * Sets the dictionary service
+    * 
+    * @param dictionaryService  the dictionary service
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+   
+   /**
+    * Sets the mimetype service
+    * 
+    * @param mimetypeService  The mimetype service
+    */
+   public void setMimetypeService(MimetypeService mimetypeService)
+   {
+      this.mimetypeService = mimetypeService;
+   }
+
+   /**
+    * @return Returns the list of selectable actions
+    */
+   public List<SelectItem> getActions()
+   {
+      if (this.actions == null)
+      {
+         List<ActionDefinition> ruleActions = this.actionService.getActionDefinitions();
+         this.actions = new ArrayList<SelectItem>();
+         for (ActionDefinition ruleActionDef : ruleActions)
+         {
+            this.actions.add(new SelectItem(ruleActionDef.getName(), ruleActionDef.getTitle()));
+         }
+         
+         // make sure the list is sorted by the label
+         QuickSort sorter = new QuickSort(this.actions, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      return this.actions;
+   }
+   
+   /**
+    * @return Returns a map of all the action descriptions 
+    */
+   public Map<String, String> getActionDescriptions()
+   {
+      if (this.actionDescriptions == null)
+      {
+         List<ActionDefinition> ruleActions = this.actionService.getActionDefinitions();
+         this.actionDescriptions = new HashMap<String, String>();
+         for (ActionDefinition ruleActionDef : ruleActions)
+         {
+            this.actionDescriptions.put(ruleActionDef.getName(), ruleActionDef.getDescription());
+         }
+      }
+      
+      return this.actionDescriptions;
+   }
+
+   /**
+    * @return Gets the action settings
+    */
+   public Map<String, Serializable> getActionProperties()
+   {
+      return this.currentActionProperties;
+   }
+   
+   /**
+    * Returns a list of encodings the import and export actions can use
+    * 
+    * @return List of SelectItem objects representing the available encodings
+    */
+   public List<SelectItem> getEncodings()
+   {
+      if (this.encodings == null)
+      {
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Action Wizards");
+         if (wizardCfg != null)
+         {
+            ConfigElement encodingsCfg = wizardCfg.getConfigElement("encodings");
+            if (encodingsCfg != null)
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               this.encodings = new ArrayList<SelectItem>();
+               for (ConfigElement child : encodingsCfg.getChildren())
+               {
+                  String id = child.getAttribute("name");
+                  
+                  // look for a client localized string
+                  String label = null;
+                  String msgId = child.getAttribute("displayLabelId");
+                  if (msgId != null)
+                  {
+                     label = Application.getMessage(context, msgId);
+                  }
+                  
+                  // if there wasn't an externalized string look for one in the config
+                  if (label == null)
+                  {
+                     label = child.getAttribute("displayLabel");
+                  }
+                  
+                  this.encodings.add(new SelectItem(id, label));
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.encodings, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find encodings configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find Action Wizards configuration section");
+         }
+      }
+      
+      return this.encodings;
+   }
+   
+   /**
+    * Returns the transformers that are available
+    * 
+    * @return List of SelectItem objects representing the available transformers
+    */
+   public List<SelectItem> getTransformers()
+   {
+      if (this.transformers == null)
+      {
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Action Wizards");
+         if (wizardCfg != null)
+         {
+            ConfigElement transformersCfg = wizardCfg.getConfigElement("transformers");
+            if (transformersCfg != null)
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               Map<String, String> mimeTypes = this.mimetypeService.getDisplaysByMimetype();
+               this.transformers = new ArrayList<SelectItem>();
+               for (ConfigElement child : transformersCfg.getChildren())
+               {
+                  String id = child.getAttribute("name");
+                  
+                  // look for a client localized string
+                  String label = null;
+                  String msgId = child.getAttribute("displayLabelId");
+                  if (msgId != null)
+                  {
+                     label = Application.getMessage(context, msgId);
+                  }
+                  
+                  // if there wasn't an externalized string look for one in the config
+                  if (label == null)
+                  {
+                     label = child.getAttribute("displayLabel");
+                  }
+
+                  // if there wasn't a client based label get it from the mime type service
+                  if (label == null)
+                  {
+                     label = mimeTypes.get(id);
+                  }
+                  
+                  this.transformers.add(new SelectItem(id, label));
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.transformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find transformers configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find Action Wizards configuration section");
+         }
+      }
+      
+      return this.transformers;
+   }
+   
+   /**
+    * Returns the image transformers that are available
+    * 
+    * @return List of SelectItem objects representing the available image transformers
+    */
+   public List<SelectItem> getImageTransformers()
+   {
+      if (this.imageTransformers == null)
+      {
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Action Wizards");
+         if (wizardCfg != null)
+         {
+            ConfigElement transformersCfg = wizardCfg.getConfigElement("image-transformers");
+            if (transformersCfg != null)
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               Map<String, String> mimeTypes = this.mimetypeService.getDisplaysByMimetype();
+               this.imageTransformers = new ArrayList<SelectItem>();
+               for (ConfigElement child : transformersCfg.getChildren())
+               {
+                  String id = child.getAttribute("name");
+                  
+                  // look for a client localized string
+                  String label = null;
+                  String msgId = child.getAttribute("displayLabelId");
+                  if (msgId != null)
+                  {
+                     label = Application.getMessage(context, msgId);
+                  }
+                  
+                  // if there wasn't an externalized string look for one in the config
+                  if (label == null)
+                  {
+                     label = child.getAttribute("displayLabel");
+                  }
+
+                  // if there wasn't a client based label get it from the mime type service
+                  if (label == null)
+                  {
+                     label = mimeTypes.get(id);
+                  }
+
+                  this.imageTransformers.add(new SelectItem(id, label));
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.imageTransformers, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find image-transformers configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find Action Wizards configuration section");
+         }
+      }
+      
+      return this.imageTransformers;
+   }
+   
+   /**
+    * Returns the aspects that are available
+    * 
+    * @return List of SelectItem objects representing the available aspects
+    */
+   public List<SelectItem> getAspects()
+   {
+      if (this.aspects == null)
+      {
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Action Wizards");
+         if (wizardCfg != null)
+         {
+            ConfigElement aspectsCfg = wizardCfg.getConfigElement("aspects");
+            if (aspectsCfg != null)
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               this.aspects = new ArrayList<SelectItem>();
+               for (ConfigElement child : aspectsCfg.getChildren())
+               {
+                  QName idQName = Repository.resolveToQName(child.getAttribute("name"));
+
+                  // look for a client localized string
+                  String label = null;
+                  String msgId = child.getAttribute("displayLabelId");
+                  if (msgId != null)
+                  {
+                     label = Application.getMessage(context, msgId);
+                  }
+                  
+                  // if there wasn't an externalized string look for one in the config
+                  if (label == null)
+                  {
+                     label = child.getAttribute("displayLabel");
+                  }
+
+                  // if there wasn't a client based label try and get it from the dictionary
+                  if (label == null)
+                  {
+                     AspectDefinition aspectDef = this.dictionaryService.getAspect(idQName);
+                     if (aspectDef != null)
+                     {
+                        label = aspectDef.getTitle();
+                     }
+                     else
+                     {
+                        label = idQName.getLocalName();
+                     }
+                  }
+                  
+                  this.aspects.add(new SelectItem(idQName.toString(), label));
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.aspects, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find aspects configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find Action Wizards configuration section");
+         }
+      }
+      
+      return this.aspects;
+   }
+   
+   /**
+    * @return Returns a list of object types to allow the user to select from
+    */
+   public List<SelectItem> getObjectTypes()
+   {
+      if (this.objectTypes == null)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         
+         // add the well known object type to start with
+         this.objectTypes = new ArrayList<SelectItem>(5);
+         this.objectTypes.add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), 
+               Application.getMessage(context, "content")));
+         
+         // add any configured content sub-types to the list
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Custom Content Types");
+         if (wizardCfg != null)
+         {
+            ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
+            if (typesCfg != null)
+            {               
+               for (ConfigElement child : typesCfg.getChildren())
+               {
+                  QName idQName = Repository.resolveToQName(child.getAttribute("name"));
+                  TypeDefinition typeDef = this.dictionaryService.getType(idQName);
+                  
+                  if (typeDef != null &&
+                      this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
+                  {
+                     // look for a client localized string
+                     String label = null;
+                     String msgId = child.getAttribute("displayLabelId");
+                     if (msgId != null)
+                     {
+                        label = Application.getMessage(context, msgId);
+                     }
+                     
+                     // if there wasn't an externalized string look for one in the config
+                     if (label == null)
+                     {
+                        label = child.getAttribute("displayLabel");
+                     }
+   
+                     // if there wasn't a client based label try and get it from the dictionary
+                     if (label == null)
+                     {
+                        label = typeDef.getTitle();
+                     }
+                     
+                     // finally, just use the localname
+                     if (label == null)
+                     {
+                        label = idQName.getLocalName();
+                     }
+                     
+                     this.objectTypes.add(new SelectItem(idQName.toString(), label));
+                  }
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.objectTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find 'content-types' configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find 'Custom Content Types' configuration section");
+         }
+         
+      }
+      
+      return this.objectTypes;
+   }
+   
+   /**
+    * @return the List of users in the system wrapped in SelectItem objects
+    */
+   public List<SelectItem> getUsers()
+   {
+      if (this.users == null)
+      {
+         List<Node> userNodes = Repository.getUsers(
+               FacesContext.getCurrentInstance(),
+               this.nodeService,
+               this.searchService);
+         this.users = new ArrayList<SelectItem>();
+         for (Node user : userNodes)
+         {
+            String email = (String)user.getProperties().get("email");
+            if (email != null && email.length() > 0)
+            {
+               this.users.add(new SelectItem(email, (String)user.getProperties().get("fullName")));
+            }
+         }
+         
+         // make sure the list is sorted by the label
+         QuickSort sorter = new QuickSort(this.users, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      return this.users;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
new file mode 100644
index 0000000000..746bc82c4b
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java
@@ -0,0 +1,611 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Base Handler class used by the Content Wizards 
+ * 
+ * @author gavinc kevinr
+ */
+public abstract class BaseContentWizard extends AbstractWizardBean
+{
+   private static Log logger = LogFactory.getLog(BaseContentWizard.class);
+
+   protected static final String FINISH_INSTRUCTION_ID = "content_finish_instruction";
+   
+   // content wizard specific attributes
+   protected String fileName;
+   protected String author;
+   protected String title;
+   protected String description;
+   protected String contentType;
+   protected String objectType;
+   protected boolean inlineEdit;
+   protected List<SelectItem> contentTypes;
+   protected List<SelectItem> objectTypes;
+   protected ContentService contentService;
+   protected DictionaryService dictionaryService;
+   
+   // the NodeRef of the node created during finish
+   protected NodeRef createdNode;
+   
+   /**
+    * Save the specified content using the currently set wizard attributes
+    * 
+    * @param fileContent      File content to save
+    * @param strContent       String content to save
+    */
+   protected String saveContent(File fileContent, String strContent)
+   {
+      String outcome = FINISH_OUTCOME;
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         if (this.editMode)
+         {
+            // update the existing node in the repository
+            Node currentDocument = this.browseBean.getDocument();
+            NodeRef nodeRef = currentDocument.getNodeRef();
+            
+            // move the file - location and name checks will be performed
+            this.fileFolderService.move(nodeRef, null, this.fileName); 
+            // set up the content data
+            // update the modified timestamp and other content props
+            Map<QName, Serializable> contentProps = this.nodeService.getProperties(nodeRef);
+            contentProps.put(ContentModel.PROP_TITLE, this.title);
+            contentProps.put(ContentModel.PROP_DESCRIPTION, this.description);
+            contentProps.put(ContentModel.PROP_CREATOR, this.author);
+            
+            // set up content properties - copy or create the compound property
+            ContentData contentData = (ContentData)contentProps.get(ContentModel.PROP_CONTENT);
+            if (contentData == null)
+            {
+               contentData = new ContentData(null, this.contentType, 0L, "UTF-8");
+            }
+            else
+            {
+               contentData = new ContentData(
+                     contentData.getContentUrl(),
+                     this.contentType,
+                     contentData.getSize(),
+                     contentData.getEncoding());
+            }
+            contentProps.put(ContentModel.PROP_CONTENT, contentData);
+            
+            if (this.nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INLINEEDITABLE) == false)
+            {
+               Map<QName, Serializable> editProps = new HashMap<QName, Serializable>(1, 1.0f);
+               editProps.put(ContentModel.PROP_EDITINLINE, this.inlineEdit);
+               this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_INLINEEDITABLE, editProps);
+            }
+            else
+            {
+               contentProps.put(ContentModel.PROP_EDITINLINE, this.inlineEdit);
+            }
+            this.nodeService.setProperties(nodeRef, contentProps);
+         }
+         else
+         {
+            // get the node ref of the node that will contain the content
+            NodeRef containerNodeRef;
+            String nodeId = getNavigator().getCurrentNodeId();
+            if (nodeId == null)
+            {
+               containerNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+            }
+            else
+            {
+               containerNodeRef = new NodeRef(Repository.getStoreRef(), nodeId);
+            }
+            
+            FileInfo fileInfo = fileFolderService.create(
+                  containerNodeRef,
+                  this.fileName,
+                  Repository.resolveToQName(this.objectType));
+            NodeRef fileNodeRef = fileInfo.getNodeRef();
+            
+            // set the author (if we have)
+            if (this.author != null && this.author.length() > 0)
+            {
+               this.nodeService.setProperty(fileNodeRef, ContentModel.PROP_CREATOR, this.author);
+            }
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Created file node for file: " + this.fileName);
+            
+            // apply the titled aspect - title and description
+            Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(3, 1.0f);
+            titledProps.put(ContentModel.PROP_TITLE, this.title);
+            titledProps.put(ContentModel.PROP_DESCRIPTION, this.description);
+            this.nodeService.addAspect(fileNodeRef, ContentModel.ASPECT_TITLED, titledProps);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Added titled aspect with properties: " + titledProps);
+            
+            // apply the inlineeditable aspect
+            if (this.inlineEdit == true)
+            {
+               Map<QName, Serializable> editProps = new HashMap<QName, Serializable>(1, 1.0f);
+               editProps.put(ContentModel.PROP_EDITINLINE, this.inlineEdit);
+               this.nodeService.addAspect(fileNodeRef, ContentModel.ASPECT_INLINEEDITABLE, editProps);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Added inlineeditable aspect with properties: " + editProps);
+            }
+            
+            // get a writer for the content and put the file
+            ContentWriter writer = contentService.getWriter(fileNodeRef, ContentModel.PROP_CONTENT, true);
+            // set the mimetype and encoding
+            writer.setMimetype(this.contentType);
+            writer.setEncoding("UTF-8");
+            if (fileContent != null)
+            {
+               writer.putContent(fileContent);
+            }
+            else if (strContent != null)
+            {
+               writer.putContent(strContent);
+            }
+            
+            // remember the created node now
+            this.createdNode = fileNodeRef;
+         }
+         
+         // give subclasses a chance to perform custom processing before committing
+         performCustomProcessing();
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (FileExistsException e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         // print status message  
+         String statusMsg = MessageFormat.format(
+               Application.getMessage(
+                     FacesContext.getCurrentInstance(), "error_exists"), 
+                     e.getExisting().getName());
+         Utils.addErrorMessage(statusMsg);
+         // no outcome
+         outcome = null;
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 3:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.fileName = null;
+      this.author = null;
+      this.title = null;
+      this.description = null;
+      this.contentType = null;
+      this.inlineEdit = false;
+      this.contentTypes = null;
+      this.objectTypes = null;
+      
+      this.objectType = ContentModel.TYPE_CONTENT.toString();
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#populate()
+    */
+   public void populate()
+   {
+      // get hold of the current document and populate the appropriate values
+      Node currentDocument = this.browseBean.getDocument();
+      Map<String, Object> props = currentDocument.getProperties();
+      
+      Boolean inline = (Boolean)props.get("editInline");
+      this.inlineEdit = inline != null ? inline.booleanValue() : false;
+      this.author = (String)props.get("creator");
+      this.contentType = null;
+      ContentData contentData = (ContentData)props.get(ContentModel.PROP_CONTENT);
+      if (contentData != null)
+      {
+         this.contentType = contentData.getMimetype();
+      }
+      this.description = (String)props.get("description");
+      this.fileName = currentDocument.getName();
+      this.title = (String)props.get("title");
+   }
+   
+   /**
+    * @return Returns the contentService.
+    */
+   public ContentService getContentService()
+   {
+      return contentService;
+   }
+
+   /**
+    * @param contentService The contentService to set.
+    */
+   public void setContentService(ContentService contentService)
+   {
+      this.contentService = contentService;
+   }
+   
+   /**
+    * Sets the dictionary service
+    * 
+    * @param dictionaryService  the dictionary service
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+
+   /**
+    * @return Returns the name of the file
+    */
+   public String getFileName()
+   {
+      return this.fileName;
+   }
+
+   /**
+    * @param fileName The name of the file
+    */
+   public void setFileName(String fileName)
+   {
+      this.fileName = fileName;
+   }
+   
+   /**
+    * @return Returns the author
+    */
+   public String getAuthor()
+   {
+      return this.author;
+   }
+
+   /**
+    * @param author Sets the author
+    */
+   public void setAuthor(String author)
+   {
+      this.author = author;
+   }
+
+   /**
+    * @return Returns the content type currenty selected
+    */
+   public String getContentType()
+   {
+      return this.contentType;
+   }
+
+   /**
+    * @param contentType Sets the currently selected content type
+    */
+   public void setContentType(String contentType)
+   {
+      this.contentType = contentType;
+   }
+   
+   /**
+    * @return Returns the object type currenty selected
+    */
+   public String getObjectType()
+   {
+      return this.objectType;
+   }
+
+   /**
+    * @param objectType Sets the currently selected object type
+    */
+   public void setObjectType(String objectType)
+   {
+      this.objectType = objectType;
+   }
+
+   /**
+    * @return Returns the description
+    */
+   public String getDescription()
+   {
+      return this.description;
+   }
+
+   /**
+    * @param description Sets the description
+    */
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+
+   /**
+    * @return Returns the title
+    */
+   public String getTitle()
+   {
+      return this.title;
+   }
+
+   /**
+    * @param title Sets the title
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+   
+   /**
+    * @return Returns the inline edit flag.
+    */
+   public boolean isInlineEdit()
+   {
+      return this.inlineEdit;
+   }
+
+   /**
+    * @param inlineEdit The inline edit flag to set.
+    */
+   public void setInlineEdit(boolean inlineEdit)
+   {
+      this.inlineEdit = inlineEdit;
+   }
+
+   /**
+    * @return Returns a list of content types to allow the user to select from
+    */
+   public List<SelectItem> getContentTypes()
+   {
+      if (this.contentTypes == null)
+      {
+         this.contentTypes = new ArrayList<SelectItem>(80);
+         ServiceRegistry registry = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+         MimetypeService mimetypeService = registry.getMimetypeService();
+         
+         // get the mime type display names
+         Map<String, String> mimeTypes = mimetypeService.getDisplaysByMimetype();
+         for (String mimeType : mimeTypes.keySet())
+         {
+            this.contentTypes.add(new SelectItem(mimeType, mimeTypes.get(mimeType)));
+         }
+         
+         // make sure the list is sorted by the values
+         QuickSort sorter = new QuickSort(this.contentTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+      
+      return this.contentTypes;
+   }
+   
+   /**
+    * @return Returns a list of object types to allow the user to select from
+    */
+   public List<SelectItem> getObjectTypes()
+   {
+      if (this.objectTypes == null)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         
+         // add the well known object type to start with
+         this.objectTypes = new ArrayList<SelectItem>(5);
+         this.objectTypes.add(new SelectItem(ContentModel.TYPE_CONTENT.toString(), 
+               Application.getMessage(context, "content")));
+         
+         // add any configured content sub-types to the list
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Custom Content Types");
+         if (wizardCfg != null)
+         {
+            ConfigElement typesCfg = wizardCfg.getConfigElement("content-types");
+            if (typesCfg != null)
+            {               
+               for (ConfigElement child : typesCfg.getChildren())
+               {
+                  QName idQName = Repository.resolveToQName(child.getAttribute("name"));
+                  TypeDefinition typeDef = this.dictionaryService.getType(idQName);
+                  
+                  if (typeDef != null &&
+                      this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
+                  {
+                     // look for a client localized string
+                     String label = null;
+                     String msgId = child.getAttribute("displayLabelId");
+                     if (msgId != null)
+                     {
+                        label = Application.getMessage(context, msgId);
+                     }
+                     
+                     // if there wasn't an externalized string look for one in the config
+                     if (label == null)
+                     {
+                        label = child.getAttribute("displayLabel");
+                     }
+   
+                     // if there wasn't a client based label try and get it from the dictionary
+                     if (label == null)
+                     {
+                        label = typeDef.getTitle();
+                     }
+                     
+                     // finally, just use the localname
+                     if (label == null)
+                     {
+                        label = idQName.getLocalName();
+                     }
+                     
+                     this.objectTypes.add(new SelectItem(idQName.toString(), label));
+                  }
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.objectTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find 'content-types' configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find 'Custom Content Types' configuration section");
+         }
+         
+      }
+      
+      return this.objectTypes;
+   }
+   
+   /**
+    * @return Determines whether the next and finish button should be enabled 
+    */
+   public boolean getNextFinishDisabled()
+   {
+      boolean disabled = false;
+      
+      if (this.fileName == null || this.fileName.length() == 0 ||
+          this.title == null || this.title.length() == 0 ||
+          this.contentType == null)
+      {
+         disabled = true;
+      }
+      
+      return disabled;
+   }
+   
+   /**
+    * Returns the display label for the content type currently chosen
+    * 
+    * @return The human readable version of the content type
+    */
+   protected String getSummaryContentType()
+   {
+      ServiceRegistry registry = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+      MimetypeService mimetypeService = registry.getMimetypeService();
+         
+      // get the mime type display name
+      Map<String, String> mimeTypes = mimetypeService.getDisplaysByMimetype();
+      return mimeTypes.get(this.contentType);
+   }
+   
+   /**
+    * Returns the display label for the currently selected object type
+    * 
+    * @return The objevt type label
+    */
+   protected String getSummaryObjectType()
+   {
+      String objType = null;
+      
+      for (SelectItem item : this.getObjectTypes())
+      {
+         if (item.getValue().equals(this.objectType))
+         {
+            objType = item.getLabel();
+            break;
+         }
+      }
+      
+      return objType;
+   }
+   
+   /**
+    * Performs any processing sub classes may wish to do before commit is called
+    */
+   protected void performCustomProcessing()
+   {
+      // used by subclasses if necessary
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java b/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java
new file mode 100644
index 0000000000..c767cb1b20
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.util.ResourceBundle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ValueChangeEvent;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Handler class used by the Create In-line Content Wizard 
+ * 
+ * @author Kevin Roast
+ */
+public class CreateContentWizard extends BaseContentWizard
+{
+   protected static final String CONTENT_TEXT = "txt";
+   protected static final String CONTENT_HTML = "html";
+
+   private static Log logger = LogFactory.getLog(CreateContentWizard.class);
+
+   // TODO: retrieve these from the config service
+   private static final String WIZARD_TITLE_ID = "create_content_title";
+   private static final String WIZARD_DESC_ID = "create_content_desc";
+   private static final String STEP1_TITLE_ID = "create_content_step1_title";
+   private static final String STEP1_DESCRIPTION_ID = "create_content_step1_desc";
+   private static final String STEP2_TITLE_ID = "create_content_step2_title";
+   private static final String STEP2_DESCRIPTION_ID = "create_content_step2_desc";
+   private static final String STEP3_TITLE_ID = "create_content_step3_title";
+   private static final String STEP3_DESCRIPTION_ID = "create_content_step3_desc";
+   
+   // create content wizard specific properties
+   protected String content;
+   protected String createType = CONTENT_HTML;
+   
+   
+   /**
+    * Deals with the finish button being pressed
+    * 
+    * @return outcome
+    */
+   public String finish()
+   {
+      return saveContent(null, this.content);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_DESCRIPTION_ID);
+            break;
+         }
+         case 2:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_DESCRIPTION_ID);
+            break;
+         }
+         case 3:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_DESCRIPTION_ID);
+            break;
+         }
+         case 4:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+      
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 4:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_TITLE_ID);
+            break;
+         }
+         case 4:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * @return Returns the content from the edited form.
+    */
+   public String getContent()
+   {
+      return this.content;
+   }
+   
+   /**
+    * @param content The content to edit (should be clear initially)
+    */
+   public void setContent(String content)
+   {
+      this.content = content;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.content = null;
+      
+      // created content is inline editable by default
+      this.inlineEdit = true;
+   }
+   
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      // TODO: show first few lines of content here?
+      return buildSummary(
+            new String[] {bundle.getString("file_name"), bundle.getString("type"), 
+                          bundle.getString("content_type"), bundle.getString("title"), 
+                          bundle.getString("description"), bundle.getString("author")},
+            new String[] {this.fileName, getSummaryObjectType(), getSummaryContentType(), 
+                          this.title, this.description, this.author});
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "select";
+            break;
+         }
+         case 2:
+         {
+            if (getCreateType().equals(CONTENT_HTML))
+            {
+               outcome = "create-html";
+            }
+            else if (getCreateType().equals(CONTENT_TEXT))
+            {
+               outcome = "create-text";
+            }
+            break;
+         }
+         case 3:
+         {
+            this.fileName = "newfile." + getCreateType();
+            this.contentType = Repository.getMimeTypeForFileName(
+                  FacesContext.getCurrentInstance(), this.fileName);
+            this.title = this.fileName;
+            
+            outcome = "properties";
+            break;
+         }
+         case 4:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Create content type value changed by the user
+    */
+   public void createContentChanged(ValueChangeEvent event)
+   {
+      // clear the content as HTML is not compatible with the plain text box etc.
+      this.content = null;
+   }
+
+   /**
+    * @return Returns the createType.
+    */
+   public String getCreateType()
+   {
+      return this.createType;
+   }
+
+   /**
+    * @param createType The createType to set.
+    */
+   public void setCreateType(String createType)
+   {
+      this.createType = createType;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
new file mode 100644
index 0000000000..0de1427c35
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java
@@ -0,0 +1,806 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import javax.faces.component.UISelectOne;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.model.SelectItem;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.ui.common.SortableSelectItem;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIGenericPicker;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+
+/**
+ * @author Kevin Roast
+ */
+public class InviteUsersWizard extends AbstractWizardBean
+{
+   private static Log logger = LogFactory.getLog(InviteUsersWizard.class);
+   
+   /** I18N message strings */
+   private static final String MSG_USERS  = "users";
+   private static final String MSG_GROUPS = "groups";
+   private static final String MSG_INVITED_SPACE = "invite_space";
+   private static final String MSG_INVITED_ROLE  = "invite_role";
+   private static final String WIZARD_TITLE_ID = "invite_title";
+   private static final String WIZARD_DESC_ID = "invite_desc";
+   private static final String STEP1_TITLE_ID = "invite_step1_title";
+   private static final String STEP1_DESCRIPTION_ID = "invite_step1_desc";
+   private static final String STEP2_TITLE_ID = "invite_step2_title";
+   private static final String STEP2_DESCRIPTION_ID = "invite_step2_desc";
+   private static final String FINISH_INSTRUCTION_ID = "invite_finish_instruction";
+   
+   private static final String NOTIFY_YES = "yes";
+   
+   /** NamespaceService bean reference */
+   private NamespaceService namespaceService;
+   
+   /** JavaMailSender bean reference */
+   private JavaMailSender mailSender;
+   
+   /** AuthorityService bean reference */
+   private AuthorityService authorityService;
+   
+   /** PermissionService bean reference */
+   private PermissionService permissionService;
+   
+   /** personService bean reference */
+   private PersonService personService;
+   
+   /** datamodel for table of roles for users */
+   private DataModel userRolesDataModel = null;
+   
+   /** list of user/group role wrapper objects */
+   private List<UserGroupRole> userGroupRoles = null;
+   
+   /** Cache of available folder permissions */
+   Set<String> folderPermissions = null;
+   
+   /** dialog state */
+   private String notify = NOTIFY_YES;
+   private String subject = null;
+   private String body = null;
+   private String internalSubject = null;
+   private String automaticText = null;
+   
+   
+   /**
+    * @param namespaceService   The NamespaceService to set.
+    */
+   public void setNamespaceService(NamespaceService namespaceService)
+   {
+      this.namespaceService = namespaceService;
+   }
+   
+   /**
+    * @param mailSender          The JavaMailSender to set.
+    */
+   public void setMailSender(JavaMailSender mailSender)
+   {
+      this.mailSender = mailSender;
+   }
+   
+   /**
+    * @param permissionService   The PermissionService to set.
+    */
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+   
+   /**
+    * @param permissionService   The PermissionService to set.
+    */
+   public void setPersonService(PersonService personService)
+   {
+      this.personService = personService;
+   }
+   
+   /**
+    * @param authorityService    The authorityService to set.
+    */
+   public void setAuthorityService(AuthorityService authorityService)
+   {
+      this.authorityService = authorityService;
+   }
+
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      notify = NOTIFY_YES;
+      userGroupRoles = new ArrayList<UserGroupRole>(8);
+      subject = "";
+      body = "";
+      automaticText = "";
+      internalSubject = null;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#finish()
+    */
+   public String finish()
+   {
+      String outcome = FINISH_OUTCOME;
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+         
+         String subject = this.subject;
+         if (subject == null || subject.length() == 0)
+         {
+            subject = this.internalSubject;
+         }
+         
+         User user = Application.getCurrentUser(context);
+         String from = (String)this.nodeService.getProperty(user.getPerson(), ContentModel.PROP_EMAIL);
+         if (from == null || from.length() == 0)
+         {
+            // TODO: get this from spring config?
+            from = "alfresco@alfresco.org";
+         }
+         
+         // get the Space to apply changes too
+         NodeRef folderNodeRef = this.browseBean.getActionSpace().getNodeRef();
+         
+         // set permissions for each user and send them a mail
+         for (int i=0; i<this.userGroupRoles.size(); i++)
+         {
+            UserGroupRole userGroupRole = this.userGroupRoles.get(i);
+            String authority = userGroupRole.getAuthority();
+            
+            // find the selected permission ref from it's name and apply for the specified user
+            Set<String> perms = getFolderPermissions();
+            for (String permission : perms)
+            {
+               if (userGroupRole.getRole().equals(permission))
+               {
+                  this.permissionService.setPermission(
+                        folderNodeRef,
+                        authority,
+                        permission,
+                        true);
+                  break;
+               }
+            }
+            
+            // Create the mail message for sending to each User
+            if (NOTIFY_YES.equals(this.notify))
+            {
+               // if User, email then, else if Group get all members and email them
+               AuthorityType authType = AuthorityType.getAuthorityType(authority);
+               if (authType.equals(AuthorityType.USER))
+               {
+                  if (this.personService.personExists(authority) == true)
+                  {
+                     notifyUser(this.personService.getPerson(authority), folderNodeRef, from, userGroupRole.getRole());
+                  }
+               }
+               else if (authType.equals(AuthorityType.GROUP))
+               {
+                  // else notify all members of the group
+                  Set<String> users = this.authorityService.getContainedAuthorities(AuthorityType.USER, authority, false);
+                  for (String userAuth : users)
+                  {
+                     if (this.personService.personExists(userAuth) == true)
+                     {
+                        notifyUser(this.personService.getPerson(userAuth), folderNodeRef, from, userGroupRole.getRole());
+                     }
+                  }
+               }
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         UIContextService.getInstance(context).notifyBeans();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Send an email notification to the specified User authority
+    * 
+    * @param person     Person node representing the user
+    * @param folder     Folder node they are invited too
+    * @param from       From text message
+    * @param roleText   The role display label for the user invite notification
+    */
+   private void notifyUser(NodeRef person, NodeRef folder, String from, String roleText)
+   {
+      String to = (String)this.nodeService.getProperty(person, ContentModel.PROP_EMAIL);
+      
+      if (to != null && to.length() != 0)
+      {
+         String msgRole = Application.getMessage(FacesContext.getCurrentInstance(), MSG_INVITED_ROLE);
+         String roleMessage = MessageFormat.format(msgRole, new Object[] {roleText});
+         
+         // TODO: include External Authentication link to the invited space
+         //String args = folder.getStoreRef().getProtocol() + '/' +
+         //   folder.getStoreRef().getIdentifier() + '/' +
+         //   folder.getId();
+         //String url = ExternalAccessServlet.generateExternalURL(LoginBean.OUTCOME_SPACEDETAILS, args);
+         
+         String body = this.internalSubject + "\r\n\r\n" + roleMessage + "\r\n\r\n";// + url + "\r\n\r\n";
+         if (this.body != null && this.body.length() != 0)
+         {
+            body += this.body;
+         }
+         
+         SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
+         simpleMailMessage.setTo(to);
+         simpleMailMessage.setSubject(subject);
+         simpleMailMessage.setText(body);
+         simpleMailMessage.setFrom(from);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Sending notification email to: " + to + "\n...with subject:\n" + subject + "\n...with body:\n" + body);
+         
+         try
+         {
+            // Send the message
+            this.mailSender.send(simpleMailMessage);
+         }
+         catch (Throwable e)
+         {
+            // don't stop the action but let admins know email is not getting sent
+            logger.error("Failed to send email to " + to, e);
+         }
+      }
+   }
+   
+   /**
+    * Returns the properties for current user-roles JSF DataModel
+    * 
+    * @return JSF DataModel representing the current user-roles
+    */
+   public DataModel getUserRolesDataModel()
+   {
+      if (this.userRolesDataModel == null)
+      {
+         this.userRolesDataModel = new ListDataModel();
+      }
+      
+      this.userRolesDataModel.setWrappedData(this.userGroupRoles);
+      
+      return this.userRolesDataModel;
+   }
+   
+   /**
+    * Query callback method executed by the Generic Picker component.
+    * This method is part of the contract to the Generic Picker, it is up to the backing bean
+    * to execute whatever query is appropriate and return the results.
+    * 
+    * @param filterIndex        Index of the filter drop-down selection
+    * @param contains           Text from the contains textbox
+    * 
+    * @return An array of SelectItem objects containing the results to display in the picker.
+    */
+   public SelectItem[] pickerCallback(int filterIndex, String contains)
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      
+      SelectItem[] items;
+      
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         if (filterIndex == 0)
+         {
+            // build xpath to match available User/Person objects
+            NodeRef peopleRef = personService.getPeopleContainer();
+            // NOTE: see SearcherComponentTest
+            String xpath = "*[like(@" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + "firstName, '%" + contains + "%', false)" +
+                    " or " + "like(@" + NamespaceService.CONTENT_MODEL_PREFIX + ":" + "lastName, '%" + contains + "%', false)]";
+            
+            List<NodeRef> nodes = searchService.selectNodes(
+                  peopleRef,
+                  xpath,
+                  null,
+                  this.namespaceService,
+                  false);
+            
+            items = new SelectItem[nodes.size()];
+            for (int index=0; index<nodes.size(); index++)
+            {
+               NodeRef personRef = nodes.get(index);
+               String firstName = (String)this.nodeService.getProperty(personRef, ContentModel.PROP_FIRSTNAME);
+               String lastName = (String)this.nodeService.getProperty(personRef, ContentModel.PROP_LASTNAME);
+               String username = (String)this.nodeService.getProperty(personRef, ContentModel.PROP_USERNAME);
+               SelectItem item = new SortableSelectItem(username, firstName + " " + lastName, lastName);
+               items[index] = item;
+            }
+         }
+         else
+         {
+            // groups - simple text based match on name
+            Set<String> groups = authorityService.getAllAuthorities(AuthorityType.GROUP);
+            groups.addAll(authorityService.getAllAuthorities(AuthorityType.EVERYONE));
+            
+            List<SelectItem> results = new ArrayList<SelectItem>(groups.size());
+            String containsLower = contains.toLowerCase();
+            int offset = PermissionService.GROUP_PREFIX.length();
+            for (String group : groups)
+            {
+               if (group.toLowerCase().indexOf(containsLower) != -1)
+               {
+                  results.add(new SortableSelectItem(group, group.substring(offset), group));
+               }
+            }
+            items = new SelectItem[results.size()];
+            results.toArray(items);
+         }
+         
+         Arrays.sort(items);
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err );
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         
+         items = new SelectItem[0];
+      }
+      
+      return items;
+   }
+   
+   /**
+    * Action handler called when the Add button is pressed to process the current selection
+    */
+   public void addSelection(ActionEvent event)
+   {
+      UIGenericPicker picker = (UIGenericPicker)event.getComponent().findComponent("picker");
+      UISelectOne rolePicker = (UISelectOne)event.getComponent().findComponent("roles");
+      
+      String[] results = picker.getSelectedResults();
+      if (results != null)
+      {
+         String role = (String)rolePicker.getValue();
+         
+         if (role != null)
+         {
+            for (int i=0; i<results.length; i++)
+            {
+               String authority = results[i];
+               
+               // only add if authority not already present in the list with same role
+               boolean foundExisting = false;
+               for (int n=0; n<this.userGroupRoles.size(); n++)
+               {
+                  UserGroupRole wrapper = this.userGroupRoles.get(n);
+                  if (authority.equals(wrapper.getAuthority()) &&
+                      role.equals(wrapper.getRole()))
+                  {
+                     foundExisting = true;
+                     break;
+                  }
+               }
+               
+               if (foundExisting == false)
+               {
+                  StringBuilder label = new StringBuilder(64);
+                  
+                  // build a display label showing the user and their role for the space
+                  AuthorityType authType = AuthorityType.getAuthorityType(authority);
+                  if (authType.equals(AuthorityType.USER))
+                  {
+                     if (this.personService.personExists(authority) == true)
+                     {
+                        // found a User authority
+                        NodeRef ref = this.personService.getPerson(authority);
+                        String firstName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_FIRSTNAME);
+                        String lastName = (String)this.nodeService.getProperty(ref, ContentModel.PROP_LASTNAME);
+                        
+                        label.append(firstName)
+                             .append(" ")
+                             .append(lastName)
+                             .append(" (")
+                             .append(Application.getMessage(FacesContext.getCurrentInstance(), role))
+                             .append(")");
+                     }
+                  }
+                  else
+                  {
+                     // found a group authority
+                     label.append(authority.substring(PermissionService.GROUP_PREFIX.length()));
+                  }
+                  
+                  this.userGroupRoles.add(new UserGroupRole(authority, role, label.toString()));
+               }
+            }
+         }
+      }
+   }
+   
+   /**
+    * Action handler called when the Remove button is pressed to remove a user+role
+    */
+   public void removeSelection(ActionEvent event)
+   {
+      UserGroupRole wrapper = (UserGroupRole)this.userRolesDataModel.getRowData();
+      if (wrapper != null)
+      {
+         this.userGroupRoles.remove(wrapper);
+      }
+   }
+   
+   /**
+    * Property accessed by the Generic Picker component.
+    * 
+    * @return the array of filter options to show in the users/groups picker
+    */
+   public SelectItem[] getFilters()
+   {
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      return new SelectItem[] {
+            new SelectItem("0", bundle.getString(MSG_USERS)),
+            new SelectItem("1", bundle.getString(MSG_GROUPS)) };
+   }
+   
+   /**
+    * @return The list of available roles for the users/groups
+    */
+   public SelectItem[] getRoles()
+   {
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      // get available roles (grouped permissions) from the permission service
+      Set<String> perms = getFolderPermissions();
+      SelectItem[] roles = new SelectItem[perms.size()];
+      int index = 0;
+      for (String permission : perms)
+      {
+         String displayLabel = bundle.getString(permission);
+         roles[index++] = new SelectItem(permission, displayLabel);
+      }
+      
+      return roles;
+   }
+   
+   /**
+    * @return Returns the notify listbox selection.
+    */
+   public String getNotify()
+   {
+      return this.notify;
+   }
+
+   /**
+    * @param notify The notify listbox selection to set.
+    */
+   public void setNotify(String notify)
+   {
+      this.notify = notify;
+   }
+
+   /**
+    * @return Returns the automaticText.
+    */
+   public String getAutomaticText()
+   {
+      return this.automaticText;
+   }
+
+   /**
+    * @param automaticText The automaticText to set.
+    */
+   public void setAutomaticText(String automaticText)
+   {
+      this.automaticText = automaticText;
+   }
+   
+   /**
+    * @return Returns the email body text.
+    */
+   public String getBody()
+   {
+      return this.body;
+   }
+
+   /**
+    * @param body The email body text to set.
+    */
+   public void setBody(String body)
+   {
+      this.body = body;
+   }
+
+   /**
+    * @return Returns the email subject text.
+    */
+   public String getSubject()
+   {
+      return this.subject;
+   }
+
+   /**
+    * @param subject The email subject text to set.
+    */
+   public void setSubject(String subject)
+   {
+      this.subject = subject;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+   }
+
+      /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_DESCRIPTION_ID);
+            break;
+         }
+         case 2:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+      
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 2:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#next()
+    */
+   public String next()
+   {
+      String outcome = super.next();
+      
+      if (outcome.equals("notify"))
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         
+         // prepare automatic text for email and screen
+         StringBuilder buf = new StringBuilder(256);
+         
+         String personName = Application.getCurrentUser(context).getFullName(getNodeService());
+         String msgInvite = Application.getMessage(context, MSG_INVITED_SPACE);
+         Node node = this.browseBean.getActionSpace();
+         String path = this.nodeService.getPath(node.getNodeRef()).toDisplayPath(this.nodeService);
+         buf.append(MessageFormat.format(msgInvite, new Object[] {
+               path + '/' + node.getName(),
+               personName}) );
+         
+         this.internalSubject = buf.toString();
+         
+         buf.append("<br>");
+         
+         String msgRole = Application.getMessage(context, MSG_INVITED_ROLE);
+         String roleText;
+         if (this.userGroupRoles.size() != 0)
+         {
+            String roleMsg = Application.getMessage(context, userGroupRoles.get(0).getRole());
+            roleText = MessageFormat.format(msgRole, roleMsg);
+         }
+         else
+         {
+            roleText = MessageFormat.format(msgRole, "[role]");
+         }
+         
+         buf.append(roleText);
+         
+         this.automaticText = buf.toString();
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "invite";
+            break;
+         }
+         case 2:
+         {
+            outcome = "notify";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @return a cached list of available folder permissions
+    */
+   private Set<String> getFolderPermissions()
+   {
+      if (this.folderPermissions == null)
+      {
+         this.folderPermissions = this.permissionService.getSettablePermissions(ContentModel.TYPE_FOLDER);
+      }
+      
+      return this.folderPermissions;
+   }
+   
+   
+   /**
+    * Simple wrapper class to represent a user/group and a role combination
+    */
+   public static class UserGroupRole
+   {
+      public UserGroupRole(String authority, String role, String label)
+      {
+         this.authority = authority;
+         this.role = role;
+         this.label = label;
+      }
+      
+      public String getAuthority()
+      {
+         return this.authority;
+      }
+      
+      public String getRole()
+      {
+         return this.role;
+      }
+      
+      public String getLabel()
+      {
+         return this.label;
+      }
+      
+      private String authority;
+      private String role;
+      private String label;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java b/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java
new file mode 100644
index 0000000000..7cc15ad259
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewActionWizard.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Handler class used by the New Action Wizard 
+ * 
+ * @author Kevin Roast
+ */
+public class NewActionWizard extends BaseActionWizard
+{
+   private static Log logger = LogFactory.getLog(NewActionWizard.class);
+   
+   private static final String ERROR = "error_action";
+   
+   // TODO: retrieve these from the config service
+   private static final String WIZARD_TITLE_ID = "create_action_title";
+   private static final String WIZARD_DESC_ID = "create_action_desc";
+   private static final String STEP1_TITLE_ID = "create_action_step1_title";
+   private static final String STEP2_TITLE_ID = "create_action_step2_title";
+   private static final String FINISH_INSTRUCTION_ID = "create_action_finish_instruction";
+   
+   /**
+    * Deals with the finish button being pressed
+    * 
+    * @return outcome
+    */
+   public String finish()
+   {
+      String outcome = FINISH_OUTCOME;
+      
+      UserTransaction tx = null;
+      
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // build the action params map based on the selected action instance
+         Map<String, Serializable> actionParams = buildActionParams();
+         
+         // build the action to execute
+         Action action = this.actionService.createAction(getAction());
+         action.setParameterValues(actionParams);
+         
+         // execute the action on the current document node
+         this.actionService.executeAction(action, this.browseBean.getDocument().getNodeRef());
+         
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("Executed action '" + this.action + 
+                         "' with action params of " + 
+                         this.currentActionProperties);
+         }
+         
+         // reset the current document properties/aspects in case we have changed them
+         // during the execution of the custom action
+         this.browseBean.getDocument().reset();
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      return "";
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 3:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+   }
+
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      String summaryAction = this.actionService.getActionDefinition(
+            this.action).getTitle();
+      
+      return buildSummary(
+            new String[] {"Action"},
+            new String[] {summaryAction});
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "action";
+            break;
+         }
+         case 2:
+         {
+            outcome = this.action;
+            break;
+         }
+         case 3:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }   
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewForumWizard.java b/source/java/org/alfresco/web/bean/wizard/NewForumWizard.java
new file mode 100644
index 0000000000..ee889b6e78
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewForumWizard.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.web.ui.common.component.UIListItem;
+
+/**
+ * Wizard bean used for creating and editing forum spaces
+ * 
+ * @author gavinc
+ */
+public class NewForumWizard extends NewSpaceWizard
+{
+   public static final String FORUM_ICON_DEFAULT = "forum_large";
+   
+   protected String forumStatus;
+   
+   protected List<UIListItem> forumIcons;
+
+   /**
+    * Returns the status of the forum
+    * 
+    * @return The status of the forum
+    */
+   public String getForumStatus()
+   {
+      return this.forumStatus;
+   }
+
+   /**
+    * Sets the status of the forum 
+    * 
+    * @param forumStatus The status
+    */
+   public void setForumStatus(String forumStatus)
+   {
+      this.forumStatus = forumStatus;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#init()
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.spaceType = ForumModel.TYPE_FORUM.toString();
+      this.icon = FORUM_ICON_DEFAULT;
+      this.forumStatus = "0";
+   }
+   
+   /**
+    * Returns a list of icons to allow the user to select from.
+    * 
+    * @return A list of icons
+    */
+   @SuppressWarnings("unchecked")
+   public List<UIListItem> getIcons()
+   {
+      // return the various forum icons
+      if (this.forumIcons == null)
+      {
+         this.forumIcons = new ArrayList<UIListItem>(1);
+         
+         UIListItem item = new UIListItem();
+         item.setValue(FORUM_ICON_DEFAULT);
+         item.getAttributes().put("image", "/images/icons/forum_large.gif");
+         this.forumIcons.add(item);
+      }
+      
+      return this.forumIcons;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.NewSpaceWizard#performCustomProcessing(javax.faces.context.FacesContext)
+    */
+   @Override
+   protected void performCustomProcessing(FacesContext context)
+   {
+      // add or update the ForumModel.PROP_STATUS property depending on the editMode
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewForumsWizard.java b/source/java/org/alfresco/web/bean/wizard/NewForumsWizard.java
new file mode 100644
index 0000000000..08fdbfe817
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewForumsWizard.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.web.ui.common.component.UIListItem;
+
+/**
+ * Wizard bean used for creating and editing forums spaces
+ * 
+ * @author gavinc
+ */
+public class NewForumsWizard extends NewSpaceWizard
+{
+   public static final String FORUMS_ICON_DEFAULT = "forums_large";
+   
+   protected List<UIListItem> forumsIcons;
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#init()
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.spaceType = ForumModel.TYPE_FORUMS.toString();
+      this.icon = FORUMS_ICON_DEFAULT;
+   }
+   
+   /**
+    * Returns a list of icons to allow the user to select from.
+    * 
+    * @return A list of icons
+    */
+   @SuppressWarnings("unchecked")
+   public List<UIListItem> getIcons()
+   {
+      // return the various forums icons
+      if (this.forumsIcons == null)
+      {
+         this.forumsIcons = new ArrayList<UIListItem>(1);
+         
+         UIListItem item = new UIListItem();
+         item.setValue(FORUMS_ICON_DEFAULT);
+         item.getAttributes().put("image", "/images/icons/forums_large.gif");
+         this.forumsIcons.add(item);
+      }
+      
+      return this.forumsIcons;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java b/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java
new file mode 100644
index 0000000000..b0d9ff1f7f
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ForumModel;
+import org.alfresco.util.GUID;
+import org.alfresco.web.bean.repository.Repository;
+
+/**
+ * Backing bean for posting forum articles.
+ * 
+ * @author gavinc
+ */
+public class NewPostWizard extends CreateContentWizard
+{
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#init()
+    */
+   @Override
+   public void init()
+   {
+      super.init();
+      
+      // set up for creating a post instead of HTML
+      this.createType = CONTENT_TEXT;
+      this.objectType = ForumModel.TYPE_POST.toString();
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#finish()
+    */
+   @Override
+   public String finish()
+   {
+      // create appropriate values for filename, title and content type
+      this.fileName = GUID.generate() + ".txt";
+      this.contentType = Repository.getMimeTypeForFileName(
+                  FacesContext.getCurrentInstance(), this.fileName);
+      this.title = this.fileName;
+      
+      return super.finish();
+   }
+   
+   
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java b/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java
new file mode 100644
index 0000000000..d7b150157d
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.model.ContentModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * Backing bean for posting replies to forum articles.
+ * 
+ * @author gavinc
+ */
+public class NewReplyWizard extends NewPostWizard
+{
+   private static Log logger = LogFactory.getLog(NewReplyWizard.class);
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#startWizard(javax.faces.event.ActionEvent)
+    */
+   @Override
+   public void startWizard(ActionEvent event)
+   {
+      super.startWizard(event);
+      
+      // also setup the content in the browse bean
+      this.browseBean.setupContentAction(event);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.BaseContentWizard#performCustomProcessing()
+    */
+   @Override
+   protected void performCustomProcessing()
+   {
+      if (this.editMode == false)
+      {
+         // setup the referencing aspect with the references association
+         // between the new post and the one being replied to
+         this.nodeService.addAspect(this.createdNode, ContentModel.ASPECT_REFERENCING, null);
+         this.nodeService.createAssociation(this.createdNode, this.browseBean.getDocument().getNodeRef(), 
+               ContentModel.ASSOC_REFERENCES);
+         
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("created new node: " + this.createdNode);
+            logger.debug("existing node: " + this.browseBean.getDocument().getNodeRef());
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
new file mode 100644
index 0000000000..efb25bb039
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
@@ -0,0 +1,1490 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.model.SelectItem;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.evaluator.CompareMimeTypeEvaluator;
+import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
+import org.alfresco.repo.action.evaluator.HasAspectEvaluator;
+import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
+import org.alfresco.repo.action.evaluator.IsSubTypeEvaluator;
+import org.alfresco.repo.action.executer.CheckInActionExecuter;
+import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter;
+import org.alfresco.repo.action.executer.SpecialiseTypeActionExecuter;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.action.ActionConditionDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.service.cmr.rule.RuleType;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.RulesBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Handler class used by the New Space Wizard 
+ * 
+ * @author gavinc
+ */
+public class NewRuleWizard extends BaseActionWizard
+{
+   // parameter names for actions
+   public static final String PROP_ACTION_NAME = "actionName";
+   public static final String PROP_ACTION_SUMMARY = "actionSummary";
+   
+   // parameter names for conditions
+   public static final String PROP_CONDITION_NAME = "conditionName";
+   public static final String PROP_CONDITION_SUMMARY = "conditionSummary";
+   public static final String PROP_CONDITION_NOT = "notcondition";
+   public static final String PROP_PROPERTY = "property";
+   public static final String PROP_CONTAINS_TEXT = "containstext";
+   public static final String PROP_MODEL_TYPE = "modeltype";
+   public static final String PROP_MIMETYPE = "mimetype";
+   public static final String PROP_MODEL_ASPECT = "modelaspect";
+   public static final String PROP_TYPE_OR_ASPECT = "typeoraspect";
+   
+   private static Log logger = LogFactory.getLog(NewRuleWizard.class);
+   
+   private static final String ERROR = "error_rule";
+   
+   // TODO: retrieve these from the config service
+   private static final String WIZARD_TITLE_ID = "new_rule_title";
+   private static final String WIZARD_TITLE_EDIT_ID = "new_rule_title_edit";
+   private static final String WIZARD_DESC_ID = "new_rule_desc";
+   private static final String WIZARD_DESC_EDIT_ID = "new_rule_desc_edit";
+   private static final String STEP1_TITLE_ID = "new_rule_step1_title";
+   private static final String STEP2_TITLE_ID = "new_rule_step2_title";
+   private static final String STEP3_TITLE_ID = "new_rule_step3_title";
+   private static final String FINISH_INSTRUCTION_ID = "new_rule_finish_instruction";
+   private static final String FINISH_INSTRUCTION_EDIT_ID = "new_rule_finish_instruction_edit";
+   
+   // new rule wizard specific properties
+   private String title;
+   private String description;
+   private String type;
+   private String condition;
+   private boolean runInBackground;
+   private boolean applyToSubSpaces;
+   private boolean editingAction;
+   private boolean editingCondition;
+
+   private RuleService ruleService;
+   private RulesBean rulesBean;
+   
+   private List<SelectItem> modelTypes;
+   private List<SelectItem> mimeTypes;
+   private List<SelectItem> types;
+   private List<SelectItem> conditions;
+   private List<SelectItem> typesAndAspects;
+   private Map<String, String> conditionDescriptions;
+   private Map<String, Serializable> currentConditionProperties;
+   
+   private List<Map<String, Serializable>> allActionsProperties;
+   private List<Map<String, Serializable>> allConditionsProperties;
+   
+   private DataModel allActionsDataModel;
+   private DataModel allConditionsDataModel;
+   
+   /**
+    * Deals with the finish button being pressed
+    * 
+    * @return outcome
+    */
+   public String finish()
+   {
+      String outcome = FINISH_OUTCOME;
+      
+      UserTransaction tx = null;
+   
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+         
+         // get hold of the space the rule will apply to and make sure
+         // it is actionable
+         Node currentSpace = browseBean.getActionSpace();
+         
+         Rule rule = null;
+         
+         if (this.editMode)
+         {
+            // update the existing rule in the repository
+            rule = this.rulesBean.getCurrentRule();
+                        
+            // remove all the conditions and actions from the current rule
+            rule.removeAllActionConditions();
+            rule.removeAllActions();
+         }
+         else
+         {
+            rule = this.ruleService.createRule(this.getType());
+         }
+
+         // setup the rule and add it to the space
+         rule.setTitle(this.title);
+         rule.setDescription(this.description);
+         rule.applyToChildren(this.applyToSubSpaces);
+         rule.setExecuteAsynchronously(this.runInBackground);
+         
+         // add all the conditions to the rule
+         for (Map<String, Serializable> condParams : this.allConditionsProperties)
+         {
+            Map<String, Serializable> repoCondParams = buildConditionParams(condParams);
+            
+            // add the condition to the rule
+            ActionCondition condition = this.actionService.createActionCondition(
+                  (String)condParams.get(PROP_CONDITION_NAME));
+            condition.setParameterValues(repoCondParams);
+            
+            // specify whether the condition result should be inverted
+            Boolean not = (Boolean)condParams.get(PROP_CONDITION_NOT);
+            condition.setInvertCondition(((Boolean)not).booleanValue());
+            
+            rule.addActionCondition(condition);
+         }
+         
+         // add all the actions to the rule
+         for (Map<String, Serializable> actionParams : this.allActionsProperties)
+         {
+            // use the base class version of buildActionParams(), but for this we need 
+            // to setup the currentActionProperties and action variables
+            String actionName = (String)actionParams.get(PROP_ACTION_NAME);
+            this.action = actionName;
+            this.currentActionProperties = actionParams;
+            Map<String, Serializable> repoActionParams = buildActionParams();
+            
+            // add the action to the rule
+            Action action = this.actionService.createAction(actionName);
+            action.setParameterValues(repoActionParams);
+            rule.addAction(action);
+         }
+         
+         // Save the rule
+         this.ruleService.saveRule(currentSpace.getNodeRef(), rule);
+         
+         if (logger.isDebugEnabled())
+         {
+            logger.debug(this.editMode ? "Updated" : "Added" + " rule '" + this.title + "'");
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+
+   /**
+    * Returns the properties for all the conditions as a JSF DataModel
+    * 
+    * @return JSF DataModel representing the condition properties
+    */
+   public DataModel getAllConditionsDataModel()
+   {
+      if (this.allConditionsDataModel == null)
+      {
+         this.allConditionsDataModel = new ListDataModel();
+      }
+      
+      this.allConditionsDataModel.setWrappedData(this.allConditionsProperties);
+      
+      return this.allConditionsDataModel;
+   }
+   
+   /**
+    * Displays the settings page for the current condition being added (if required)
+    * 
+    * @return The outcome
+    */
+   public String promptForConditionValues()
+   {
+      String outcome = null;
+
+      // set the flag to show we are creating a new condition
+      this.editingCondition = false;
+      
+      if ("no-condition".equals(this.condition))
+      {
+         HashMap<String, Serializable> condProps = new HashMap<String, Serializable>(3);
+         condProps.put(PROP_CONDITION_NAME, this.condition);
+         condProps.put(PROP_CONDITION_SUMMARY, Application.getMessage(
+               FacesContext.getCurrentInstance(), "condition_no_condition"));
+         condProps.put(PROP_CONDITION_NOT, Boolean.FALSE);
+         this.allConditionsProperties.add(condProps);
+         
+         // NOTE: we don't set an outcome to stay on the same page as there are 
+         //       no settings related to 'no-condition'
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Add 'no-condition' condition to list");
+      }
+      else if (this.condition != null)
+      {
+         HashMap<String, Serializable> condProps = new HashMap<String, Serializable>(3);
+         condProps.put(PROP_CONDITION_NAME, this.condition);
+         this.currentConditionProperties = condProps;
+         outcome = this.condition;
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added '" + this.condition + "' condition to list");
+      }
+      
+      // reset the selected condition drop down
+      this.condition = null;
+      
+      return outcome;
+   }
+   
+   /**
+    * Sets up the context for editing existing condition values 
+    * 
+    * @return The outcome
+    */
+   public String editCondition()
+   {
+      // use the built in JSF support for retrieving the object for the
+      // row that was clicked by the user
+      Map conditionToEdit = (Map)this.allConditionsDataModel.getRowData();
+      this.condition = (String)conditionToEdit.get(PROP_CONDITION_NAME);
+      this.currentConditionProperties = conditionToEdit;
+      
+      // set the flag to show we are editing a condition
+      this.editingCondition = true;
+      
+      return this.condition;
+   }
+   
+   /**
+    * Adds the condition just setup by the user to the list of conditions for the rule
+    * 
+    * @return The outcome
+    */
+   public String addCondition()
+   {
+      String summary = buildConditionSummary(this.currentConditionProperties);
+      
+      if (summary != null)
+      {
+         this.currentConditionProperties.put(PROP_CONDITION_SUMMARY, summary);
+      }
+      
+      if (this.editingCondition)
+      {
+         this.condition = null;
+      }
+      else
+      {
+         this.allConditionsProperties.add(this.currentConditionProperties);
+      }
+      
+      // re-display the conditions step
+      return "condition";
+   }
+   
+   /**
+    * Removes the requested condition from the list
+    * 
+    * @return The outcome
+    */
+   public String removeCondition()
+   {
+      // use the built in JSF support for retrieving the object for the
+      // row that was clicked by the user
+      Map conditionToRemove = (Map)this.allConditionsDataModel.getRowData();
+      this.allConditionsProperties.remove(conditionToRemove);
+      
+      // reset the action drop down
+      this.condition = null;
+      
+      // return no outcome to refresh page
+      return null;
+   }
+   
+   /**
+    * Cancels the addition of the condition
+    * 
+    * @return The outcome
+    */
+   public String cancelAddCondition()
+   {
+      if (this.editingCondition)
+      {
+         this.condition = null;
+      }
+      else
+      {
+         this.currentConditionProperties.clear();
+      }
+      
+      
+      return "condition";
+   }
+
+   /**
+    * Returns the properties for all the actions as a JSF DataModel
+    * 
+    * @return JSF DataModel representing the action properties
+    */
+   public DataModel getAllActionsDataModel()
+   {
+      if (this.allActionsDataModel == null)
+      {
+         this.allActionsDataModel = new ListDataModel();
+      }
+      
+      this.allActionsDataModel.setWrappedData(this.allActionsProperties);
+      
+      return this.allActionsDataModel;
+   }
+   
+   /**
+    * Displays the settings page for the current action being added
+    * 
+    * @return The outcome
+    */
+   public String promptForActionValues()
+   {
+      // set the flag to show we are creating a new action
+      this.editingAction = false;
+      
+      HashMap<String, Serializable> actionProps = new HashMap<String, Serializable>(3);
+      actionProps.put(PROP_ACTION_NAME, this.action);
+      this.currentActionProperties = actionProps;
+      
+      String outcome = this.action;
+      
+      if (SimpleWorkflowActionExecuter.NAME.equals(this.action))
+      {
+         this.currentActionProperties.put("approveAction", "move");
+         this.currentActionProperties.put("rejectStepPresent", "yes");
+         this.currentActionProperties.put("rejectAction", "move");
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added '" + SimpleWorkflowActionExecuter.NAME + 
+                  "' action to list");
+      }
+      else if (CheckInActionExecuter.NAME.equals(this.action))
+      {
+         this.currentActionProperties.put(PROP_CHECKIN_MINOR, new Boolean(true));
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added '" + CheckInActionExecuter.NAME + 
+                  "' action to list");
+      }
+      else if ("extract-metadata".equals(this.action))
+      {
+         // This one (currently) has no parameters, so just add it...
+         actionProps.put(PROP_ACTION_SUMMARY, buildActionSummary(actionProps));
+         this.allActionsProperties.add(actionProps);
+         
+         outcome = null;
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added 'extract-metadata' action to list");
+      }
+      else
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Added '" + this.action + "' action to list");
+      }
+      
+      // reset the selected action drop down
+      this.action = null;
+      
+      return outcome;
+   }
+   
+   /**
+    * Sets up the context for editing existing action values 
+    * 
+    * @return The outcome
+    */
+   public String editAction()
+   {
+      // use the built in JSF support for retrieving the object for the
+      // row that was clicked by the user
+      Map actionToEdit = (Map)this.allActionsDataModel.getRowData();
+      this.action = (String)actionToEdit.get(PROP_ACTION_NAME);
+      this.currentActionProperties = actionToEdit;
+      
+      // set the flag to show we are editing an action
+      this.editingAction = true;
+      
+      return this.action;
+   }
+   
+   /**
+    * Adds the action just setup by the user to the list of actions for the rule
+    * 
+    * @return The outcome
+    */
+   public String addAction()
+   {
+      String summary = buildActionSummary(this.currentActionProperties);
+      
+      if (summary != null)
+      {
+         this.currentActionProperties.put(PROP_ACTION_SUMMARY, summary);
+      }
+      
+      if (this.editingAction)
+      {
+         this.action = null;
+      }
+      else
+      {
+         this.allActionsProperties.add(this.currentActionProperties);
+      }
+      
+      // re-display the actions step
+      return "action";
+   }
+   
+   /**
+    * Removes the requested action from the list
+    * 
+    * @return The outcome
+    */
+   public String removeAction()
+   {
+      // use the built in JSF support for retrieving the object for the
+      // row that was clicked by the user
+      Map actionToRemove = (Map)this.allActionsDataModel.getRowData();
+      this.allActionsProperties.remove(actionToRemove);
+      
+      // reset the action drop down
+      this.action = null;
+      
+      // return no outcome to refresh page
+      return null;
+   }
+   
+   /**
+    * Cancels the addition of the action
+    * 
+    * @return The outcome
+    */
+   public String cancelAddAction()
+   {
+      if (this.editingAction)
+      {
+         this.condition = null;
+      }
+      else
+      {
+         this.currentActionProperties.clear();
+      }
+      
+      return "action";
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      if (this.editMode)
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_EDIT_ID);
+      }
+      else
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+      }
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      if (this.editMode)
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_EDIT_ID);
+      }
+      else
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+      
+      switch (this.currentStep)
+      {
+         case 4:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+      
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_TITLE_ID);
+            break;
+         }
+         case 4:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 4:
+         {
+            if (this.editMode)
+            {
+               stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_EDIT_ID);
+            }
+            else
+            {
+               stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            }
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      this.title = null;
+      this.description = null;
+      this.type = "inbound";
+      this.condition = null;
+      this.action = null;
+      this.applyToSubSpaces = false;
+      this.runInBackground = false;
+      this.conditions = null;
+      this.conditionDescriptions = null;
+      
+      this.allConditionsProperties = new ArrayList<Map<String, Serializable>>();
+      this.allActionsProperties = new ArrayList<Map<String, Serializable>>();
+   }
+   
+   /**
+    * Sets the context of the rule up before performing the 
+    * standard wizard editing steps
+    *  
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#startWizardForEdit(javax.faces.event.ActionEvent)
+    */
+   public void startWizardForEdit(ActionEvent event)
+   {
+      // setup context for rule to be edited
+      this.rulesBean.setupRuleAction(event);
+      
+      // perform the usual edit processing
+      super.startWizardForEdit(event);
+   }
+
+   /**
+    * Populates the values of the backing bean ready for editing the rule
+    * 
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#populate()
+    */
+   public void populate()
+   {
+      // get hold of the current rule details
+      Rule rule = this.rulesBean.getCurrentRule();
+      
+      if (rule == null)
+      {
+         throw new AlfrescoRuntimeException("Failed to locate the current rule");
+      }
+      
+      // populate the bean with current values 
+      this.type = rule.getRuleTypeName();
+      this.title = rule.getTitle();
+      this.description = rule.getDescription();
+      this.applyToSubSpaces = rule.isAppliedToChildren();
+      this.runInBackground = rule.getExecuteAsychronously();
+      
+      // populate the conditions list with maps of properties representing each condition
+      List<ActionCondition> conditions = rule.getActionConditions();
+      for (ActionCondition condition : conditions)
+      {
+         Map<String, Serializable> params = populateCondition(condition);
+         this.allConditionsProperties.add(params);
+      }
+      
+      List<Action> actions = rule.getActions();
+      for (Action action : actions)
+      {
+         // use the base class version of populateActionFromProperties(), 
+         // but for this we need to setup the currentActionProperties and 
+         // action variables
+         this.currentActionProperties = new HashMap<String, Serializable>(3);
+         this.action = action.getActionDefinitionName();
+         populateActionFromProperties(action.getParameterValues());
+         
+         // also add the name and summary 
+         this.currentActionProperties.put(PROP_ACTION_NAME, this.action);
+         // generate the summary
+         this.currentActionProperties.put(PROP_ACTION_SUMMARY, 
+               buildActionSummary(this.currentActionProperties));
+         
+         // add the populated currentActionProperties to the list
+         this.allActionsProperties.add(this.currentActionProperties);
+      }
+      
+      // reset the current action
+      this.action = null;
+   }
+
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      // create the summary using all the conditions
+      StringBuilder conditionsSummary = new StringBuilder();
+      for (Map<String, Serializable> props : this.allConditionsProperties)
+      {
+         conditionsSummary.append(props.get(PROP_CONDITION_SUMMARY));
+         conditionsSummary.append("<br/>");
+      }
+      
+      // create the summary using all the actions
+      StringBuilder actionsSummary = new StringBuilder();
+      for (Map<String, Serializable> props : this.allActionsProperties)
+      {
+         actionsSummary.append(props.get(PROP_ACTION_SUMMARY));
+         actionsSummary.append("<br/>");
+      }
+      
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      String backgroundYesNo = this.runInBackground ? bundle.getString("yes") : bundle.getString("no");
+      String subSpacesYesNo = this.applyToSubSpaces ? bundle.getString("yes") : bundle.getString("no");
+      
+      return buildSummary(
+            new String[] {bundle.getString("rule_type"), bundle.getString("name"), bundle.getString("description"),
+                          bundle.getString("apply_to_sub_spaces"), bundle.getString("run_in_background"),
+                          bundle.getString("conditions"), bundle.getString("actions")},
+            new String[] {this.type, this.title, this.description, subSpacesYesNo, backgroundYesNo, 
+                          conditionsSummary.toString(), actionsSummary.toString()});
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#back()
+    */
+   public String back()
+   {
+      // reset the drop downs when back is clicked
+      this.action = null;
+      this.condition = null;
+      
+      return super.back();
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#next()
+    */
+   public String next()
+   {
+      // reset the drop downs when next is clicked
+      this.action = null;
+      this.condition = null;
+      
+      return super.next();
+   }
+
+   /**
+    * @return Returns the description.
+    */
+   public String getDescription()
+   {
+      return description;
+   }
+   
+   /**
+    * @param description The description to set.
+    */
+   public void setDescription(String description)
+   {
+      this.description = description;
+   } 
+
+   /**
+    * @return Returns the title.
+    */
+   public String getTitle()
+   {
+      return title;
+   }
+   
+   /**
+    * @param title The title to set.
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+   
+   /**
+    * @return Returns whether the rule should run in the background
+    */
+   public boolean getRunInBackground()
+   {
+      return this.runInBackground;
+   }
+
+   /**
+    * @param runInBackground Sets whether the rule should run in the background
+    */
+   public void setRunInBackground(boolean runInBackground)
+   {
+      this.runInBackground = runInBackground;
+   }
+
+   /**
+    * @return Returns whether the rule should be applied to sub spaces i.e. if it gets inherited
+    */
+   public boolean getApplyToSubSpaces()
+   {
+      return this.applyToSubSpaces;
+   }
+
+   /**
+    * @param applyToSubSpaces Sets whether the rule will get applied to sub spaces
+    */
+   public void setApplyToSubSpaces(boolean applyToSubSpaces)
+   {
+      this.applyToSubSpaces = applyToSubSpaces;
+   }
+
+   /**
+    * @return Returns the type.
+    */
+   public String getType()
+   {
+      return type;
+   }
+
+   /**
+    * @param type The type to set
+    */
+   public void setType(String type)
+   {
+      this.type = type;
+   }
+   
+   /**
+    * @return Returns the selected condition
+    */
+   public String getCondition()
+   {
+      return this.condition;
+   }
+
+   /**
+    * @param condition Sets the selected condition
+    */
+   public void setCondition(String condition)
+   {
+      this.condition = condition;
+   }
+
+   /**
+    * @param ruleService Sets the rule service to use
+    */
+   public void setRuleService(RuleService ruleService)
+   {
+      this.ruleService = ruleService;
+   }
+   
+   /**
+    * @param mimetypeService Sets the mimetype service to use
+    */
+   public void setMimetypeService(MimetypeService mimetypeService)
+   {
+      this.mimetypeService = mimetypeService;
+   }
+   
+   /**
+    * Sets the RulesBean instance to be used by the wizard in edit mode
+    * 
+    * @param rulesBean The RulesBean
+    */
+   public void setRulesBean(RulesBean rulesBean)
+   {
+      this.rulesBean = rulesBean;
+   }
+
+   /**
+    * @return Returns the list of selectable actions
+    */
+   public List<SelectItem> getActions()
+   {
+      if (this.actions == null)
+      {
+         super.getActions();
+         
+         // add the "Select an action" entry at the beginning of the list
+         this.actions.add(0, new SelectItem("null", 
+               Application.getMessage(FacesContext.getCurrentInstance(), "select_an_action")));
+      }
+      
+      return this.actions;
+   }
+   
+   /**
+    * Returns a list of the types available in the repository
+    * 
+    * @return List of SelectItem objects
+    */
+   public List<SelectItem> getModelTypes()
+   {
+      if (this.modelTypes == null)
+      {
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Action Wizards");
+         if (wizardCfg != null)
+         {
+            ConfigElement typesCfg = wizardCfg.getConfigElement("types");
+            if (typesCfg != null)
+            {
+               FacesContext context = FacesContext.getCurrentInstance();
+               this.modelTypes = new ArrayList<SelectItem>();
+               for (ConfigElement child : typesCfg.getChildren())
+               {
+                  QName idQName = Repository.resolveToQName(child.getAttribute("name"));
+
+                  // look for a client localized string
+                  String label = null;
+                  String msgId = child.getAttribute("displayLabelId");
+                  if (msgId != null)
+                  {
+                     label = Application.getMessage(context, msgId);
+                  }
+                  
+                  // if there wasn't an externalized string look for one in the config
+                  if (label == null)
+                  {
+                     label = child.getAttribute("displayLabel");
+                  }
+
+                  // if there wasn't a client based label try and get it from the dictionary
+                  if (label == null)
+                  {
+                     TypeDefinition typeDef = this.dictionaryService.getType(idQName);
+                     if (typeDef != null)
+                     {
+                        label = typeDef.getTitle();
+                     }
+                     else
+                     {
+                        label = idQName.getLocalName();
+                     }
+                  }
+                  
+                  this.modelTypes.add(new SelectItem(idQName.toString(), label));
+               }
+               
+               // make sure the list is sorted by the label
+               QuickSort sorter = new QuickSort(this.modelTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+            else
+            {
+               logger.warn("Could not find types configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find Action Wizards configuration section");
+         }
+      }
+      
+      return this.modelTypes;
+   }
+   
+   /**
+    * Returns a list of mime types in the system
+    * 
+    * @return List of mime types
+    */
+   public List<SelectItem> getMimeTypes()
+   {
+       if (this.mimeTypes == null)
+       {
+           this.mimeTypes = new ArrayList<SelectItem>(50);
+           
+           Map<String, String> mimeTypes = mimetypeService.getDisplaysByMimetype();
+           for (String mimeType : mimeTypes.keySet())
+           {
+              this.mimeTypes.add(new SelectItem(mimeType, mimeTypes.get(mimeType)));
+           }
+           
+           // make sure the list is sorted by the values
+           QuickSort sorter = new QuickSort(this.mimeTypes, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+           sorter.sort();
+       }
+       
+       return this.mimeTypes;
+   }
+   
+   /**
+    * @return Returns the list of selectable conditions
+    */
+   public List<SelectItem> getConditions()
+   {
+      if (this.conditions == null)
+      {
+         List<ActionConditionDefinition> ruleConditions = this.actionService.getActionConditionDefinitions();
+         this.conditions = new ArrayList<SelectItem>(ruleConditions.size());
+         for (ActionConditionDefinition ruleConditionDef : ruleConditions)
+         {
+            // add to SelectItem list
+            this.conditions.add(new SelectItem(ruleConditionDef.getName(), 
+                  ruleConditionDef.getTitle()));
+         }
+         
+         // make sure the list is sorted by the label
+         QuickSort sorter = new QuickSort(this.conditions, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+         
+         // add the "Select a condition" entry at the beginning of the list
+         this.conditions.add(0, new SelectItem("null", 
+               Application.getMessage(FacesContext.getCurrentInstance(), "select_a_condition")));
+      }
+      
+      return this.conditions;
+   }
+   
+   /**
+    * @return Returns a map of all the condition descriptions 
+    */
+   public Map<String, String> getConditionDescriptions()
+   {
+      if (this.conditionDescriptions == null)
+      {
+         List<ActionConditionDefinition> ruleConditions = this.actionService.getActionConditionDefinitions();
+         this.conditionDescriptions = new HashMap<String, String>(ruleConditions.size());
+         for (ActionConditionDefinition ruleConditionDef : ruleConditions)
+         {
+            this.conditionDescriptions.put(ruleConditionDef.getName(), 
+                  ruleConditionDef.getDescription());
+         }
+      }
+      
+      return this.conditionDescriptions;
+   }
+
+   /**
+    * @return Returns the types of rules that can be defined
+    */
+   public List<SelectItem> getTypes()
+   {
+      if (this.types == null)
+      {
+         List<RuleType> ruleTypes = this.ruleService.getRuleTypes();
+         this.types = new ArrayList<SelectItem>(ruleTypes.size());
+         for (RuleType ruleType : ruleTypes)
+         {
+            this.types.add(new SelectItem(ruleType.getName(), ruleType.getDisplayLabel()));
+         }
+      }
+      
+      return this.types;
+   }
+   
+   /**
+    * @return Gets the condition settings 
+    */
+   public Map<String, Serializable> getConditionProperties()
+   {
+      return this.currentConditionProperties;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "details";
+            break;
+         }
+         case 2:
+         {
+            outcome = "condition";
+            break;
+         }
+         case 3:
+         {
+            outcome = "action";
+            break;
+         }
+         case 4:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Builds the Map of properties for the given condition in the format the repo is expecting
+    * 
+    * @param params The Map of properties built from the UI
+    * @return The Map the repo is expecting
+    */
+   protected Map<String, Serializable> buildConditionParams(Map<String, Serializable> params)
+   {
+      Map<String, Serializable> repoParams = new HashMap<String, Serializable>(params.size());
+      
+      String condName = (String)params.get(PROP_CONDITION_NAME);
+      if (condName.equals(ComparePropertyValueEvaluator.NAME))
+      {
+         repoParams.put(ComparePropertyValueEvaluator.PARAM_VALUE, params.get(PROP_CONTAINS_TEXT));
+      }
+      else if (condName.equals(InCategoryEvaluator.NAME))
+      {
+         // put the selected category in the condition params
+         repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_VALUE, params.get(PROP_CATEGORY));
+         
+         // add the classifiable aspect
+         repoParams.put(InCategoryEvaluator.PARAM_CATEGORY_ASPECT, ContentModel.ASPECT_GEN_CLASSIFIABLE);
+      }
+      else if (condName.equals(IsSubTypeEvaluator.NAME))
+      {
+         // add the model type
+         repoParams.put(IsSubTypeEvaluator.PARAM_TYPE, QName.createQName((String)params.get(PROP_MODEL_TYPE)));
+      }
+      else if (condName.equals(HasAspectEvaluator.NAME))
+      {
+         // add the aspect
+         repoParams.put(HasAspectEvaluator.PARAM_ASPECT, QName.createQName((String)params.get(PROP_ASPECT)));
+      }
+      else if (condName.equals(CompareMimeTypeEvaluator.NAME))
+      {
+          repoParams.put(CompareMimeTypeEvaluator.PARAM_VALUE, params.get(PROP_MIMETYPE));
+      }
+      
+      return repoParams;
+   }
+   
+   /**
+    * Populates a Map of properties the wizard is expecting for the given condition
+    * 
+    * @param condition The condition to build the map for
+    */
+   protected Map<String, Serializable> populateCondition(ActionCondition condition)
+   {
+      // find out what the condition is called
+      Map<String, Serializable> condProps = new HashMap<String, Serializable>(3);
+      String name = condition.getActionConditionDefinitionName();
+      condProps.put(PROP_CONDITION_NAME, name);
+      
+      // add the appropriate properties
+      Map<String, Serializable> repoCondProps = condition.getParameterValues();
+      if (name.equals(ComparePropertyValueEvaluator.NAME))
+      {
+         condProps.put(PROP_CONTAINS_TEXT, (String)repoCondProps.get(ComparePropertyValueEvaluator.PARAM_VALUE));
+      }
+      else if (name.equals(InCategoryEvaluator.NAME))
+      {
+         NodeRef catNodeRef = (NodeRef)repoCondProps.get(InCategoryEvaluator.PARAM_CATEGORY_VALUE);
+         condProps.put(PROP_CATEGORY, catNodeRef);
+      }
+      else if (name.equals(IsSubTypeEvaluator.NAME))
+      {
+         condProps.put(PROP_MODEL_TYPE, ((QName)repoCondProps.get(IsSubTypeEvaluator.PARAM_TYPE)).toString());
+      }
+      else if (name.equals(HasAspectEvaluator.NAME))
+      {
+         condProps.put(PROP_ASPECT, ((QName)repoCondProps.get(HasAspectEvaluator.PARAM_ASPECT)).toString());
+      }
+      else if (name.equals(CompareMimeTypeEvaluator.NAME))
+      {
+          condProps.put(PROP_MIMETYPE, repoCondProps.get(CompareMimeTypeEvaluator.PARAM_VALUE));
+      }
+      
+      // specify whether the condition result should be inverted
+      condProps.put(PROP_CONDITION_NOT, Boolean.valueOf(condition.getInvertCondition()));
+      
+      // generate the summary 
+      condProps.put(PROP_CONDITION_SUMMARY, buildConditionSummary(condProps));
+         
+      return condProps;
+   }
+   
+   /**
+    * Returns a summary string for the given condition parameters
+    * 
+    * @return The summary or null if a summary could not be built
+    */
+   protected String buildConditionSummary(Map<String, Serializable> props)
+   {
+      String summaryResult = null;
+      
+      String condName = (String)props.get(PROP_CONDITION_NAME);
+      if (condName != null)
+      {
+         StringBuilder summary = new StringBuilder();
+         
+         String msgId = "condition_" + condName.replace('-', '_');
+         
+         // JSF is putting the boolean into the map as a Boolean object so we
+         // need to handle that - adding a converter doesn't seem to help!
+         Boolean not = (Boolean)props.get(PROP_CONDITION_NOT);
+         if (not.booleanValue())
+         {
+            msgId = msgId + "_not";
+         }
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Looking up condition summary string: " + msgId);
+         
+         summary.append(Application.getMessage(FacesContext.getCurrentInstance(), msgId));
+         summary.append(" ");
+         
+         // define a summary to be added for each condition
+         if ("in-category".equals(condName))
+         {
+            String name = Repository.getNameForNode(this.nodeService, (NodeRef)props.get(PROP_CATEGORY));
+            summary.append("'").append(name).append("'");
+         }
+         else if ("compare-property-value".equals(condName))
+         {
+            summary.append("'");
+            summary.append(props.get(PROP_CONTAINS_TEXT));
+            summary.append("'");
+         }
+         else if ("is-subtype".equals(condName))
+         {
+            // find the label used by looking through the SelectItem list
+            String typeName = (String)props.get(PROP_MODEL_TYPE);
+            for (SelectItem item : this.getModelTypes())
+            {
+               if (item.getValue().equals(typeName))
+               {
+                  summary.append("'").append(item.getLabel()).append("'");
+                  break;
+               }
+            }
+         }
+         else if ("has-aspect".equals(condName))
+         {
+            // find the label used by looking through the SelectItem list
+            String aspectName = (String)props.get(PROP_ASPECT);
+            for (SelectItem item : this.getAspects())
+            {
+               if (item.getValue().equals(aspectName))
+               {
+                  summary.append("'").append(item.getLabel()).append("'");
+                  break;
+               }
+            }
+         }
+         else if (CompareMimeTypeEvaluator.NAME.equals(condName))
+         {
+            String mimetype = (String)props.get(PROP_MIMETYPE);
+            for (SelectItem item : this.getMimeTypes())
+            {
+               if (item.getValue().equals(mimetype))
+               {
+                  summary.append("'").append(item.getLabel()).append("'");
+                  break;
+               }
+            }
+         }
+         
+         summaryResult = summary.toString();
+      }
+      
+      return summaryResult;
+   }
+   
+   /**
+    * Returns a summary string for the given action parameters
+    * 
+    * @return The summary or null if a summary could not be built
+    */
+   protected String buildActionSummary(Map<String, Serializable> props)
+   {
+      String summaryResult = null;
+      
+      String actionName = (String)this.currentActionProperties.get(PROP_ACTION_NAME);
+      if (actionName != null)
+      {
+         StringBuilder summary = new StringBuilder();
+         summary.append(Application.getMessage(FacesContext.getCurrentInstance(), 
+               "action_" + actionName.replace('-', '_')));
+         summary.append(" ");
+         
+         // define a summary to be added for each action
+         if ("add-features".equals(actionName))
+         {
+            String aspect = (String)this.currentActionProperties.get(PROP_ASPECT);
+            
+            // find the label used by looking through the SelectItem list
+            for (SelectItem item : this.getAspects())
+            {
+               if (item.getValue().equals(aspect))
+               {
+                  summary.append("'").append(item.getLabel()).append("'");
+                  break;
+               }
+            }
+         }
+         else if ("simple-workflow".equals(actionName))
+         {
+            // just leave the summary as the title for now
+            String approveStepName = (String)this.currentActionProperties.get(PROP_APPROVE_STEP_NAME);
+            String approveAction = (String)this.currentActionProperties.get(PROP_APPROVE_ACTION);
+            NodeRef approveFolder = (NodeRef)this.currentActionProperties.get(PROP_APPROVE_FOLDER);
+            String approveFolderName = Repository.getNameForNode(this.nodeService, approveFolder);
+            String approveMsg = MessageFormat.format(summary.toString(), 
+                  new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), approveAction), 
+                                approveFolderName, approveStepName});
+            
+            String rejectStep = (String)this.currentActionProperties.get(PROP_REJECT_STEP_PRESENT);
+            
+            String rejectMsg = null;
+            if (rejectStep != null && "yes".equals(rejectStep))
+            {
+               String rejectStepName = (String)this.currentActionProperties.get(PROP_REJECT_STEP_NAME);
+               String rejectAction = (String)this.currentActionProperties.get(PROP_REJECT_ACTION);
+               NodeRef rejectFolder = (NodeRef)this.currentActionProperties.get(PROP_REJECT_FOLDER);
+               String rejectFolderName = Repository.getNameForNode(this.nodeService, rejectFolder);
+               rejectMsg = MessageFormat.format(summary.toString(), 
+                  new Object[] {Application.getMessage(FacesContext.getCurrentInstance(), rejectAction),
+                                rejectFolderName, rejectStepName});
+            }
+            
+            summary = new StringBuilder(approveMsg);
+            if (rejectMsg != null)
+            {
+               summary.append(" ");
+               summary.append(rejectMsg);
+            }
+         }
+         else if ("link-category".equals(actionName))
+         {
+            NodeRef cat = (NodeRef)this.currentActionProperties.get(PROP_CATEGORY);
+            String name = Repository.getNameForNode(this.nodeService, cat);
+            summary.append("'").append(name).append("'");
+         }
+         else if ("transform".equals(actionName))
+         {
+            NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+            String name = Repository.getNameForNode(this.nodeService, space);
+            String transformer = (String)this.currentActionProperties.get(PROP_TRANSFORMER);
+            
+            // find the label used by looking through the SelectItem list
+            for (SelectItem item : this.getTransformers())
+            {
+               if (item.getValue().equals(transformer))
+               {
+                  transformer = item.getLabel();
+                  break;
+               }
+            }
+            
+            // recreate the summary object as it contains parameters
+            String msg = MessageFormat.format(summary.toString(), new Object[] {name, transformer});
+            summary = new StringBuilder(msg);
+         }
+         else if ("transform-image".equals(actionName))
+         {
+            NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+            String name = Repository.getNameForNode(this.nodeService, space);
+            String transformer = (String)this.currentActionProperties.get(PROP_IMAGE_TRANSFORMER);
+            String option = (String)this.currentActionProperties.get(PROP_TRANSFORM_OPTIONS);
+            
+            // find the label used by looking through the SelectItem list
+            for (SelectItem item : this.getImageTransformers())
+            {
+               if (item.getValue().equals(transformer))
+               {
+                  transformer = item.getLabel();
+                  break;
+               }
+            }
+            
+            // recreate the summary object as it contains parameters
+            String msg = MessageFormat.format(summary.toString(), new Object[] {name, transformer, option});
+            summary = new StringBuilder(msg);
+         }
+         else if ("copy".equals(actionName) || "move".equals(actionName) || "check-out".equals(actionName))
+         {
+            NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+            String spaceName = Repository.getNameForNode(this.nodeService, space);
+            summary.append("'").append(spaceName).append("'");
+         }
+         else if ("mail".equals(actionName))
+         {
+            String address = (String)this.currentActionProperties.get(PROP_TO);
+            summary.append("'").append(address).append("'");
+         }
+         else if ("check-in".equals(actionName))
+         {
+            String comment = (String)this.currentActionProperties.get(PROP_CHECKIN_DESC);
+            Boolean minorChange = (Boolean)this.currentActionProperties.get(PROP_CHECKIN_MINOR);
+            String change = null;
+            if (minorChange != null && minorChange.booleanValue())
+            {
+               change = Application.getMessage(FacesContext.getCurrentInstance(), "minor_change");
+            }
+            else
+            {
+               change = Application.getMessage(FacesContext.getCurrentInstance(), "major_change");
+            }
+            
+            // recreate the summary object as it contains parameters
+            String msg = MessageFormat.format(summary.toString(), new Object[] {change, comment});
+            summary = new StringBuilder(msg);
+         }
+         else if ("import".equals(actionName))
+         {
+            NodeRef space = (NodeRef)this.currentActionProperties.get(PROP_DESTINATION);
+            String spaceName = Repository.getNameForNode(this.nodeService, space);
+            summary.append("'").append(spaceName).append("'");
+         }
+         else if (SpecialiseTypeActionExecuter.NAME.equals(actionName) == true)
+         {
+             String label = null;
+             String objectType = (String)this.currentActionProperties.get(PROP_OBJECT_TYPE);
+             for (SelectItem item  : getObjectTypes())
+             {
+                if (item.getValue().equals(objectType) == true)
+                {
+                    label = item.getLabel();
+                    break;
+                }
+             }
+             
+             summary.append("'").append(label).append("'");
+         }
+
+         summaryResult = summary.toString();
+      }
+      
+      return summaryResult;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
new file mode 100644
index 0000000000..cdf122bd68
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
@@ -0,0 +1,1002 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.DynamicNamespacePrefixResolver;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIListItem;
+import org.alfresco.web.ui.common.component.description.UIDescription;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Handler class used by the New Space Wizard 
+ * 
+ * @author gavinc
+ */
+public class NewSpaceWizard extends AbstractWizardBean
+{
+   public static final String SPACE_ICON_DEFAULT = "space-icon-default";
+   public static final String FORUMS_ICON_DEFAULT = "forums_large";
+
+   private static Log logger = LogFactory.getLog(NewSpaceWizard.class);
+   
+   // TODO: retrieve these from the config service
+   private static final String WIZARD_TITLE_ID = "new_space_title";
+   private static final String WIZARD_DESC_ID = "new_space_desc";
+   private static final String STEP1_TITLE_ID = "new_space_step1_title";
+   private static final String STEP1_DESCRIPTION_ID = "new_space_step1_desc";
+   private static final String STEP2_TITLE_ID = "new_space_step2_title";
+   private static final String STEP2_DESCRIPTION_ID = "new_space_step2_desc";
+   private static final String STEP3_TITLE_ID = "new_space_step3_title";
+   private static final String STEP3_DESCRIPTION_ID = "new_space_step3_desc";
+   private static final String FINISH_INSTRUCTION_ID = "new_space_finish_instruction";
+   
+   private static final String ERROR = "error_space";
+   private static final String DEFAULT_SPACE_TYPE_ICON = "/images/icons/space.gif";
+
+   // new space wizard specific properties
+   private SearchService searchService;
+   private DictionaryService dictionaryService;
+   
+   protected String spaceType;
+   protected String icon;
+   protected String createFrom;
+   protected NodeRef existingSpaceId;
+   protected String templateSpaceId;
+   protected String copyPolicy;
+   protected String name;
+   protected String description;
+   protected String templateName;
+   protected boolean saveAsTemplate;
+   protected List<SelectItem> templates;
+   protected List<UIListItem> folderTypes;
+   protected List<UIListItem> genericIcons;
+   protected List<UIListItem> forumsIcons;
+   protected List<UIDescription> folderTypeDescriptions;
+   
+   // the NodeRef of the node created during finish
+   protected NodeRef createdNode;
+   
+   /**
+    * Deals with the finish button being pressed
+    * 
+    * @return outcome
+    */
+   public String finish()
+   {
+      String outcome = FINISH_OUTCOME;
+      
+      UserTransaction tx = null;
+   
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance());
+         tx.begin();
+
+         if (this.editMode)
+         {
+            // update the existing node in the repository
+            Node currentSpace = this.browseBean.getActionSpace();
+            NodeRef nodeRef = currentSpace.getNodeRef();
+            
+            // rename if necessary
+            fileFolderService.rename(nodeRef, this.name);
+            
+            // update the properties
+            Map<QName, Serializable> properties = this.nodeService.getProperties(nodeRef);
+            properties.put(ContentModel.PROP_NAME, this.name);
+            properties.put(ContentModel.PROP_ICON, this.icon);
+            properties.put(ContentModel.PROP_DESCRIPTION, this.description);
+            
+            // apply properties
+            this.nodeService.setProperties(nodeRef, properties);
+         }
+         else
+         {
+            String newSpaceId = null;
+            
+            if (this.createFrom.equals("scratch"))
+            {
+               // create the space (just create a folder for now)
+               NodeRef parentNodeRef;
+               String nodeId = getNavigator().getCurrentNodeId();
+               if (nodeId == null)
+               {
+                  parentNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+               }
+               else
+               {
+                  parentNodeRef = new NodeRef(Repository.getStoreRef(), nodeId);
+               }
+               
+               FileInfo fileInfo = fileFolderService.create(
+                     parentNodeRef,
+                     this.name,
+                     Repository.resolveToQName(this.spaceType));
+               NodeRef nodeRef = fileInfo.getNodeRef();
+               newSpaceId = nodeRef.getId();
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Created folder node with name: " + this.name);
+
+               // apply the uifacets aspect - icon, title and description props
+               Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(5);
+               uiFacetsProps.put(ContentModel.PROP_ICON, this.icon);
+               uiFacetsProps.put(ContentModel.PROP_TITLE, this.name);
+               uiFacetsProps.put(ContentModel.PROP_DESCRIPTION, this.description);
+               this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_UIFACETS, uiFacetsProps);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Added uifacets aspect with properties: " + uiFacetsProps);
+               
+               // remember the created node
+               this.createdNode = nodeRef;
+            }
+            else if (this.createFrom.equals("existing"))
+            {
+               // copy the selected space and update the name, description and icon
+               NodeRef sourceNode = this.existingSpaceId;
+               NodeRef parentSpace = new NodeRef(Repository.getStoreRef(), getNavigator().getCurrentNodeId());
+               
+               // copy from existing
+               NodeRef copiedNode = this.fileFolderService.copy(sourceNode, parentSpace, this.name).getNodeRef(); 
+               
+               // also need to set the new description and icon properties
+               this.nodeService.setProperty(copiedNode, ContentModel.PROP_DESCRIPTION, this.description);
+               this.nodeService.setProperty(copiedNode, ContentModel.PROP_ICON, this.icon);
+               
+               newSpaceId = copiedNode.getId();
+                  
+               if (logger.isDebugEnabled())
+                  logger.debug("Copied space with id of " + sourceNode.getId() + " to " + this.name);
+               
+               // remember the created node
+               this.createdNode = copiedNode;
+            }
+            else if (this.createFrom.equals("template"))
+            {
+               // copy the selected space and update the name, description and icon
+               NodeRef sourceNode = new NodeRef(Repository.getStoreRef(), this.templateSpaceId);
+               NodeRef parentSpace = new NodeRef(Repository.getStoreRef(), getNavigator().getCurrentNodeId());
+               // copy from the template
+               NodeRef copiedNode = this.fileFolderService.copy(sourceNode, parentSpace, this.name).getNodeRef();
+               // also need to set the new description and icon properties
+               this.nodeService.setProperty(copiedNode, ContentModel.PROP_DESCRIPTION, this.description);
+               this.nodeService.setProperty(copiedNode, ContentModel.PROP_ICON, this.icon);
+               
+               newSpaceId = copiedNode.getId();
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Copied template space with id of " + sourceNode.getId() + " to " + this.name);
+               
+               // remember the created node
+               this.createdNode = copiedNode;
+            }
+            
+            // if the user selected to save the space as a template space copy the new
+            // space to the templates folder
+            if (this.saveAsTemplate)
+            {
+               // get hold of the Templates node
+               DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
+               namespacePrefixResolver.registerNamespace(NamespaceService.APP_MODEL_PREFIX, NamespaceService.APP_MODEL_1_0_URI);
+               
+               String xpath = Application.getRootPath(FacesContext.getCurrentInstance()) + "/" +
+                     Application.getGlossaryFolderName(FacesContext.getCurrentInstance()) + "/" +
+                     Application.getSpaceTemplatesFolderName(FacesContext.getCurrentInstance());
+               
+               NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+               List<NodeRef> templateNodeList = this.searchService.selectNodes(
+                     rootNodeRef,
+                     xpath, null, namespacePrefixResolver, false);
+               if (templateNodeList.size() == 1)
+               {
+                  // get the first item in the list as we from test above there is only one!
+                  NodeRef templateNode = templateNodeList.get(0);
+                  NodeRef sourceNode = new NodeRef(Repository.getStoreRef(), newSpaceId);
+                  // copy this to the template location
+                  fileFolderService.copy(sourceNode, templateNode, this.templateName);
+               }
+            }
+         }
+         
+         // give subclasses a chance to perform custom processing before committing
+         performCustomProcessing(context);
+         
+         // commit the transaction
+         tx.commit();
+         
+         // now we know the new details are in the repository, reset the
+         // client side node representation so the new details are retrieved
+         String statusMsg = null;
+         if (this.editMode)
+         {
+            this.browseBean.getActionSpace().reset();
+            statusMsg = MessageFormat.format(Application.getMessage(context, "status_space_updated"), 
+                  new Object[]{this.name});
+         }
+         else
+         {
+            // add a message to inform the user that the creation was OK
+            statusMsg = MessageFormat.format(Application.getMessage(context, "status_space_created"), 
+                  new Object[]{this.name});
+         }
+         
+         // add the status message
+         Utils.addStatusMessage(FacesMessage.SEVERITY_INFO, statusMsg);
+      }
+      catch (FileExistsException e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         // print status message  
+         String statusMsg = MessageFormat.format(
+               Application.getMessage(
+                     FacesContext.getCurrentInstance(), "error_exists"), 
+                     e.getExisting().getName());
+         Utils.addErrorMessage(statusMsg);
+         // no outcome
+         outcome = null;
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
+         outcome = null;
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_ID);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_ID);
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_DESCRIPTION_ID);
+            break;
+         }
+         case 2:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_DESCRIPTION_ID);
+            break;
+         }
+         case 3:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_DESCRIPTION_ID);
+            break;
+         }
+         case 4:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+      
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+      
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP3_TITLE_ID);
+            break;
+         }
+         case 4:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+      
+      return stepTitle;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+      
+      switch (this.currentStep)
+      {
+         case 4:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+      
+      return stepInstruction;
+   }
+   
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+      
+      // clear the cached query results
+      if (this.templates != null)
+      {
+         this.templates.clear();
+         this.templates = null;
+      }
+      
+      // reset all variables
+      this.createFrom = "scratch";
+      this.spaceType = ContentModel.TYPE_FOLDER.toString();
+      this.icon = SPACE_ICON_DEFAULT;
+      this.copyPolicy = "contents";
+      this.existingSpaceId = null;
+      this.templateSpaceId = null;
+      this.name = null;
+      this.description = "";
+      this.templateName = null;
+      this.saveAsTemplate = false;  
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#populate()
+    */
+   public void populate()
+   {
+      // get hold of the current node and populate the appropriate values
+      Node currentSpace = browseBean.getActionSpace();
+      Map<String, Object> props = currentSpace.getProperties();
+      
+      this.name = (String)props.get("name");
+      this.description = (String)props.get("description");
+      this.icon = (String)props.get("app:icon");
+   }
+
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      String summaryCreateType = null;
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+      
+      if (this.createFrom.equals("scratch"))
+      {
+         summaryCreateType = bundle.getString("scratch");
+      }
+      else if (this.createFrom.equals("existing"))
+      {
+         summaryCreateType = bundle.getString("an_existing_space");
+      }
+      else if (this.createFrom.equals("template"))
+      {
+         summaryCreateType = bundle.getString("a_template");
+      }
+      
+//      String summarySaveAsTemplate = this.saveAsTemplate ? bundle.getString("yes") : bundle.getString("no");
+//      bundle.getString("save_as_template"), bundle.getString("template_name")},
+//      summarySaveAsTemplate, this.templateName
+      
+      String spaceTypeLabel = null;
+      for (UIListItem item : this.getFolderTypes())
+      {
+         if (item.getValue().equals(this.spaceType))
+         {
+            spaceTypeLabel = item.getLabel();
+            break;
+         }
+      }
+      
+      return buildSummary(
+            new String[] {bundle.getString("space_type"), bundle.getString("name"), 
+                          bundle.getString("description"), bundle.getString("creating_from")},
+            new String[] {spaceTypeLabel, this.name, this.description, summaryCreateType});
+   }
+   
+   /**
+    * @return Returns a list of template spaces currently in the system
+    */
+   public List<SelectItem> getTemplateSpaces()
+   {      
+      if (this.templates == null)
+      {
+         this.templates = new ArrayList<SelectItem>();
+         
+         FacesContext context = FacesContext.getCurrentInstance();
+         String xpath = Application.getRootPath(context) + "/" + Application.getGlossaryFolderName(context) +
+               "/" + Application.getSpaceTemplatesFolderName(context) + "/*";
+         NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+         NamespaceService resolver = Repository.getServiceRegistry(context).getNamespaceService();
+         List<NodeRef> results = this.searchService.selectNodes(rootNodeRef, xpath, null, resolver, false);
+         
+         if (results.size() > 0)
+         {
+            for (NodeRef assocRef : results)
+            {
+               Node childNode = new Node(assocRef);
+               this.templates.add(new SelectItem(childNode.getId(), childNode.getName()));
+            }
+            
+            // make sure the list is sorted by the label
+            QuickSort sorter = new QuickSort(this.templates, "label", true, IDataContainer.SORT_CASEINSENSITIVE);
+            sorter.sort();
+         }
+         
+         // add an entry (at the start) to instruct the user to select a template
+         this.templates.add(0, new SelectItem("none", Application.getMessage(FacesContext.getCurrentInstance(), "select_a_template")));
+      }
+      
+      return this.templates;
+   }
+
+   /**
+    * Returns a list of UIListItem objects representing the folder types 
+    * and also constructs the list of descriptions for each type
+    * 
+    * @return List of UIListItem components
+    */
+   @SuppressWarnings("unchecked")
+   public List<UIListItem> getFolderTypes()
+   {
+      if (this.folderTypes == null)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         this.folderTypes = new ArrayList<UIListItem>(2);
+         this.folderTypeDescriptions = new ArrayList<UIDescription>(2);
+         
+         // add the well known 'container space' type to start with
+         UIListItem defaultItem = new UIListItem();
+         String defaultLabel = Application.getMessage(context, "container");
+         defaultItem.setValue(ContentModel.TYPE_FOLDER.toString());
+         defaultItem.setLabel(defaultLabel);
+         defaultItem.setTooltip(defaultLabel);
+         defaultItem.getAttributes().put("image", DEFAULT_SPACE_TYPE_ICON);
+         this.folderTypes.add(defaultItem);
+         
+         UIDescription defaultDesc = new UIDescription();
+         defaultDesc.setControlValue(ContentModel.TYPE_FOLDER.toString());
+         defaultDesc.setText(Application.getMessage(context, "container_desc"));
+         this.folderTypeDescriptions.add(defaultDesc);
+         
+         // add any configured content sub-types to the list
+         ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+               FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+         Config wizardCfg = svc.getConfig("Custom Folder Types");
+         if (wizardCfg != null)
+         {
+            ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types");
+            if (typesCfg != null)
+            {               
+               for (ConfigElement child : typesCfg.getChildren())
+               {
+                  QName idQName = Repository.resolveToQName(child.getAttribute("name"));
+                  TypeDefinition typeDef = this.dictionaryService.getType(idQName);
+                  
+                  if (typeDef != null &&
+                      this.dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER))
+                  {
+                     // look for a client localized string
+                     String label = null;
+                     String msgId = child.getAttribute("displayLabelId");
+                     if (msgId != null)
+                     {
+                        label = Application.getMessage(context, msgId);
+                     }
+                     
+                     // if there wasn't an externalized string look for one in the config
+                     if (label == null)
+                     {
+                        label = child.getAttribute("displayLabel");
+                     }
+   
+                     // if there wasn't a client based label try and get it from the dictionary
+                     if (label == null)
+                     {
+                        label = typeDef.getTitle();
+                     }
+                     
+                     // finally use the localname if we still haven't found a label
+                     if (label == null)
+                     {
+                        label = idQName.getLocalName();
+                     }
+                     
+                     // resolve a description string for the type
+                     String description = null;
+                     msgId = child.getAttribute("descriptionMsgId");
+                     if (msgId != null)
+                     {
+                        description = Application.getMessage(context, msgId);
+                     }
+                     
+                     if (description == null)
+                     {
+                        description = child.getAttribute("description");
+                     }
+                     
+                     // if we don't have a local description just use the label
+                     if (description == null)
+                     {
+                        description = label;
+                     }
+                     
+                     // extract the icon to use from the config
+                     String icon = child.getAttribute("icon");
+                     if (icon == null || icon.length() == 0)
+                     {
+                        icon = DEFAULT_SPACE_TYPE_ICON;
+                     }
+                     
+                     UIListItem item = new UIListItem();
+                     item.getAttributes().put("value", idQName.toString());
+                     item.getAttributes().put("label", label);
+                     item.getAttributes().put("tooltip", label);
+                     item.getAttributes().put("image", icon);
+                     this.folderTypes.add(item);
+                     
+                     UIDescription desc = new UIDescription();
+                     desc.setControlValue(idQName.toString());
+                     desc.setText(description);
+                     this.folderTypeDescriptions.add(desc);
+                  }
+               }
+            }
+            else
+            {
+               logger.warn("Could not find 'folder-types' configuration element");
+            }
+         }
+         else
+         {
+            logger.warn("Could not find 'Custom Folder Types' configuration section");
+         }
+         
+      }
+      
+      return this.folderTypes;
+   }
+   
+   /**
+    * Returns a list of UIDescription objects for the folder types
+    * 
+    * @return A list of UIDescription objects
+    */
+   public List<UIDescription> getFolderTypeDescriptions()
+   {
+      if (this.folderTypeDescriptions == null)
+      {
+         // call the getFolderType method to construct the list
+         getFolderTypes();
+      }
+      
+      return this.folderTypeDescriptions;
+   }
+   
+   /**
+    * Returns a list of icons to allow the user to select from.
+    * The list can change according to the type of space being created.
+    * 
+    * @return A list of icons
+    */
+   @SuppressWarnings("unchecked")
+   public List<UIListItem> getIcons()
+   {
+      // TODO: Drive the list of icons to show for each space type from the config
+      //       this will then remove the dependency on forums from this generic 
+      //       class
+      
+      List<UIListItem> icons = null;
+      
+      if (this.spaceType.equals(ForumModel.TYPE_FORUMS.toString()))
+      {
+         // return the various forum icons
+         if (this.forumsIcons == null)
+         {
+            this.forumsIcons = new ArrayList<UIListItem>(2);
+            
+            // change default icon to be forums
+            this.icon = FORUMS_ICON_DEFAULT;
+            
+            UIListItem item = new UIListItem();
+            item.setValue(FORUMS_ICON_DEFAULT);
+            item.getAttributes().put("image", "/images/icons/forums_large.gif");
+            this.forumsIcons.add(item);
+         }
+         
+         icons = this.forumsIcons;
+      }
+      else
+      {
+         // return the generic space icons
+         if (this.genericIcons == null)
+         {
+            this.genericIcons = new ArrayList<UIListItem>(6);
+            
+            // change default icon
+            this.icon = SPACE_ICON_DEFAULT;
+            
+            UIListItem item = new UIListItem();
+            item.setValue("space-icon-default");
+            item.getAttributes().put("image", "/images/icons/space-icon-default.gif");
+            this.genericIcons.add(item);
+            
+            item = new UIListItem();
+            item.setValue("space-icon-star");
+            item.getAttributes().put("image", "/images/icons/space-icon-star.gif");
+            this.genericIcons.add(item);
+            
+            item = new UIListItem();
+            item.setValue("space-icon-doc");
+            item.getAttributes().put("image", "/images/icons/space-icon-doc.gif");
+            this.genericIcons.add(item);
+            
+            item = new UIListItem();
+            item.setValue("space-icon-pen");
+            item.getAttributes().put("image", "/images/icons/space-icon-pen.gif");
+            this.genericIcons.add(item);
+            
+            item = new UIListItem();
+            item.setValue("space-icon-cd");
+            item.getAttributes().put("image", "/images/icons/space-icon-cd.gif");
+            this.genericIcons.add(item);
+            
+            item = new UIListItem();
+            item.setValue("space-icon-image");
+            item.getAttributes().put("image", "/images/icons/space-icon-image.gif");
+            this.genericIcons.add(item);
+         }
+         
+         icons = this.genericIcons;
+      }
+      
+      return icons;
+   }
+   
+   /**
+    * @return Returns the searchService.
+    */
+   public SearchService getSearchService()
+   {
+      return searchService;
+   }
+
+   /**
+    * @param searchService The searchService to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * Sets the dictionary service
+    * 
+    * @param dictionaryService  the dictionary service
+    */
+   public void setDictionaryService(DictionaryService dictionaryService)
+   {
+      this.dictionaryService = dictionaryService;
+   }
+   
+   /**
+    * @return Returns the copyPolicy.
+    */
+   public String getCopyPolicy()
+   {
+      return copyPolicy;
+   }
+
+   /**
+    * @param copyPolicy The copyPolicy to set.
+    */
+   public void setCopyPolicy(String copyPolicy)
+   {
+      this.copyPolicy = copyPolicy;
+   }
+   
+   /**
+    * @return Returns the createFrom.
+    */
+   public String getCreateFrom()
+   {
+      return createFrom;
+   }
+
+   /**
+    * @param createFrom The createFrom to set.
+    */
+   public void setCreateFrom(String createFrom)
+   {
+      this.createFrom = createFrom;
+   }
+
+   /**
+    * @return Returns the description.
+    */
+   public String getDescription()
+   {
+      return description;
+   }
+   
+   /**
+    * @param description The description to set.
+    */
+   public void setDescription(String description)
+   {
+      this.description = description;
+   } 
+
+   /**
+    * @return Returns the existingSpaceId.
+    */
+   public NodeRef getExistingSpaceId()
+   {
+      return existingSpaceId;
+   }
+   
+   /**
+    * @param existingSpaceId The existingSpaceId to set.
+    */
+   public void setExistingSpaceId(NodeRef existingSpaceId)
+   {
+      this.existingSpaceId = existingSpaceId;
+   }
+   
+   /**
+    * @return Returns the icon.
+    */
+   public String getIcon()
+   {
+      return icon;
+   }
+   
+   /**
+    * @param icon The icon to set.
+    */
+   public void setIcon(String icon)
+   {
+      this.icon = icon;
+   }
+   
+   /**
+    * @return Returns the name.
+    */
+   public String getName()
+   {
+      return name;
+   }
+   
+   /**
+    * @param name The name to set.
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   /**
+    * @return Returns the saveAsTemplate.
+    */
+   public boolean isSaveAsTemplate()
+   {
+      return saveAsTemplate;
+   }
+   
+   /**
+    * @param saveAsTemplate The saveAsTemplate to set.
+    */
+   public void setSaveAsTemplate(boolean saveAsTemplate)
+   {
+      this.saveAsTemplate = saveAsTemplate;
+   }
+
+   /**
+    * @return Returns the spaceType.
+    */
+   public String getSpaceType()
+   {
+      return spaceType;
+   }
+   
+   /**
+    * @param spaceType The spaceType to set.
+    */
+   public void setSpaceType(String spaceType)
+   {
+      this.spaceType = spaceType;
+   }
+   
+   /**
+    * @return Returns the templateName.
+    */
+   public String getTemplateName()
+   {
+      return templateName;
+   }
+   
+   /**
+    * @param templateName The templateName to set.
+    */
+   public void setTemplateName(String templateName)
+   {
+      this.templateName = templateName;
+   }
+   
+   /**
+    * @return Returns the templateSpaceId.
+    */
+   public String getTemplateSpaceId()
+   {
+      return templateSpaceId;
+   }
+   
+   /**
+    * @param templateSpaceId The templateSpaceId to set.
+    */
+   public void setTemplateSpaceId(String templateSpaceId)
+   {
+      this.templateSpaceId = templateSpaceId;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+      
+      switch(step)
+      {
+         case 1:
+         {
+            outcome = "create-from";
+            break;
+         }
+         case 2:
+         {
+            if (createFrom.equalsIgnoreCase("scratch"))
+            {
+               outcome = "from-scratch";
+            }
+            else if (createFrom.equalsIgnoreCase("existing"))
+            {
+               outcome = "from-existing";
+            }
+            else if (createFrom.equalsIgnoreCase("template"))
+            {
+               outcome = "from-template";
+            }
+            
+            break;
+         }
+         case 3:
+         {
+            outcome = "details";
+            break;
+         }
+         case 4:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+      
+      return outcome;
+   }
+   
+   /**
+    * Performs any processing sub classes may wish to do before commit is called
+    * 
+    * @param context Faces context
+    */
+   protected void performCustomProcessing(FacesContext context)
+   {
+      // used by subclasses if necessary
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java b/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java
new file mode 100644
index 0000000000..562f8db323
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.component.UIListItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Wizard bean used for creating and editing topic spaces
+ * 
+ * @author gavinc
+ */
+public class NewTopicWizard extends NewSpaceWizard
+{
+   public static final String TOPIC_ICON_DEFAULT = "topic_large";
+   
+   private static final Log logger = LogFactory.getLog(NewTopicWizard.class);
+   
+   protected String message;
+   protected String topicType;
+   protected List<UIListItem> topicIcons;
+   protected List<SelectItem> topicTypes;
+   
+   protected ContentService contentService;
+   
+   /**
+    * Returns a list of topic types for the user to select from
+    * 
+    * @return The topic types
+    */
+   public List<SelectItem> getTopicTypes()
+   {
+      if (this.topicTypes == null)
+      {
+         this.topicTypes = new ArrayList<SelectItem>(3);
+         
+         // TODO: change this to be based on categories
+         this.topicTypes.add(new SelectItem("1", "Announcement"));
+         this.topicTypes.add(new SelectItem("0", "Normal"));
+         this.topicTypes.add(new SelectItem("2", "Sticky"));
+      }
+      
+      return this.topicTypes;
+   }
+   
+   /**
+    * Returns the type of the topic
+    * 
+    * @return The type of topic
+    */
+   public String getTopicType()
+   {
+      return this.topicType;
+   }
+   
+   /**
+    * Sets the type of the topic
+    *  
+    * @param topicType The type of the topic
+    */
+   public void setTopicType(String topicType)
+   {
+      this.topicType = topicType;
+   }
+
+   /**
+    * Returns the message entered by the user for the first post
+    * 
+    * @return The message for the first post
+    */
+   public String getMessage()
+   {
+      return this.message;
+   }
+
+   /**
+    * Sets the message
+    * 
+    * @param message The message
+    */
+   public void setMessage(String message)
+   {
+      this.message = message;
+   }
+   
+   /**
+    * @param contentService The contentService to set.
+    */
+   public void setContentService(ContentService contentService)
+   {
+      this.contentService = contentService;
+   }
+   
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#init()
+    */
+   public void init()
+   {
+      super.init();
+
+      this.spaceType = ForumModel.TYPE_TOPIC.toString();
+      this.icon = TOPIC_ICON_DEFAULT;
+      this.topicType = "0";
+      this.message = null;
+   }
+   
+   /**
+    * Returns a list of icons to allow the user to select from.
+    * 
+    * @return A list of icons
+    */
+   @SuppressWarnings("unchecked")
+   public List<UIListItem> getIcons()
+   {
+      // return the various forum icons
+      if (this.topicIcons == null)
+      {
+         this.topicIcons = new ArrayList<UIListItem>(2);
+         
+         UIListItem item = new UIListItem();
+         item.setValue(TOPIC_ICON_DEFAULT);
+         item.getAttributes().put("image", "/images/icons/topic_large.gif");
+         this.topicIcons.add(item);
+      }
+      
+      return this.topicIcons;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.NewSpaceWizard#performCustomProcessing(javax.faces.context.FacesContext)
+    */
+   @Override
+   protected void performCustomProcessing(FacesContext context)
+   {
+      if (this.editMode == false)
+      {
+         // *************************
+         // TODO: Add or update the ForumModel.PROP_TYPE property depending on the editMode
+         // *************************
+         
+         // get the node ref of the node that will contain the content
+         NodeRef containerNodeRef = this.createdNode;
+         
+         // create a unique file name for the message content
+         String fileName = GUID.generate() + ".txt";
+         
+         // create properties for content type
+         Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>(5, 1.0f);
+         contentProps.put(ContentModel.PROP_NAME, fileName);
+         
+         // create the node to represent the content
+         String assocName = QName.createValidLocalName(fileName);
+         ChildAssociationRef assocRef = this.nodeService.createNode(
+               containerNodeRef,
+               ContentModel.ASSOC_CONTAINS,
+               QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, assocName),
+               Repository.resolveToQName(ForumModel.TYPE_POST.toString()),
+               contentProps);
+         
+         NodeRef postNodeRef = assocRef.getChildRef();
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Created post node with filename: " + fileName);
+         
+         // apply the titled aspect - title and description
+         Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(3, 1.0f);
+         titledProps.put(ContentModel.PROP_TITLE, fileName);
+         this.nodeService.addAspect(postNodeRef, ContentModel.ASPECT_TITLED, titledProps);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added titled aspect with properties: " + titledProps);
+         
+         Map<QName, Serializable> editProps = new HashMap<QName, Serializable>(1, 1.0f);
+         editProps.put(ContentModel.PROP_EDITINLINE, true);
+         this.nodeService.addAspect(postNodeRef, ContentModel.ASPECT_INLINEEDITABLE, editProps);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Added inlineeditable aspect with properties: " + editProps);
+         
+         // get a writer for the content and put the file
+         ContentWriter writer = contentService.getWriter(postNodeRef, ContentModel.PROP_CONTENT, true);
+         // set the mimetype and encoding
+         writer.setMimetype(Repository.getMimeTypeForFileName(context, fileName));
+         writer.setEncoding("UTF-8");
+         writer.putContent(this.message);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
new file mode 100644
index 0000000000..7f5043b5d4
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
@@ -0,0 +1,981 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wizard;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.validator.ValidatorException;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.ContextListener;
+import org.alfresco.web.app.context.UIContextService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.users.UsersBean;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Kevin Roast
+ */
+public class NewUserWizard extends AbstractWizardBean
+{
+   private static Logger logger = Logger.getLogger(NewUserWizard.class);
+
+   private static final String WIZARD_TITLE_NEW_ID = "new_user_title";
+   private static final String WIZARD_DESC_NEW_ID = "new_user_desc";
+   private static final String WIZARD_TITLE_EDIT_ID = "new_user_title_edit";
+   private static final String WIZARD_DESC_EDIT_ID = "new_user_desc_edit";
+   private static final String STEP1_TITLE_ID = "new_user_step1_title";
+   private static final String STEP1_DESCRIPTION_ID = "new_user_step1_desc";
+   private static final String STEP2_TITLE_ID = "new_user_step2_title";
+   private static final String STEP2_DESCRIPTION_ID = "new_user_step2_desc";
+   private static final String FINISH_INSTRUCTION_ID = "new_user_finish_instruction";
+   private static final String ERROR = "error_person";
+
+   /** form variables */
+   private String firstName = null;
+   private String lastName = null;
+   private String userName = null;
+   private String password = null;
+   private String confirm = null;
+   private String email = null;
+   private String companyId = null;
+   private String homeSpaceName = "";
+   private NodeRef homeSpaceLocation = null;
+
+   /** AuthenticationService bean reference */
+   private AuthenticationService authenticationService;
+
+   /** NamespaceService bean reference */
+   private NamespaceService namespaceService;
+
+   /** PermissionService bean reference */
+   private PermissionService permissionService;
+
+   /** PersonService bean reference */
+   private PersonService personService;
+
+   /** OwnableService bean reference */
+   private OwnableService ownableService;
+   
+   /** ConfigService bean reference */
+   private ConfigService configService;
+
+   /** action context */
+   private Node person = null;
+
+   /** ref to system people folder */
+   private NodeRef peopleRef = null;
+
+   /** ref to the company home space folder */
+   private NodeRef companyHomeSpaceRef = null;
+   
+   
+   /**
+    * @param authenticationService  The AuthenticationService to set.
+    */
+   public void setAuthenticationService(AuthenticationService authenticationService)
+   {
+      this.authenticationService = authenticationService;
+   }
+
+   /**
+    * @param namespaceService       The namespaceService to set.
+    */
+   public void setNamespaceService(NamespaceService namespaceService)
+   {
+      this.namespaceService = namespaceService;
+   }
+
+   /**
+    * @param permissionService      The PermissionService to set.
+    */
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+
+   /**
+    * @param personService          The person service.
+    */
+   public void setPersonService(PersonService personService)
+   {
+      this.personService = personService;
+   }
+
+   /**
+    * @param ownableService         The ownableService to set.
+    */
+   public void setOwnableService(OwnableService ownableService)
+   {
+      this.ownableService = ownableService;
+   }
+   
+   /**
+    * @param configService The ConfigService to set.
+    */
+   public void setConfigService(ConfigService configService)
+   {
+      this.configService = configService;
+   }
+
+   /**
+    * Initialises the wizard
+    */
+   public void init()
+   {
+      super.init();
+
+      // reset all variables
+      this.firstName = "";
+      this.lastName = "";
+      this.userName = "";
+      this.password = "";
+      this.confirm = "";
+      this.email = "";
+      this.companyId = "";
+      this.homeSpaceName = "";
+      this.homeSpaceLocation = getCompanyHomeSpace();
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#populate()
+    */
+   public void populate()
+   {
+      // set values for edit mode
+      Map<String, Object> props = getPerson().getProperties();
+
+      this.firstName = (String) props.get("firstName");
+      this.lastName = (String) props.get("lastName");
+      this.userName = (String) props.get("userName");
+      this.password = "";
+      this.confirm = "";
+      this.email = (String) props.get("email");
+      this.companyId = (String) props.get("organizationId");
+
+      // calculate home space name and parent space Id from homeFolderId
+      this.homeSpaceLocation = null; // default to Company root space
+      this.homeSpaceName = ""; // default to none set below root
+      NodeRef homeFolderRef = (NodeRef) props.get("homeFolder");
+      if (this.nodeService.exists(homeFolderRef) == true)
+      {
+         ChildAssociationRef childAssocRef = this.nodeService.getPrimaryParent(homeFolderRef);
+         NodeRef parentRef = childAssocRef.getParentRef();
+         if (this.nodeService.getRootNode(Repository.getStoreRef()).equals(parentRef) == false)
+         {
+            this.homeSpaceLocation = parentRef;
+            this.homeSpaceName = Repository.getNameForNode(nodeService, homeFolderRef);
+         }
+         else
+         {
+            this.homeSpaceLocation = homeFolderRef;
+         }
+      }
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Edit user home space location: " + homeSpaceLocation + " home space name: " + homeSpaceName);
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardDescription()
+    */
+   public String getWizardDescription()
+   {
+      if (this.editMode)
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_EDIT_ID);
+      }
+      else
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_DESC_NEW_ID);
+      }
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getWizardTitle()
+    */
+   public String getWizardTitle()
+   {
+      if (this.editMode)
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_EDIT_ID);
+      }
+      else
+      {
+         return Application.getMessage(FacesContext.getCurrentInstance(), WIZARD_TITLE_NEW_ID);
+      }
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepTitle()
+    */
+   public String getStepTitle()
+   {
+      String stepTitle = null;
+
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_TITLE_ID);
+            break;
+         }
+         case 2:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_TITLE_ID);
+            break;
+         }
+         case 3:
+         {
+            stepTitle = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_TITLE_ID);
+            break;
+         }
+         default:
+         {
+            stepTitle = "";
+         }
+      }
+
+      return stepTitle;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepDescription()
+    */
+   public String getStepDescription()
+   {
+      String stepDesc = null;
+
+      switch (this.currentStep)
+      {
+         case 1:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP1_DESCRIPTION_ID);
+            break;
+         }
+         case 2:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), STEP2_DESCRIPTION_ID);
+            break;
+         }
+         case 3:
+         {
+            stepDesc = Application.getMessage(FacesContext.getCurrentInstance(), SUMMARY_DESCRIPTION_ID);
+            break;
+         }
+         default:
+         {
+            stepDesc = "";
+         }
+      }
+
+      return stepDesc;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#getStepInstructions()
+    */
+   public String getStepInstructions()
+   {
+      String stepInstruction = null;
+
+      switch (this.currentStep)
+      {
+         case 3:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), FINISH_INSTRUCTION_ID);
+            break;
+         }
+         default:
+         {
+            stepInstruction = Application.getMessage(FacesContext.getCurrentInstance(), DEFAULT_INSTRUCTION_ID);
+         }
+      }
+
+      return stepInstruction;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#determineOutcomeForStep(int)
+    */
+   protected String determineOutcomeForStep(int step)
+   {
+      String outcome = null;
+
+      switch (step)
+      {
+         case 1:
+         {
+            outcome = "person-properties";
+            break;
+         }
+         case 2:
+         {
+            outcome = "user-properties";
+            break;
+         }
+         case 3:
+         {
+            outcome = "summary";
+            break;
+         }
+         default:
+         {
+            outcome = CANCEL_OUTCOME;
+         }
+      }
+
+      return outcome;
+   }
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#finish()
+    */
+   public String finish()
+   {
+      String outcome = FINISH_OUTCOME;
+
+      // TODO: implement create new Person object from specified details
+      UserTransaction tx = null;
+
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context);
+         tx.begin();
+
+         if (this.editMode)
+         {
+            // update the existing node in the repository
+            NodeRef nodeRef = getPerson().getNodeRef();
+            
+            Map<QName, Serializable> props = this.nodeService.getProperties(nodeRef);
+            props.put(ContentModel.PROP_USERNAME, this.userName);
+            props.put(ContentModel.PROP_FIRSTNAME, this.firstName);
+            props.put(ContentModel.PROP_LASTNAME, this.lastName);
+            
+            // calculate whether we need to move the old home space or create new
+            NodeRef newHomeFolderRef;
+            NodeRef oldHomeFolderRef = (NodeRef)this.nodeService.getProperty(nodeRef, ContentModel.PROP_HOMEFOLDER);
+            boolean moveHomeSpace = false;
+            boolean renameHomeSpace = false;
+            if (oldHomeFolderRef != null && this.nodeService.exists(oldHomeFolderRef) == true)
+            {
+               // the original home folder ref exists so may need moving if it has been changed
+               ChildAssociationRef childAssocRef = this.nodeService.getPrimaryParent(oldHomeFolderRef);
+               NodeRef currentHomeSpaceLocation = childAssocRef.getParentRef();
+               if (this.homeSpaceName.length() != 0)
+               {
+                  if (currentHomeSpaceLocation.equals(this.homeSpaceLocation) == false &&
+                      oldHomeFolderRef.equals(this.homeSpaceLocation) == false &&
+                      currentHomeSpaceLocation.equals(getCompanyHomeSpace()) == false)
+                  {
+                     moveHomeSpace = true;
+                  }
+                  
+                  String oldHomeSpaceName = Repository.getNameForNode(nodeService, oldHomeFolderRef);
+                  if (oldHomeSpaceName.equals(this.homeSpaceName) == false &&
+                      oldHomeFolderRef.equals(this.homeSpaceLocation) == false)
+                  {
+                     renameHomeSpace = true;
+                  }
+               }
+            }
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Moving space: " + moveHomeSpace + "  and renaming space: " + renameHomeSpace);
+            
+            if (moveHomeSpace == false && renameHomeSpace == false)
+            {
+               if (this.homeSpaceLocation != null && this.homeSpaceName.length() != 0)
+               {
+                  newHomeFolderRef = createHomeSpace(this.homeSpaceLocation.getId(), this.homeSpaceName, false);
+               }
+               else if (this.homeSpaceLocation != null)
+               {
+                  // location selected but no home space name entered,
+                  // so the home ref should be set to the newly selected space
+                  newHomeFolderRef = this.homeSpaceLocation;
+                  
+                  // set the permissions for this space so the user can access it
+                  
+               }
+               else
+               {
+                  // nothing selected - use Company Home by default
+                  newHomeFolderRef = getCompanyHomeSpace();
+               }
+            }
+            else
+            {
+               // either move, rename or both required
+               if (moveHomeSpace == true)
+               {
+                  this.nodeService.moveNode(
+                        oldHomeFolderRef,
+                        this.homeSpaceLocation,
+                        ContentModel.ASSOC_CONTAINS,
+                        this.nodeService.getPrimaryParent(oldHomeFolderRef).getQName());
+               }
+               newHomeFolderRef = oldHomeFolderRef;   // ref ID doesn't change
+               
+               if (renameHomeSpace == true)
+               {
+                  // change HomeSpace node name
+                  this.nodeService.setProperty(newHomeFolderRef, ContentModel.PROP_NAME, this.homeSpaceName);
+               }
+            }
+            
+            props.put(ContentModel.PROP_HOMEFOLDER, newHomeFolderRef);
+            props.put(ContentModel.PROP_EMAIL, this.email);
+            props.put(ContentModel.PROP_ORGID, this.companyId);
+            this.nodeService.setProperties(nodeRef, props);
+            
+            // TODO: RESET HomeSpace Ref found in top-level navigation bar!
+            // NOTE: not need cos only admin can do this?
+         }
+         else
+         {
+            if (this.password.equals(this.confirm))
+            {
+               if (!this.personService.getUserNamesAreCaseSensitive())
+               {
+                  this.userName = this.userName.toLowerCase();
+               }
+                
+               // create properties for Person type from submitted Form data
+               Map<QName, Serializable> props = new HashMap<QName, Serializable>(7, 1.0f);
+               props.put(ContentModel.PROP_USERNAME, this.userName);
+               props.put(ContentModel.PROP_FIRSTNAME, this.firstName);
+               props.put(ContentModel.PROP_LASTNAME, this.lastName);
+               NodeRef homeSpaceNodeRef;
+               if (this.homeSpaceLocation != null && this.homeSpaceName.length() != 0)
+               {
+                  // create new
+                  homeSpaceNodeRef = createHomeSpace(this.homeSpaceLocation.getId(), this.homeSpaceName, true);
+               }
+               else if (this.homeSpaceLocation != null)
+               {
+                  // set to existing
+                  homeSpaceNodeRef = homeSpaceLocation;
+                  setupHomeSpacePermissions(homeSpaceNodeRef);
+               }
+               else
+               {
+                  // default to Company Home
+                  homeSpaceNodeRef = getCompanyHomeSpace();
+               }
+               props.put(ContentModel.PROP_HOMEFOLDER, homeSpaceNodeRef);
+               props.put(ContentModel.PROP_EMAIL, this.email);
+               props.put(ContentModel.PROP_ORGID, this.companyId);
+               
+               // create the node to represent the Person
+               String assocName = QName.createValidLocalName(this.userName);
+               NodeRef newPerson = this.personService.createPerson(props);
+               
+               // ensure the user can access their own Person object
+               this.permissionService.setPermission(newPerson, this.userName, permissionService.getAllPermission(), true);
+               
+               if (logger.isDebugEnabled()) logger.debug("Created Person node for username: " + this.userName);
+               
+               // create the ACEGI Authentication instance for the new user
+               this.authenticationService.createAuthentication(this.userName, this.password.toCharArray());
+               
+               if (logger.isDebugEnabled()) logger.debug("Created User Authentication instance for username: " + this.userName);
+            }
+            else
+            {
+               outcome = null;
+               Utils.addErrorMessage(Application.getMessage(context, UsersBean.ERROR_PASSWORD_MATCH));
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+         
+         // reset the richlist component so it rebinds to the users list
+         invalidateUserList();
+      }
+      catch (Exception e)
+      {
+         // rollback the transaction
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), ERROR), e
+               .getMessage()), e);
+         outcome = null;
+      }
+
+      return outcome;
+   }
+
+   /**
+    * @return Returns the summary data for the wizard.
+    */
+   public String getSummary()
+   {
+      String homeSpaceLabel = this.homeSpaceName;
+      if (this.homeSpaceName.length() == 0 && this.homeSpaceLocation != null)
+      {
+         homeSpaceLabel = Repository.getNameForNode(this.nodeService, this.homeSpaceLocation);
+      }
+
+      ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
+
+      return buildSummary(new String[] { bundle.getString("name"), bundle.getString("username"),
+            bundle.getString("password"), bundle.getString("homespace") }, new String[] {
+            this.firstName + " " + this.lastName, this.userName, "********", homeSpaceLabel });
+   }
+
+   /**
+    * Init the users screen
+    */
+   public void setupUsers(ActionEvent event)
+   {
+      invalidateUserList();
+   }
+
+   /**
+    * Action listener called when the wizard is being launched for editing an
+    * existing node.
+    */
+   public void startWizardForEdit(ActionEvent event)
+   {
+      UIActionLink link = (UIActionLink) event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String id = params.get("id");
+      if (id != null && id.length() != 0)
+      {
+         try
+         {
+            // create the node ref, then our node representation
+            NodeRef ref = new NodeRef(Repository.getStoreRef(), id);
+            Node node = new Node(ref);
+
+            // remember the Person node
+            setPerson(node);
+
+            // set the wizard in edit mode
+            this.editMode = true;
+
+            // populate the wizard's default values with the current value
+            // from the node being edited
+            init();
+            populate();
+
+            // clear the UI state in preparation for finishing the action
+            // and returning to the main page
+            invalidateUserList();
+
+            if (logger.isDebugEnabled()) logger.debug("Started wizard : " + getWizardTitle() + " for editing");
+         }
+         catch (InvalidNodeRefException refErr)
+         {
+            Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
+                  Repository.ERROR_NODEREF), new Object[] { id }));
+         }
+      }
+      else
+      {
+         setPerson(null);
+      }
+   }
+
+   /**
+    * @return Returns the companyId.
+    */
+   public String getCompanyId()
+   {
+      return this.companyId;
+   }
+
+   /**
+    * @param companyId
+    *            The companyId to set.
+    */
+   public void setCompanyId(String companyId)
+   {
+      this.companyId = companyId;
+   }
+
+   /**
+    * @return Returns the email.
+    */
+   public String getEmail()
+   {
+      return this.email;
+   }
+
+   /**
+    * @param email
+    *            The email to set.
+    */
+   public void setEmail(String email)
+   {
+      this.email = email;
+   }
+
+   /**
+    * @return Returns the firstName.
+    */
+   public String getFirstName()
+   {
+      return this.firstName;
+   }
+
+   /**
+    * @param firstName     The firstName to set.
+    */
+   public void setFirstName(String firstName)
+   {
+      this.firstName = firstName;
+   }
+
+   /**
+    * @return Returns the homeSpaceLocation.
+    */
+   public NodeRef getHomeSpaceLocation()
+   {
+      return this.homeSpaceLocation;
+   }
+
+   /**
+    * @param homeSpaceLocation   The homeSpaceLocation to set.
+    */
+   public void setHomeSpaceLocation(NodeRef homeSpaceLocation)
+   {
+      this.homeSpaceLocation = homeSpaceLocation;
+   }
+
+   /**
+    * @return Returns the homeSpaceName.
+    */
+   public String getHomeSpaceName()
+   {
+      return this.homeSpaceName;
+   }
+
+   /**
+    * @param homeSpaceName    The homeSpaceName to set.
+    */
+   public void setHomeSpaceName(String homeSpaceName)
+   {
+      this.homeSpaceName = homeSpaceName;
+   }
+
+   /**
+    * @return Returns the lastName.
+    */
+   public String getLastName()
+   {
+      return this.lastName;
+   }
+
+   /**
+    * @param lastName      The lastName to set.
+    */
+   public void setLastName(String lastName)
+   {
+      this.lastName = lastName;
+   }
+
+   /**
+    * @return Returns the userName.
+    */
+   public String getUserName()
+   {
+      return this.userName;
+   }
+
+   /**
+    * @param userName      The userName to set.
+    */
+   public void setUserName(String userName)
+   {
+      this.userName = userName;
+   }
+
+   /**
+    * @return Returns the password.
+    */
+   public String getPassword()
+   {
+      return this.password;
+   }
+
+   /**
+    * @param password      The password to set.
+    */
+   public void setPassword(String password)
+   {
+      this.password = password;
+   }
+   
+   /**
+    * @return Returns the confirm password.
+    */
+   public String getConfirm()
+   {
+      return this.confirm;
+   }
+
+   /**
+    * @param confirm The confirm password to set.
+    */
+   public void setConfirm(String confirm)
+   {
+      this.confirm = confirm;
+   }
+
+   /**
+    * @return Returns the person context.
+    */
+   public Node getPerson()
+   {
+      return this.person;
+   }
+
+   /**
+    * @param person        The person context to set.
+    */
+   public void setPerson(Node person)
+   {
+      this.person = person;
+   }
+
+   public boolean getEditMode()
+   {
+      return this.editMode;
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Validator methods
+
+   /**
+    * Validate password field data is acceptable
+    */
+   public void validatePassword(FacesContext context, UIComponent component, Object value) throws ValidatorException
+   {
+      String pass = (String) value;
+      if (pass.length() < 5 || pass.length() > 12)
+      {
+         String err = "Password must be between 5 and 12 characters in length.";
+         throw new ValidatorException(new FacesMessage(err));
+      }
+
+      for (int i = 0; i < pass.length(); i++)
+      {
+         if (Character.isLetterOrDigit(pass.charAt(i)) == false)
+         {
+            String err = "Password can only contain characters or digits.";
+            throw new ValidatorException(new FacesMessage(err));
+         }
+      }
+   }
+
+   /**
+    * Validate Username field data is acceptable
+    */
+   public void validateUsername(FacesContext context, UIComponent component, Object value) throws ValidatorException
+   {
+      String pass = (String) value;
+      if (pass.length() < 5 || pass.length() > 12)
+      {
+         String err = "Username must be between 5 and 12 characters in length.";
+         throw new ValidatorException(new FacesMessage(err));
+      }
+
+      for (int i = 0; i < pass.length(); i++)
+      {
+         if (Character.isLetterOrDigit(pass.charAt(i)) == false)
+         {
+            String err = "Username can only contain characters or digits.";
+            throw new ValidatorException(new FacesMessage(err));
+         }
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Helper methods
+
+   /**
+    * Helper to return the company home space
+    * 
+    * @return company home space NodeRef
+    */
+   private NodeRef getCompanyHomeSpace()
+   {
+      if (this.companyHomeSpaceRef == null)
+      {
+         String companyXPath =  Application.getRootPath(FacesContext.getCurrentInstance());
+         
+         NodeRef rootNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+         List<NodeRef> nodes = this.searchService.selectNodes(rootNodeRef, companyXPath, null, this.namespaceService,
+               false);
+         
+         if (nodes.size() == 0)
+         {
+            throw new IllegalStateException("Unable to find company home space path: " + companyXPath);
+         }
+         
+         this.companyHomeSpaceRef = nodes.get(0);
+      }
+      
+      return this.companyHomeSpaceRef;
+   }
+
+   /**
+    * Create the specified home space if it does not exist, and return the ID
+    * 
+    * @param locationId
+    *            Parent location
+    * @param spaceName
+    *            Home space to create, can be null to simply return the parent
+    * @param error
+    *            True to throw an error if the space already exists, else
+    *            ignore and return
+    * 
+    * @return ID of the home space
+    */
+   private NodeRef createHomeSpace(String locationId, String spaceName, boolean error)
+   {
+      String homeSpaceId = locationId;
+      NodeRef homeSpaceNodeRef = null;
+      if (spaceName != null && spaceName.length() != 0)
+      {
+         NodeRef parentRef = new NodeRef(Repository.getStoreRef(), locationId);
+         
+         // check for existance of home space with same name - return immediately
+         // if it exists or throw an exception an give user chance to enter another name
+         // TODO: this might be better replaced with an XPath query!
+         List<ChildAssociationRef> children = this.nodeService.getChildAssocs(parentRef);
+         for (ChildAssociationRef ref : children)
+         {
+            String childNodeName = (String) this.nodeService.getProperty(ref.getChildRef(), ContentModel.PROP_NAME);
+            if (spaceName.equals(childNodeName))
+            {
+               if (error)
+               {
+                  throw new AlfrescoRuntimeException("A Home Space with the same name already exists.");
+               }
+               else
+               {
+                  return ref.getChildRef();
+               }
+            }
+         }
+         
+         // space does not exist already, create a new Space under it with
+         // the specified name
+         String qname = QName.createValidLocalName(spaceName);
+         ChildAssociationRef assocRef = this.nodeService.createNode(parentRef, ContentModel.ASSOC_CONTAINS,
+               QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, qname), ContentModel.TYPE_FOLDER);
+         
+         NodeRef nodeRef = assocRef.getChildRef();
+         
+         // set the name property on the node
+         this.nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, spaceName);
+         
+         if (logger.isDebugEnabled()) logger.debug("Created Home Space for with name: " + spaceName);
+         
+         // apply the uifacets aspect - icon, title and description props
+         Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(3);
+         uiFacetsProps.put(ContentModel.PROP_ICON, NewSpaceWizard.SPACE_ICON_DEFAULT);
+         uiFacetsProps.put(ContentModel.PROP_TITLE, spaceName);
+         this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_UIFACETS, uiFacetsProps);
+         
+         setupHomeSpacePermissions(nodeRef);
+         
+         // return the ID of the created space
+         homeSpaceNodeRef = nodeRef;
+         homeSpaceId = nodeRef.getId();
+      }
+      
+      return homeSpaceNodeRef;
+   }
+
+   /**
+    * Setup the default permissions for this and other users on the Home Space
+    * 
+    * @param homeSpaceRef     Home Space reference
+    */
+   private void setupHomeSpacePermissions(NodeRef homeSpaceRef)
+   {
+      // Admin Authority has full permissions by default (automatic - set in the permission config)
+      // give full permissions to the new user
+      this.permissionService.setPermission(homeSpaceRef, this.userName, permissionService.getAllPermission(), true);
+      
+      // by default other users will only have GUEST access to the space contents
+      // or whatever is configured as the default in the web-client-xml config
+      String permission = getDefaultPermission();
+      if (permission != null && permission.length() != 0)
+      {
+         this.permissionService.setPermission(homeSpaceRef, permissionService.getAllAuthorities(), permission, true);
+      }
+      
+      // the new user is the OWNER of their own space and always has full permissions
+      this.ownableService.setOwner(homeSpaceRef, this.userName);
+      this.permissionService.setPermission(homeSpaceRef, permissionService.getOwnerAuthority(), permissionService.getAllPermission(), true);
+      
+      // now detach (if we did this first we could not set any permissions!)
+      this.permissionService.setInheritParentPermissions(homeSpaceRef, false);
+   }
+   
+   /**
+    * @return default permission string to set for other users for a new Home Space
+    */
+   private String getDefaultPermission()
+   {
+      ClientConfigElement config = (ClientConfigElement)this.configService.getGlobalConfig().getConfigElement(
+            ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      return config.getHomeSpacePermission();
+   }
+
+   private void invalidateUserList()
+   {
+      UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
+   }
+}
diff --git a/source/java/org/alfresco/web/config/AspectEvaluator.java b/source/java/org/alfresco/web/config/AspectEvaluator.java
new file mode 100644
index 0000000000..2c52f24bf7
--- /dev/null
+++ b/source/java/org/alfresco/web/config/AspectEvaluator.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.Set;
+
+import org.alfresco.config.evaluator.Evaluator;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+
+/**
+ * Evaluator that determines whether a given object has a particular aspect applied
+ * 
+ * @author gavinc
+ */
+public class AspectEvaluator implements Evaluator
+{
+   /**
+    * Determines whether the given aspect is applied to the given object
+    * 
+    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    */
+   public boolean applies(Object obj, String condition)
+   {
+      boolean result = false;
+      
+      if (obj instanceof Node)
+      {
+         Set aspects = ((Node)obj).getAspects();
+         if (aspects != null)
+         {
+            QName spaceQName = Repository.resolveToQName(condition);
+            result = aspects.contains(spaceQName);
+         }
+      }
+      
+      return result;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java
new file mode 100644
index 0000000000..0b19d9661c
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ClientConfigElement.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.element.ConfigElementAdapter;
+
+/**
+ * Custom config element that represents config values for the client
+ * 
+ * @author Kevin Roast
+ */
+public class ClientConfigElement extends ConfigElementAdapter
+{
+   public static final String CONFIG_ELEMENT_ID = "client";
+   public static final String VIEW_DETAILS = "details";
+   public static final String VIEW_ICONS = "icons";
+   public static final String VIEW_LIST = "list";
+   public static final String VIEW_BUBBLE = "bubble";
+   
+   private static final String SEPARATOR = ":";
+   
+   // defaults for any config values not supplied
+   private int defaultPageSize = 10;
+   private String defaultView = "details";
+   private String defaultSortColumn = "name";
+   private String defaultSortOrder = "ascending";
+   
+   // list to store all the configured views
+   private List<String> views = new ArrayList<String>(4);
+
+   // map to store all the default views 
+   private Map<String, String> defaultViews = new HashMap<String, String>(4);
+   
+   // map to store all default pages sizes for configured client views
+   private Map<String, Integer> pagesSizes = new HashMap<String, Integer>(10);
+   
+   // map to store default sort columns for configured views
+   private Map<String, String> sortColumns = new HashMap<String, String>(4);
+   
+   // list of pages that have been configured to have ascending sorts
+   private List<String> descendingSorts = new ArrayList<String>(1);
+   
+   private int recentSpacesItems = 6;
+   private int searchMinimum = 3;
+   private String helpUrl = null;
+   private String editLinkType = null;
+   private Map<String, String> localeMap = new HashMap<String, String>();
+   private List<String> languages = new ArrayList<String>(8);
+   private String homeSpacePermission = null;
+   private List<String> contentTypes = null;
+   private List<CustomProperty> customProps = null;
+   
+   /**
+    * Default Constructor
+    */
+   public ClientConfigElement()
+   {
+      super(CONFIG_ELEMENT_ID);
+      
+      // add the default page sizes to the map
+      this.pagesSizes.put(VIEW_DETAILS, defaultPageSize);
+      this.pagesSizes.put(VIEW_LIST, defaultPageSize);
+      this.pagesSizes.put(VIEW_ICONS, 9);
+      this.pagesSizes.put(VIEW_BUBBLE, 5);
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param name Name of the element this config element represents
+    */
+   public ClientConfigElement(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    */
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      return null;
+   }
+
+   /**
+    * Adds a configured view
+    * 
+    * @param renderer The implementation class of the view (the renderer)
+    */
+   public void addView(String renderer)
+   {
+      this.views.add(renderer);
+   }
+   
+   /**
+    * Returns a map of configured views for the client
+    * 
+    * @return List of the implementation classes for the configured views
+    */
+   public List<String> getViews()
+   {
+      return this.views;
+   }
+   
+   /**
+    * Adds a default view setting
+    * 
+    * @param page The page to set the default view for
+    * @param view The view name that will be the default
+    */
+   public void addDefaultView(String page, String view)
+   {
+      this.defaultViews.put(page, view);
+   }
+   
+   /**
+    * Returns the default view for the given page
+    * 
+    * @param page The page to get the default view for
+    * @return The defualt view, if there isn't a configured default for the
+    *         given page 'details' will be returned
+    */
+   public String getDefaultView(String page)
+   {
+      String view = this.defaultViews.get(page);
+      
+      if (view == null)
+      {
+         view = this.defaultView;
+      }
+      
+      return view;
+   }
+   
+   /**
+    * Adds a configured page size to the internal store
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    * @param view The name of the view the size is for i.e. details, icons etc.
+    * @param size The size of the page
+    */
+   public void addDefaultPageSize(String page, String view, int size)
+   {
+      this.pagesSizes.put(page + SEPARATOR + view, new Integer(size));
+   }
+   
+   /**
+    * Returns the page size for the given page and view combination
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    * @param view The name of the view the size is for i.e. details, icons etc.
+    * @return The size of the requested page, if the combination doesn't exist
+    *         the default for the view will be used, if the view doesn't exist either
+    *         10 will be returned.
+    */
+   public int getDefaultPageSize(String page, String view)
+   {
+      Integer pageSize = this.pagesSizes.get(page + SEPARATOR + view);
+      
+      // try just the view if the combination isn't present
+      if (pageSize == null)
+      {
+         pageSize = this.pagesSizes.get(view);
+         
+         // if the view is not present either default to 10
+         if (pageSize == null)
+         {
+            pageSize = new Integer(10);
+         }
+      }
+      
+      return pageSize.intValue();
+   }
+
+   /**
+    * Adds a default sorting column for the given page 
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    * @param column The name of the column to initially sort by
+    */
+   public void addDefaultSortColumn(String page, String column)
+   {
+      this.sortColumns.put(page, column);
+   }
+   
+   /**
+    * Returns the default sort column for the given page
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    * @return The name of the column to sort by, name is returned if 
+    *         the page is not found
+    */
+   public String getDefaultSortColumn(String page)
+   {
+      String column = this.sortColumns.get(page);
+      
+      if (column == null)
+      {
+         column = this.defaultSortColumn;
+      }
+      
+      return column;
+   }
+   
+   /**
+    * Sets the given page as using descending sorts
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    */
+   public void addDescendingSort(String page)
+   {
+      this.descendingSorts.add(page);
+   }
+   
+   /**
+    * Determines whether the given page has been
+    * configured to use descending sorting by default
+    * 
+    * @param page The name of the page i.e. browse, forums etc.
+    * @return true if the page should use descending sorts
+    */
+   public boolean hasDescendingSort(String page)
+   {
+      return this.descendingSorts.contains(page);
+   }
+   
+   /**
+    * @return Returns the recentSpacesItems.
+    */
+   public int getRecentSpacesItems()
+   {
+      return this.recentSpacesItems;
+   }
+
+   /**
+    * @param recentSpacesItems The recentSpacesItems to set.
+    */
+   /*package*/ void setRecentSpacesItems(int recentSpacesItems)
+   {
+      this.recentSpacesItems = recentSpacesItems;
+   }
+   
+   /**
+    * Add a language locale and display label to the list.
+    * 
+    * @param locale     Locale code
+    * @param label      Display label
+    */
+   /*package*/ void addLanguage(String locale, String label)
+   {
+      this.localeMap.put(locale, label);
+      this.languages.add(locale);
+   }
+   
+   /**
+    * @return List of supported language locale strings in config file order
+    */
+   public List<String> getLanguages()
+   {
+      return this.languages;
+   }
+   
+   /**
+    * @param locale     The locale string to lookup language label for
+    * 
+    * @return the language label for specified locale string, or null if not found
+    */
+   public String getLabelForLanguage(String locale)
+   {
+      return this.localeMap.get(locale);
+   }
+
+   /**
+    * @return Returns the help Url.
+    */
+   public String getHelpUrl()
+   {
+      return this.helpUrl;
+   }
+
+   /**
+    * @param helpUrl The help Url to set.
+    */
+   /*package*/ void setHelpUrl(String helpUrl)
+   {
+      this.helpUrl = helpUrl;
+   }
+   
+   /**
+    * @return Returns the edit link type.
+    */
+   public String getEditLinkType()
+   {
+      return this.editLinkType;
+   }
+
+   /**
+    * @param editLinkType The edit link type to set.
+    */
+   /*package*/ void setEditLinkType(String editLinkType)
+   {
+      this.editLinkType = editLinkType;
+   }
+
+   /**
+    * @return Returns the search minimum number of characters.
+    */
+   public int getSearchMinimum()
+   {
+      return this.searchMinimum;
+   }
+
+   /**
+    * @param searchMinimum The searchMinimum to set.
+    */
+   /*package*/ void setSearchMinimum(int searchMinimum)
+   {
+      this.searchMinimum = searchMinimum;
+   }
+
+   /**
+    * @return Returns the default Home Space permissions.
+    */
+   public String getHomeSpacePermission()
+   {
+      return this.homeSpacePermission;
+   }
+
+   /**
+    * @param homeSpacePermission The default Home Space permission to set.
+    */
+   /*package*/ void setHomeSpacePermission(String homeSpacePermission)
+   {
+      this.homeSpacePermission = homeSpacePermission;
+   }
+
+   /**
+    * @return Returns the contentTypes.
+    */
+   public List<String> getContentTypes()
+   {
+      return this.contentTypes;
+   }
+
+   /**
+    * @param contentTypes The contentTypes to set.
+    */
+   /*package*/ void setContentTypes(List<String> contentTypes)
+   {
+      this.contentTypes = contentTypes;
+   }
+   
+   /**
+    * @return Returns the customProps.
+    */
+   public List<CustomProperty> getCustomProperties()
+   {
+      return this.customProps;
+   }
+
+   /**
+    * @param customProps The customProps to set.
+    */
+   /*package*/ void setCustomProperties(List<CustomProperty> customProps)
+   {
+      this.customProps = customProps;
+   }
+   
+   
+   public static class CustomProperty
+   {
+      CustomProperty(String type, String aspect, String property)
+      {
+         Type = type;
+         Aspect = aspect;
+         Property = property;
+      }
+      
+      public String Type;
+      public String Aspect;
+      public String Property;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/ClientElementReader.java b/source/java/org/alfresco/web/config/ClientElementReader.java
new file mode 100644
index 0000000000..3d4a50494e
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ClientElementReader.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.alfresco.web.config.ClientConfigElement.CustomProperty;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.dom4j.Element;
+
+/**
+ * Custom element reader to parse config for client config values
+ * 
+ * @author Kevin Roast
+ */
+public class ClientElementReader implements ConfigElementReader
+{
+   public static final String ELEMENT_VIEWS = "views";
+   public static final String ELEMENT_VIEW = "view";
+   public static final String ELEMENT_VIEWDEFAULTS = "view-defaults";
+   public static final String ELEMENT_PAGESIZE = "page-size";
+   public static final String ELEMENT_SORTCOLUMN = "sort-column";
+   public static final String ELEMENT_SORTDESCENDING = "sort-descending";
+   public static final String ELEMENT_RECENTSPACESITEMS = "recent-spaces-items";
+   public static final String ELEMENT_LANGUAGES = "languages";
+   public static final String ELEMENT_LANGUAGE = "language";
+   public static final String ATTRIBUTE_LOCALE = "locale";
+   public static final String ATTRIBUTE_NAME = "name";
+   public static final String ELEMENT_HELPURL = "help-url";
+   public static final String ELEMENT_EDITLINKTYPE = "edit-link-type";
+   public static final String ELEMENT_SEARCHMINIMUM = "search-minimum";
+   public static final String ELEMENT_HOMESPACEPERMISSION = "home-space-permission";
+   public static final String ELEMENT_ADVANCEDSEARCH = "advanced-search";
+   public static final String ELEMENT_CONTENTTYPES = "content-types";
+   public static final String ELEMENT_TYPE = "type";
+   public static final String ELEMENT_CUSTOMPROPS = "custom-properties";
+   public static final String ELEMENT_METADATA = "meta-data";
+   public static final String ATTRIBUTE_TYPE = "type";
+   public static final String ATTRIBUTE_PROPERTY = "property";
+   public static final String ATTRIBUTE_ASPECT = "aspect";
+   
+   private static Log logger = LogFactory.getLog(ClientElementReader.class);
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   @SuppressWarnings("unchecked")
+   public ConfigElement parse(Element element)
+   {
+      ClientConfigElement configElement = null;
+      
+      if (element != null)
+      {
+         String name = element.getName();
+         if (name.equals(ClientConfigElement.CONFIG_ELEMENT_ID) == false)
+         {
+            throw new ConfigException("ClientElementReader can only parse " +
+                  ClientConfigElement.CONFIG_ELEMENT_ID + "elements, the element passed was '" + 
+                  name + "'");
+         }
+         
+         configElement = new ClientConfigElement();
+         
+         // get the configured views
+         Element views = element.element(ELEMENT_VIEWS);
+         if (views != null)
+         {
+            Iterator<Element> renderers = views.elementIterator(ELEMENT_VIEW);
+            while (renderers.hasNext())
+            {
+               Element renderer = renderers.next();
+               configElement.addView(renderer.getTextTrim());
+            }
+         }
+         
+         // get all the view related default settings
+         Element viewDefaults = element.element(ELEMENT_VIEWDEFAULTS);
+         if (viewDefaults != null)
+         {
+            Iterator<Element> pages = viewDefaults.elementIterator();
+            while (pages.hasNext())
+            {
+               Element page = pages.next();
+               String pageName = page.getName();
+               
+               // get the default view mode for the page
+               Element defaultView = page.element(ELEMENT_VIEW);
+               if (defaultView != null)
+               {
+                  String viewName = defaultView.getTextTrim();
+                  configElement.addDefaultView(pageName, viewName);
+               }
+               
+               // get the initial sort column
+               Element sortColumn = page.element(ELEMENT_SORTCOLUMN);
+               if (sortColumn != null)
+               {
+                  String column = sortColumn.getTextTrim();
+                  configElement.addDefaultSortColumn(pageName, column);
+               }
+               
+               // get the sort descending option
+               Element sortDesc = page.element(ELEMENT_SORTDESCENDING);
+               if (sortDesc != null)
+               {
+                  Boolean descending = new Boolean(sortDesc.getTextTrim());
+                  if (descending.booleanValue() == true)
+                  { 
+                     configElement.addDescendingSort(pageName);
+                  }
+               }
+               
+               // process the page-size element
+               processPageSizeElement(page.element(ELEMENT_PAGESIZE), 
+                     pageName, configElement);
+            }
+         }
+         
+         // get the languages sub-element
+         Element languages = element.element(ELEMENT_LANGUAGES);
+         if (languages != null)
+         {
+            Iterator<Element> langsItr = languages.elementIterator(ELEMENT_LANGUAGE);
+            while (langsItr.hasNext())
+            {
+               Element language = langsItr.next();
+               String localeCode = language.attributeValue(ATTRIBUTE_LOCALE);
+               String label = language.getTextTrim();
+               
+               if (localeCode != null && localeCode.length() != 0 &&
+                   label != null && label.length() != 0)
+               {
+                  // store the language code against the display label
+                  configElement.addLanguage(localeCode, label);
+               }
+            }
+         }
+         
+         // get the recent space max items
+         Element recentSpaces = element.element(ELEMENT_RECENTSPACESITEMS);
+         if (recentSpaces != null)
+         {
+            configElement.setRecentSpacesItems(Integer.parseInt(recentSpaces.getTextTrim()));
+         }
+         
+         // get the Help url
+         Element helpUrl = element.element(ELEMENT_HELPURL);
+         if (helpUrl != null)
+         {
+            configElement.setHelpUrl(helpUrl.getTextTrim());
+         }
+         
+         // get the edit link type
+         Element editLinkType = element.element(ELEMENT_EDITLINKTYPE);
+         if (editLinkType != null)
+         {
+            configElement.setEditLinkType(editLinkType.getTextTrim());
+         }
+         
+         // get the minimum number of characters for valid search string
+         Element searchMin = element.element(ELEMENT_SEARCHMINIMUM);
+         if (searchMin != null)
+         {
+            configElement.setSearchMinimum(Integer.parseInt(searchMin.getTextTrim()));
+         }
+         
+         // get the default permission for newly created users Home Spaces
+         Element permission = element.element(ELEMENT_HOMESPACEPERMISSION);
+         if (permission != null)
+         {
+            configElement.setHomeSpacePermission(permission.getTextTrim());
+         }
+         
+         // get the Advanced Search config block
+         Element advsearch = element.element(ELEMENT_ADVANCEDSEARCH);
+         if (advsearch != null)
+         {
+            // get the list of content types
+            Element contentTypes = advsearch.element(ELEMENT_CONTENTTYPES);
+            Iterator<Element> typesItr = contentTypes.elementIterator(ELEMENT_TYPE);
+            List<String> types = new ArrayList<String>(5);
+            while (typesItr.hasNext())
+            {
+               Element contentType = typesItr.next();
+               String type = contentType.attributeValue(ATTRIBUTE_NAME);
+               if (type != null)
+               {
+                  types.add(type);
+               }
+            }
+            configElement.setContentTypes(types);
+            
+            // get the list of custom properties to display
+            Element customProps = advsearch.element(ELEMENT_CUSTOMPROPS);
+            Iterator<Element> propsItr = customProps.elementIterator(ELEMENT_METADATA);
+            List<CustomProperty> props = new ArrayList<CustomProperty>(5);
+            while (propsItr.hasNext())
+            {
+               Element propElement = propsItr.next();
+               String type = propElement.attributeValue(ATTRIBUTE_TYPE);
+               String aspect = propElement.attributeValue(ATTRIBUTE_ASPECT);
+               String prop = propElement.attributeValue(ATTRIBUTE_PROPERTY);
+               props.add(new ClientConfigElement.CustomProperty(type, aspect, prop));
+            }
+            configElement.setCustomProperties(props);
+         }
+      }
+      
+      return configElement;
+   }
+   
+   /**
+    * Processes a page-size element
+    * 
+    * @param pageSizeElement The element to process
+    * @param page The page the page-size element belongs to
+    * @param configElement The config element being populated
+    */
+   @SuppressWarnings("unchecked")
+   private void processPageSizeElement(Element pageSizeElement, String page, 
+         ClientConfigElement configElement)
+   {
+      if (pageSizeElement != null)
+      {
+         Iterator<Element> views = pageSizeElement.elementIterator();
+         while (views.hasNext())
+         {
+            Element view = views.next();
+            String viewName = view.getName();
+            String pageSize = view.getTextTrim();
+            try
+            {
+               configElement.addDefaultPageSize(page, viewName, Integer.parseInt(pageSize));
+            }
+            catch (NumberFormatException nfe)
+            {
+               if (logger.isWarnEnabled())
+               {
+                  logger.warn("Failed to set page size for view '" + viewName + 
+                        "' in page '" + page + "' as '" + pageSize + 
+                        "' is an invalid number!");
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/config/MimeTypeConfigElement.java b/source/java/org/alfresco/web/config/MimeTypeConfigElement.java
new file mode 100644
index 0000000000..eb7cf14f37
--- /dev/null
+++ b/source/java/org/alfresco/web/config/MimeTypeConfigElement.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.element.ConfigElementAdapter;
+
+/**
+ * @author Kevin Roast
+ */
+public final class MimeTypeConfigElement extends ConfigElementAdapter
+{
+   /**
+    * Default Constructor
+    */
+   public MimeTypeConfigElement()
+   {
+      super(MimeTypesElementReader.ELEMENT_MIMETYPES);
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param mappings      Map of mimetype elements to use
+    */
+   public MimeTypeConfigElement(Map<String, String> mappings)
+   {
+      super(MimeTypesElementReader.ELEMENT_MIMETYPES);
+      this.mimetypes = mappings;
+   }
+
+   /**
+    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    */
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      MimeTypeConfigElement combined = new MimeTypeConfigElement(this.mimetypes);
+      
+      if (configElement instanceof MimeTypeConfigElement)
+      {
+         combined.mimetypes.putAll( ((MimeTypeConfigElement)configElement).mimetypes );
+      }
+      
+      return combined;
+   }
+   
+   /**
+    * Add a mimetype extension mapping to the config element
+    * 
+    * @param ext        extension to map against
+    * @param mimetype   mimetype content type for the specified extension
+    */
+   public void addMapping(String ext, String mimetype)
+   {
+      this.mimetypes.put(ext, mimetype);
+   }
+   
+   /**
+    * Return the mimetype for the specified extension
+    * 
+    * @param ext     File
+    * 
+    * @return mimetype content type or null if not found
+    */
+   public String getMimeType(String ext)
+   {
+      return this.mimetypes.get(ext);
+   }
+   
+   private Map<String, String> mimetypes = new HashMap<String, String>(89, 1.0f);
+}
diff --git a/source/java/org/alfresco/web/config/MimeTypesElementReader.java b/source/java/org/alfresco/web/config/MimeTypesElementReader.java
new file mode 100644
index 0000000000..5607781b82
--- /dev/null
+++ b/source/java/org/alfresco/web/config/MimeTypesElementReader.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.Iterator;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.dom4j.Element;
+
+/**
+ * @author Kevin Roast
+ */
+public class MimeTypesElementReader implements ConfigElementReader
+{
+   public final static String ELEMENT_MIMETYPES    = "mimetypes";
+   public final static String ELEMENT_MIMEMAPPING  = "mime-mapping";
+   public final static String ELEMENT_EXTENSION    = "extension";
+   public final static String ELEMENT_MIMETYPE     = "mime-type";
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   public ConfigElement parse(Element element)
+   {
+      MimeTypeConfigElement configElement = null;
+      
+      if (element != null)
+      {
+         String name = element.getName();
+         if (name.equals(ELEMENT_MIMETYPES) == false)
+         {
+            throw new ConfigException("MimeTypesElementReader can only parse " +
+                  ELEMENT_MIMETYPES + "elements, the element passed was '" + 
+                  name + "'");
+         }
+         
+         configElement = new MimeTypeConfigElement();
+         
+         // walk the mime-mapping elements
+         Iterator<Element> mappings = element.elementIterator(ELEMENT_MIMEMAPPING);
+         while (mappings.hasNext())
+         {
+            Element mapping = mappings.next(); 
+            Element extensionElement = mapping.element(ELEMENT_EXTENSION);
+            Element mimetypeElement = mapping.element(ELEMENT_MIMETYPE);
+            
+            if (extensionElement == null || mimetypeElement == null)
+            {
+               throw new ConfigException("mime-mapping element must specify 'extension' and 'mime-type'"); 
+            }
+            
+            String extension = extensionElement.getTextTrim();
+            String mimetype = mimetypeElement.getTextTrim();
+            
+            if (extension == null || extension.length() == 0)
+            {
+               throw new ConfigException("mime-mapping extension element value must be specified");
+            }
+            if (mimetype == null || mimetype.length() == 0)
+            {
+               throw new ConfigException("mime-mapping mimetype element value must be specified");
+            }
+            
+            // add the mimetype extension to the config element
+            configElement.addMapping(extension, mimetype);
+         }
+      }
+      
+      return configElement;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/NavigationConfigElement.java b/source/java/org/alfresco/web/config/NavigationConfigElement.java
new file mode 100644
index 0000000000..91d3fff88d
--- /dev/null
+++ b/source/java/org/alfresco/web/config/NavigationConfigElement.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.element.ConfigElementAdapter;
+import org.alfresco.config.element.GenericConfigElement;
+
+/**
+ * Custom config element that represents the config data for navigation
+ * 
+ * @author gavinc
+ */
+public class NavigationConfigElement extends ConfigElementAdapter
+{
+   private HashMap<String, NavigationResult> viewIds = new HashMap<String, NavigationResult>();
+   private HashMap<String, NavigationResult> outcomes = new HashMap<String, NavigationResult>();
+   
+   private boolean kidsPopulated = false;
+   
+   /**
+    * Default constructor
+    */
+   public NavigationConfigElement()
+   {
+      super("navigation");
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param name Name of the element this config element represents
+    */
+   public NavigationConfigElement(String name)
+   {
+      super(name);
+   }
+   
+   /**
+    * @see org.alfresco.config.ConfigElement#getChildren()
+    */
+   public List<ConfigElement> getChildren()
+   {
+      // lazily build the list of generic config elements representing
+      // the navigation overrides as the caller may not even call this method
+      
+      List<ConfigElement> kids = null;
+      
+      if (this.viewIds.size() > 0 || this.outcomes.size() > 0)
+      {
+         if (this.kidsPopulated == false)
+         {
+            // create generic config elements for the from-view-id items 
+            for (String fromViewId : this.viewIds.keySet())
+            {
+               GenericConfigElement ce = new GenericConfigElement(NavigationElementReader.ELEMENT_OVERRIDE);
+               ce.addAttribute(NavigationElementReader.ATTR_FROM_VIEWID, fromViewId);
+
+               NavigationResult navRes = this.viewIds.get(fromViewId);
+               String result = navRes.getResult();
+               if (navRes.isOutcome())
+               {
+                  ce.addAttribute(NavigationElementReader.ATTR_TO_OUTCOME, result);
+               }
+               else
+               {
+                  ce.addAttribute(NavigationElementReader.ATTR_TO_VIEWID, result);
+               }
+               
+               // add the element
+               this.children.add(ce);
+            }
+            
+            // create generic config elements for the from-outcome items 
+            for (String fromOutcome : this.outcomes.keySet())
+            {
+               GenericConfigElement ce = new GenericConfigElement(NavigationElementReader.ELEMENT_OVERRIDE);
+               ce.addAttribute(NavigationElementReader.ATTR_FROM_OUTCOME, fromOutcome);
+
+               NavigationResult navRes = this.outcomes.get(fromOutcome);
+               String result = navRes.getResult();
+               if (navRes.isOutcome())
+               {
+                  ce.addAttribute(NavigationElementReader.ATTR_TO_OUTCOME, result);
+               }
+               else
+               {
+                  ce.addAttribute(NavigationElementReader.ATTR_TO_VIEWID, result);
+               }
+               
+               // add the element
+               this.children.add(ce);
+            }
+            
+            this.kidsPopulated = true;
+         }
+         
+         kids = super.getChildren();
+      }
+      
+      return kids;
+   }
+   
+   /**
+    * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement)
+    */
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      NavigationConfigElement combined = new NavigationConfigElement();
+
+      // add all the existing from view id overrides
+      for (String fromViewId : this.viewIds.keySet())
+      {
+         combined.addOverride(fromViewId, null, this.viewIds.get(fromViewId));
+      }
+      
+      // add all the existing from outcome overrides
+      for (String fromOutcome : this.outcomes.keySet())
+      {
+         combined.addOverride(null, fromOutcome, this.outcomes.get(fromOutcome));
+      }
+      
+      // add all the from view id overrides from the given element
+      NavigationConfigElement navCfg = (NavigationConfigElement)configElement;
+      HashMap<String, NavigationResult> viewIds = navCfg.getViewIds(); 
+      for (String fromViewId : viewIds.keySet())
+      {
+         combined.addOverride(fromViewId, null, viewIds.get(fromViewId));
+      }
+      
+      // add all the from outcome overrides from the given element
+      HashMap<String, NavigationResult> outcomes = navCfg.getOutcomes();
+      for (String fromOutcome : outcomes.keySet())
+      {
+         combined.addOverride(null, fromOutcome, outcomes.get(fromOutcome));
+      }
+      
+      return combined;
+   }
+   
+   /**
+    * Returns the list of view ids that have overrides defined
+    * 
+    * @return Map of view ids and navigation results
+    */
+   public HashMap<String, NavigationResult> getViewIds()
+   {
+      return this.viewIds;
+   }
+   
+   /**
+    * Returns the list of outcomes that have overrides defined
+    * 
+    * @return Map of outcomes and navigation results
+    */
+   public HashMap<String, NavigationResult> getOutcomes()
+   {
+      return this.outcomes;
+   }
+   
+   /**
+    * Adds an override configuration item
+    * 
+    * @param fromViewId The from-view-id value from the config
+    * @param fromOutcome The from-outcome value from the config
+    * @param toViewId The to-view-id value from the config
+    * @param toOutcome The to-outcome value from the config
+    */
+   public void addOverride(String fromViewId, String fromOutcome, 
+         String toViewId, String toOutcome)
+   {
+      // NOTE: the constructor will check the validity of the to* parameters
+      NavigationResult result = new NavigationResult(toViewId, toOutcome);
+      addOverride(fromViewId, fromOutcome, result);
+   }
+   
+   /**
+    * Adds an override configuration item
+    * 
+    * @param fromViewId The from-view-id value from the config
+    * @param fromOutcome The from-outcome value from the config
+    * @param result The navigation result object to add
+    */
+   public void addOverride(String fromViewId, String fromOutcome,
+         NavigationResult result)
+   {
+      if (fromViewId != null && fromOutcome != null)
+      {
+         throw new IllegalStateException("You can not have both a from-view-id and from-outcome");
+      }
+      
+      if (fromViewId != null)
+      {
+         this.viewIds.put(fromViewId, result);
+      }
+      else if (fromOutcome != null)
+      {
+         this.outcomes.put(fromOutcome, result);
+      }
+   }
+   
+   /**
+    * Returns the best match navigation override configured for the given
+    * current view id and/or outcome.
+    * 
+    * If an outcome is passed it takes precedence, the view id will not be
+    * used.
+    * 
+    * @param fromViewId The current view id 
+    * @param fromOutcome The current outcome 
+    * @return The navigation result
+    */
+   public NavigationResult getOverride(String fromViewId, String fromOutcome)
+   {
+      NavigationResult result = null;
+      
+      // look for a match for the outcome if one was provided
+      if (fromOutcome != null)
+      {
+         result = this.outcomes.get(fromOutcome);
+      }
+      else if (fromViewId != null)
+      {
+         result = this.viewIds.get(fromViewId);
+      }
+      
+      return result;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/NavigationElementReader.java b/source/java/org/alfresco/web/config/NavigationElementReader.java
new file mode 100644
index 0000000000..279aea5df7
--- /dev/null
+++ b/source/java/org/alfresco/web/config/NavigationElementReader.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.Iterator;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.dom4j.Element;
+
+/**
+ * Custom element reader to parse config for navigation overrides
+ * 
+ * @author gavinc
+ */
+public class NavigationElementReader implements ConfigElementReader
+{
+   public static final String ELEMENT_NAVIGATION = "navigation";
+   public static final String ELEMENT_OVERRIDE = "override";
+   public static final String ATTR_FROM_VIEWID = "from-view-id";
+   public static final String ATTR_FROM_OUTCOME = "from-outcome";
+   public static final String ATTR_TO_VIEWID = "to-view-id";
+   public static final String ATTR_TO_OUTCOME = "to-outcome";
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   public ConfigElement parse(Element element)
+   {
+      NavigationConfigElement configElement = null;
+      
+      if (element != null)
+      {
+         String name = element.getName();
+         if (ELEMENT_NAVIGATION.equals(name) == false)
+         {
+            throw new ConfigException("NavigationElementReader can only parse " +
+                  ELEMENT_NAVIGATION + "elements, " + "the element passed was '" + 
+                  name + "'");
+         }
+         
+         configElement = new NavigationConfigElement();
+         
+         // go through the items to show
+         Iterator<Element> items = element.elementIterator();
+         while (items.hasNext())
+         {
+            Element item = items.next();
+            
+            // only process the override elements
+            if (ELEMENT_OVERRIDE.equals(item.getName()))
+            {
+               String fromViewId = item.attributeValue(ATTR_FROM_VIEWID);
+               String fromOutcome = item.attributeValue(ATTR_FROM_OUTCOME);
+               String toViewId = item.attributeValue(ATTR_TO_VIEWID);
+               String toOutcome = item.attributeValue(ATTR_TO_OUTCOME);
+               
+               configElement.addOverride(fromViewId, fromOutcome, toViewId, toOutcome);
+            }
+         }
+      }
+      
+      return configElement;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/NavigationResult.java b/source/java/org/alfresco/web/config/NavigationResult.java
new file mode 100644
index 0000000000..1d09a7d3aa
--- /dev/null
+++ b/source/java/org/alfresco/web/config/NavigationResult.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+/**
+ * Represents the result of a navigation config result.
+ * 
+ * This object holds the string result which can either represent an outcome
+ * or a view id. 
+ * 
+ * @author gavinc
+ */
+public class NavigationResult
+{
+   private String result;
+   private boolean isOutcome = true;
+   
+   /**
+    * Default constructor
+    * 
+    * @param viewId The to-view-id value
+    * @param outcome The to-outcome value
+    */
+   public NavigationResult(String viewId, String outcome)
+   {
+      if (viewId != null && outcome != null)
+      {
+         throw new IllegalStateException("You can not have both a to-view-id and to-outcome");
+      }
+      
+      if (outcome != null)
+      {
+         this.result = outcome;
+      }
+      else if (viewId != null)
+      {
+         this.result = viewId;
+         this.isOutcome = false;
+      }
+   }
+   
+   /**
+    * Returns the result
+    * 
+    * @return The result
+    */
+   public String getResult()
+   {
+      return this.result;
+   }
+   
+   /**
+    * Determines whether the result is an outcome
+    * 
+    * @return true if the result represents an outcome, 
+    *         false if it represents a view id
+    */
+   public boolean isOutcome()
+   {
+      return this.isOutcome;
+   }
+   
+   /**
+    * @see java.lang.Object#toString()
+    */
+   public String toString()
+   {
+      StringBuilder buffer = new StringBuilder(super.toString());
+      buffer.append(" (result=").append(this.result);
+      buffer.append(" isOutcome=").append(this.isOutcome).append(")");
+      return buffer.toString();
+   }
+}
diff --git a/source/java/org/alfresco/web/config/NodeTypeEvaluator.java b/source/java/org/alfresco/web/config/NodeTypeEvaluator.java
new file mode 100644
index 0000000000..154a1d42ad
--- /dev/null
+++ b/source/java/org/alfresco/web/config/NodeTypeEvaluator.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import org.alfresco.config.evaluator.Evaluator;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+
+/**
+ * Evaluator that determines whether a given object has a particular node type
+ * 
+ * @author gavinc
+ */
+public class NodeTypeEvaluator implements Evaluator
+{
+   /**
+    * Determines whether the given node type matches the path of the given object
+    * 
+    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    */
+   public boolean applies(Object obj, String condition)
+   {
+      boolean result = false;
+      
+      if (obj instanceof Node)
+      {
+         QName type = ((Node)obj).getType();
+         if (type != null)
+         {
+            result = type.equals(Repository.resolveToQName(condition));
+         }
+      }
+      
+      return result;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/config/PathEvaluator.java b/source/java/org/alfresco/web/config/PathEvaluator.java
new file mode 100644
index 0000000000..1db2aa13bd
--- /dev/null
+++ b/source/java/org/alfresco/web/config/PathEvaluator.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import org.alfresco.config.evaluator.Evaluator;
+import org.alfresco.web.bean.repository.Node;
+
+/**
+ * Evaluator that determines whether a given object has a particular path
+ * 
+ * @author gavinc
+ */
+public class PathEvaluator implements Evaluator
+{
+   /**
+    * Determines whether the given path matches the path of the given object
+    * 
+    * @see org.alfresco.config.evaluator.Evaluator#applies(java.lang.Object, java.lang.String)
+    */
+   public boolean applies(Object obj, String condition)
+   {
+      boolean result = false;
+
+      // TODO: Also deal with NodeRef object's being passed in
+      
+      if (obj instanceof Node)
+      {
+         String path = (String)((Node)obj).getPath();
+         if (path != null)
+         {
+            result = path.equalsIgnoreCase(condition);
+         }
+      }
+      
+      return result;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/config/PropertySheetConfigElement.java b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java
new file mode 100644
index 0000000000..3dafdd0fd6
--- /dev/null
+++ b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.element.ConfigElementAdapter;
+import org.alfresco.config.element.GenericConfigElement;
+
+/**
+ * Custom config element that represents the config data for a property sheet
+ * 
+ * @author gavinc
+ */
+public class PropertySheetConfigElement extends ConfigElementAdapter
+{
+   // TODO: Currently this object just deals with properties and associations to show,
+   //       in the future it will also deal with properties and associations to hide.
+   
+   private List<ItemConfig> items = new ArrayList<ItemConfig>();
+   private Map<String, ItemConfig> itemsMap = new HashMap<String, ItemConfig>();
+   private List<String> itemNames = new ArrayList<String>();
+   private boolean kidsPopulated = false;
+   
+   /**
+    * Default constructor
+    */
+   public PropertySheetConfigElement()
+   {
+      super("property-sheet");
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param name Name of the element this config element represents
+    */
+   public PropertySheetConfigElement(String name)
+   {
+      super(name);
+   }
+   
+   /**
+    * @see org.alfresco.config.ConfigElement#getChildren()
+    */
+   public List<ConfigElement> getChildren()
+   {
+      // lazily build the list of generic config elements representing
+      // the properties as the caller may not even call this method
+      
+      List<ConfigElement> kids = null;
+      
+      if (this.items.size() > 0)
+      {
+         if (this.kidsPopulated == false)
+         {
+            Iterator<ItemConfig> items = this.items.iterator();
+            while (items.hasNext())
+            {
+               ItemConfig pc = items.next();
+               GenericConfigElement ce = null;
+               if (pc instanceof PropertyConfig)
+               {
+                  ce = new GenericConfigElement(PropertySheetElementReader.ELEMENT_SHOW_PROPERTY);
+               }
+               else if (pc instanceof AssociationConfig)
+               {
+                  ce = new GenericConfigElement(PropertySheetElementReader.ELEMENT_SHOW_ASSOC);
+               }
+               else
+               {
+                  ce = new GenericConfigElement(PropertySheetElementReader.ELEMENT_SHOW_CHILD_ASSOC);
+               }
+               
+               ce.addAttribute(PropertySheetElementReader.ATTR_NAME, pc.getName());
+               ce.addAttribute(PropertySheetElementReader.ATTR_DISPLAY_LABEL, pc.getDisplayLabel());
+               ce.addAttribute(PropertySheetElementReader.ATTR_DISPLAY_LABEL_ID, pc.getDisplayLabelId());
+               ce.addAttribute(PropertySheetElementReader.ATTR_READ_ONLY, Boolean.toString(pc.isReadOnly()));
+               ce.addAttribute(PropertySheetElementReader.ATTR_CONVERTER, pc.getConverter());
+               this.children.add(ce);
+            }
+            
+            this.kidsPopulated = true;
+         }
+         
+         kids = super.getChildren();
+      }
+      
+      return kids;
+   }
+   
+   /**
+    * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement)
+    */
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      PropertySheetConfigElement combined = new PropertySheetConfigElement();
+      
+      // add all the existing properties
+      Iterator<ItemConfig> items = this.getItemsToShow().iterator();
+      while (items.hasNext())
+      {
+         combined.addItem(items.next());
+      }
+      
+      // add all the properties from the given element
+      items = ((PropertySheetConfigElement)configElement).getItemsToShow().iterator();
+      while (items.hasNext())
+      {
+         combined.addItem(items.next());
+      }
+      
+      return combined;
+   }
+   
+   /**
+    * Adds an item to show
+    * 
+    * @param itemConfig A pre-configured property or association config object
+    */
+   public void addItem(ItemConfig itemConfig)
+   {
+      if (this.itemsMap.containsKey(itemConfig.getName()) == false)
+      {
+         this.items.add(itemConfig);
+         this.itemsMap.put(itemConfig.getName(), itemConfig);
+         this.itemNames.add(itemConfig.getName());
+      }
+   }
+   
+   /**
+    * Adds a property to show
+    * 
+    * @param name The name of the property
+    * @param displayLabel Display label to use for the property
+    * @param displayLabelId Display label message id to use for the property
+    * @param readOnly Sets whether the property should be rendered as read only
+    * @param converter The name of a converter to apply to the property control
+    */
+   public void addProperty(String name, String displayLabel, String displayLabelId, String readOnly, String converter)
+   {
+      addItem(new PropertyConfig(name, displayLabel, displayLabelId, Boolean.parseBoolean(readOnly), converter));
+   }
+   
+   /**
+    * Adds an association to show
+    * 
+    * @param name The name of the association
+    * @param displayLabel Display label to use for the property
+    * @param displayLabelId Display label message id to use for the property
+    * @param readOnly Sets whether the association should be rendered as read only
+    * @param converter The name of a converter to apply to the association control
+    */
+   public void addAssociation(String name, String displayLabel, String displayLabelId, String readOnly, String converter)
+   {
+      addItem(new AssociationConfig(name, displayLabel, displayLabelId, Boolean.parseBoolean(readOnly), converter));
+   }
+   
+   /**
+    * Adds a child association to show
+    * 
+    * @param name The name of the child association
+    * @param displayLabel Display label to use for the property
+    * @param displayLabelId Display label message id to use for the property
+    * @param readOnly Sets whether the association should be rendered as read only
+    * @param converter The name of a converter to apply to the association control
+    */
+   public void addChildAssociation(String name, String displayLabel, String displayLabelId, String readOnly, String converter)
+   {
+      addItem(new ChildAssociationConfig(name, displayLabel, displayLabelId, Boolean.parseBoolean(readOnly), converter));
+   }
+   
+   /**
+    * @return Returns a list of item names to display
+    */
+   public List<String> getItemNamesToShow()
+   {
+      return this.itemNames;
+   }
+   
+   /**
+    * @return Returns the list of item config objects that represent those to display
+    */
+   public List<ItemConfig> getItemsToShow()
+   {
+      return this.items;
+   }
+   
+   /**
+    * @return Returns a map of the item names to show
+    */
+   public Map<String, ItemConfig> getItemsMapToShow()
+   {
+      return this.itemsMap;
+   }
+   
+   /**
+    * Inner class to represent a configured property sheet item
+    */
+   public abstract class ItemConfig
+   {
+      private String name;
+      private String displayLabel;
+      private String displayLabelId;
+      private String converter;
+      private boolean readOnly;
+      
+      public ItemConfig(String name, String displayLabel, String displayLabelId, 
+            boolean readOnly, String converter)
+      {
+         this.name = name;
+         this.displayLabel = displayLabel;
+         this.displayLabelId = displayLabelId;
+         this.readOnly = readOnly;
+         this.converter = converter;
+      }
+      
+      /**
+       * @return The display label
+       */
+      public String getDisplayLabel()
+      {
+         return this.displayLabel;
+      }
+      
+      /**
+       * @return The display label message id
+       */
+      public String getDisplayLabelId()
+      {
+         return this.displayLabelId;
+      }
+      
+      /**
+       * @return The property name
+       */
+      public String getName()
+      {
+         return this.name;
+      }
+      
+      /**
+       * @return Determines whether the property is configured as read only
+       */
+      public boolean isReadOnly()
+      {
+         return this.readOnly;
+      }
+      
+      public String getConverter()
+      {
+         return this.converter;
+      }
+      
+      /**
+       * @see java.lang.Object#toString()
+       */
+      public String toString()
+      {
+         StringBuilder buffer = new StringBuilder(super.toString());
+         buffer.append(" (name=").append(this.name);
+         buffer.append(" displaylabel=").append(this.displayLabel);
+         buffer.append(" displaylabelId=").append(this.displayLabelId);
+         buffer.append(" converter=").append(this.converter);
+         buffer.append(" readonly=").append(this.readOnly).append(")");
+         return buffer.toString();
+      }
+   }
+   
+   /**
+    * Inner class to represent a configured property
+    */
+   public class PropertyConfig extends ItemConfig
+   {
+      public PropertyConfig(String name, String displayLabel, String displayLabelId, 
+            boolean readOnly, String converter)
+      {
+         super(name, displayLabel, displayLabelId, readOnly, converter);
+      }
+   }
+   
+   /**
+    * Inner class to represent a configured association
+    */
+   public class AssociationConfig extends ItemConfig
+   {
+      public AssociationConfig(String name, String displayLabel, String displayLabelId, 
+            boolean readOnly, String converter)
+      {
+         super(name, displayLabel, displayLabelId, readOnly, converter);
+      }
+   }
+   
+   /**
+    * Inner class to represent a configured child association
+    */
+   public class ChildAssociationConfig extends ItemConfig
+   {
+      public ChildAssociationConfig(String name, String displayLabel, String displayLabelId, 
+            boolean readOnly, String converter)
+      {
+         super(name, displayLabel, displayLabelId, readOnly, converter);
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/config/PropertySheetElementReader.java b/source/java/org/alfresco/web/config/PropertySheetElementReader.java
new file mode 100644
index 0000000000..3832c5ed07
--- /dev/null
+++ b/source/java/org/alfresco/web/config/PropertySheetElementReader.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.Iterator;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.dom4j.Element;
+
+/**
+ * Custom element reader to parse config for property sheets
+ * 
+ * @author gavinc
+ */
+public class PropertySheetElementReader implements ConfigElementReader
+{
+   public static final String ELEMENT_PROPERTY_SHEET = "property-sheet";
+   public static final String ELEMENT_SHOW_PROPERTY = "show-property";
+   public static final String ELEMENT_SHOW_ASSOC = "show-association";
+   public static final String ELEMENT_SHOW_CHILD_ASSOC = "show-child-association";
+   public static final String ATTR_NAME = "name";
+   public static final String ATTR_DISPLAY_LABEL = "displayLabel";
+   public static final String ATTR_DISPLAY_LABEL_ID = "displayLabelId";
+   public static final String ATTR_READ_ONLY = "readOnly";
+   public static final String ATTR_CONVERTER = "converter";
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   public ConfigElement parse(Element element)
+   {
+      PropertySheetConfigElement configElement = null;
+      
+      if (element != null)
+      {
+         String name = element.getName();
+         if (name.equals(ELEMENT_PROPERTY_SHEET) == false)
+         {
+            throw new ConfigException("PropertySheetElementReader can only parse " +
+                  ELEMENT_PROPERTY_SHEET + "elements, " + "the element passed was '" + 
+                  name + "'");
+         }
+         
+         configElement = new PropertySheetConfigElement();
+         
+         // go through the items to show
+         Iterator<Element> items = element.elementIterator();
+         while (items.hasNext())
+         {
+            Element item = items.next();
+            String propName = item.attributeValue(ATTR_NAME);
+            String label = item.attributeValue(ATTR_DISPLAY_LABEL);
+            String labelId = item.attributeValue(ATTR_DISPLAY_LABEL_ID);
+            String readOnly = item.attributeValue(ATTR_READ_ONLY);
+            String converter = item.attributeValue(ATTR_CONVERTER);
+            
+            if (ELEMENT_SHOW_PROPERTY.equals(item.getName()))
+            {
+               // add the property to show to the custom config element
+               configElement.addProperty(propName, label, labelId, readOnly, converter);
+            }
+            else if (ELEMENT_SHOW_ASSOC.equals(item.getName()))
+            {
+               configElement.addAssociation(propName, label, labelId, readOnly, converter);
+            }
+            else if (ELEMENT_SHOW_CHILD_ASSOC.equals(item.getName()))
+            {
+               configElement.addChildAssociation(propName, label, labelId, readOnly, converter);
+            }
+         }
+      }
+      
+      return configElement;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/config/ServerConfigElement.java b/source/java/org/alfresco/web/config/ServerConfigElement.java
new file mode 100644
index 0000000000..956ab5b302
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ServerConfigElement.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.element.ConfigElementAdapter;
+
+/**
+ * Custom config element that represents the config data for the server
+ * 
+ * @author gavinc
+ */
+public class ServerConfigElement extends ConfigElementAdapter
+{
+   public static final String CONFIG_ELEMENT_ID = "server";
+   
+   private String errorPage;
+   private String loginPage;
+   
+   /**
+    * Default constructor
+    */
+   public ServerConfigElement()
+   {
+      super(CONFIG_ELEMENT_ID);
+   }
+   
+   /**
+    * Constructor
+    * 
+    * @param name Name of the element this config element represents
+    */
+   public ServerConfigElement(String name)
+   {
+      super(name);
+   }
+   
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      // NOTE: combining these would simply override the values so we just need
+      //       to return a new instance of the given config element
+      
+      ServerConfigElement combined = new ServerConfigElement();
+      combined.setErrorPage(((ServerConfigElement)configElement).getErrorPage());
+      combined.setLoginPage(((ServerConfigElement)configElement).getLoginPage());
+      return combined;
+   }
+   
+   /**
+    * @return The error page the application should use
+    */
+   public String getErrorPage()
+   {
+      return this.errorPage;
+   }
+
+   /**
+    * @param errorPage Sets the error page
+    */
+   public void setErrorPage(String errorPage)
+   {
+      this.errorPage = errorPage;
+   }
+   
+   /**
+    * @return Returns the login Page.
+    */
+   public String getLoginPage()
+   {
+      return this.loginPage;
+   }
+   
+   /**
+    * @param loginPage The login Page to set.
+    */
+   public void setLoginPage(String loginPage)
+   {
+      this.loginPage = loginPage;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/ServerElementReader.java b/source/java/org/alfresco/web/config/ServerElementReader.java
new file mode 100644
index 0000000000..2ff2415235
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ServerElementReader.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.dom4j.Element;
+
+/**
+ * Custom element reader to parse config for server details
+ * 
+ * @author gavinc
+ */
+public class ServerElementReader implements ConfigElementReader
+{
+   public static final String ELEMENT_ERROR_PAGE = "error-page";
+   public static final String ELEMENT_LOGIN_PAGE = "login-page";
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   public ConfigElement parse(Element element)
+   {
+      ServerConfigElement configElement = null;
+      
+      if (element != null)
+      {
+         String name = element.getName();
+         if (name.equals(ServerConfigElement.CONFIG_ELEMENT_ID) == false)
+         {
+            throw new ConfigException("ServerElementReader can only parse " +
+                  ServerConfigElement.CONFIG_ELEMENT_ID + "elements, " + 
+                  "the element passed was '" + name + "'");
+         }
+         
+         configElement = new ServerConfigElement();
+         
+         // get the error page
+         Element errorPage = element.element(ELEMENT_ERROR_PAGE);
+         if (errorPage != null)
+         {
+            configElement.setErrorPage(errorPage.getTextTrim());
+         }
+         
+         // get the login page
+         Element loginPage = element.element(ELEMENT_LOGIN_PAGE);
+         if (loginPage != null)
+         {
+            configElement.setLoginPage(loginPage.getTextTrim());
+         }
+      }
+      
+      return configElement;
+   }
+}
diff --git a/source/java/org/alfresco/web/config/WebClientConfigTest.java b/source/java/org/alfresco/web/config/WebClientConfigTest.java
new file mode 100644
index 0000000000..5dd44a89b1
--- /dev/null
+++ b/source/java/org/alfresco/web/config/WebClientConfigTest.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.source.FileConfigSource;
+import org.alfresco.config.xml.XMLConfigService;
+import org.alfresco.util.BaseTest;
+import org.alfresco.web.config.PropertySheetConfigElement.ItemConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * JUnit tests to exercise the capabilities added to the web client config
+ * service
+ * 
+ * @author gavinc
+ */
+public class WebClientConfigTest extends BaseTest
+{
+   private static Log logger = LogFactory.getLog(WebClientConfigTest.class);
+
+   /**
+    * @see junit.framework.TestCase#setUp()
+    */
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+
+      logger.info("******************************************************");
+   }
+
+   /**
+    * Tests the property sheet configuration classes
+    */
+   public void testPropertySheetConfig()
+   {
+      // setup the config service
+      String configFile = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFile));
+      svc.init();
+
+      // get hold of the property sheet config from the global section
+      Config global = svc.getGlobalConfig();
+      ConfigElement globalPropSheet = global.getConfigElement("property-sheet");
+      assertNotNull("global property sheet element should not be null", globalPropSheet);
+      assertTrue("config element should be an instance of PropertySheetConfigElement",
+            (globalPropSheet instanceof PropertySheetConfigElement));
+
+      // get the property names from the global section and make sure it is the
+      // name property
+      List<String> propNames = ((PropertySheetConfigElement) globalPropSheet).getItemNamesToShow();
+      logger.info("propNames = " + propNames);
+      assertTrue("There should only be one property in the list", propNames.size() == 1);
+      assertTrue("The property name should be 'name'", propNames.get(0).equals("name"));
+
+      // get the config section representing a space aspect and make sure we get
+      // 5 properties
+      Config spaceAspectConfig = svc.getConfig("space-aspect");
+      assertNotNull("Space aspect config should not be null", spaceAspectConfig);
+      PropertySheetConfigElement spacePropConfig = (PropertySheetConfigElement) spaceAspectConfig
+            .getConfigElement("property-sheet");
+      assertNotNull("Space aspect property config should not be null", spacePropConfig);
+      propNames = spacePropConfig.getItemNamesToShow();
+      logger.info("propNames = " + propNames);
+      assertTrue("There should be 5 properties in the list", propNames.size() == 5);
+
+      // make sure the property sheet config has come back with the correct data
+      Map<String, ItemConfig> props = spacePropConfig.getItemsMapToShow();
+      ItemConfig descProp = props.get("description");
+      assertNotNull("description property config should not be null", descProp);
+      assertEquals("display label for description should be 'Description'", descProp.getDisplayLabel(), 
+            "Description");
+      assertFalse("read only for description should be 'false'", descProp.isReadOnly());
+
+      ItemConfig createdDataProp = props.get("createddate");
+      assertNotNull("createddate property config should not be null", createdDataProp);
+      assertEquals("display label for createddate should be null", null, createdDataProp.getDisplayLabel());
+      assertTrue("read only for createddate should be 'true'", createdDataProp.isReadOnly());
+
+      ItemConfig iconProp = props.get("icon");
+      assertNotNull("icon property config should not be null", iconProp);
+      assertEquals("display label for icon should be null", null, iconProp.getDisplayLabel());
+      assertFalse("read only for icon should be 'false'", iconProp.isReadOnly());
+   }
+
+   /**
+    * Tests the config service by retrieving property sheet configuration using
+    * the generic interfaces
+    */
+   public void testGenericConfigElement()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+
+      // get the space aspect configuration
+      Config configProps = svc.getConfig("space-aspect");
+      ConfigElement propsToDisplay = configProps.getConfigElement("property-sheet");
+      assertNotNull("property sheet config should not be null", propsToDisplay);
+
+      // get all the property names using the ConfigElement interface methods
+      List<ConfigElement> kids = propsToDisplay.getChildren();
+      List<String> propNames = new ArrayList<String>();
+      for (ConfigElement propElement : propsToDisplay.getChildren())
+      {
+         String value = propElement.getValue();
+         assertNull("property value should be null", value);
+         String propName = propElement.getAttribute("name");
+         propNames.add(propName);
+      }
+
+      logger.info("propNames = " + propNames);
+      assertTrue("There should be 5 properties", propNames.size() == 5);
+      assertFalse("The id attribute should not be present", propsToDisplay.hasAttribute("id"));
+   }
+
+   /**
+    * Tests the config service by retrieving property sheet configuration using
+    * the custom config objects
+    */
+   public void testGetProperties()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+      
+      // get the space aspect configuration
+      Config configProps = svc.getConfig("space-aspect");
+      PropertySheetConfigElement propsToDisplay = (PropertySheetConfigElement)configProps.
+            getConfigElement("property-sheet");
+      assertNotNull("property sheet config should not be null", propsToDisplay);
+      
+      // get all the property names using the PropertySheetConfigElement implementation
+      List<String> propNames = propsToDisplay.getItemNamesToShow();
+              
+      // make sure the generic interfaces are also returning the correct data
+      List<ConfigElement> kids = propsToDisplay.getChildren();
+      assertNotNull("kids should not be null", kids);
+      assertTrue("There should be more than one child", kids.size() > 1);
+      
+      logger.info("propNames = " + propNames);
+      assertEquals("There should be 5 properties", propNames.size() == 5, true);
+      assertFalse("The id attribute should not be present", propsToDisplay.hasAttribute("id"));
+   }
+   
+   /**
+    * Tests the custom server configuration objects
+    */
+   public void testServerConfig()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+      
+      // get the global config and from that the server config
+      ServerConfigElement serverConfig = (ServerConfigElement)svc.getGlobalConfig().
+         getConfigElement(ServerConfigElement.CONFIG_ELEMENT_ID);
+      assertNotNull("server config should not be null", serverConfig);
+      
+      String errorPage = serverConfig.getErrorPage();
+      assertTrue("error page should be '/jsp/error.jsp'", errorPage.equals("/jsp/error.jsp"));
+   }
+   
+   /**
+    * Tests the custom client configuration objects 
+    */
+   public void testClientConfig()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+      
+      // get the global config and from that the client config
+      ClientConfigElement clientConfig = (ClientConfigElement)svc.getGlobalConfig().
+         getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID);
+      assertNotNull("client config should not be null", clientConfig);
+      
+      List<String> views = clientConfig.getViews();
+      assertEquals("There should be 2 configured views", 2, views.size());
+      String renderer = views.get(1);
+      assertEquals("Renderer for the icons view should be 'org.alfresco.web.ui.common.renderer.data.RichListRenderer.IconViewRenderer'", 
+            "org.alfresco.web.ui.common.renderer.data.RichListRenderer.IconViewRenderer", renderer);
+      
+      String defaultView = clientConfig.getDefaultView("topic");
+      assertEquals("Default view for topic should be 'bubble'", "bubble", defaultView);
+      
+      // get the defualt view for something that doesn't exist
+      defaultView = clientConfig.getDefaultView("not-there");
+      assertEquals("Default view for missing view should be 'details'", "details", defaultView);
+      
+      // get the default page size for the forum details view
+      int pageSize = clientConfig.getDefaultPageSize("forum", "details");
+      assertEquals("Page size for forum details should be 20", 20, pageSize);
+      
+      // get the defualt page size for a non existent view
+      pageSize = clientConfig.getDefaultPageSize("not", "there");
+      assertEquals("Page size for forum details should be 10", 10, pageSize);
+      
+      // get the default page size for a non existent screen and valid view
+      pageSize = clientConfig.getDefaultPageSize("not-there", "icons");
+      assertEquals("Page size for icons view should be 9", 9, pageSize);
+      
+      // test the sort column
+      String column = clientConfig.getDefaultSortColumn("browse");
+      assertEquals("Sort column for browse should be 'name'", "name", column);
+      
+      column = clientConfig.getDefaultSortColumn("topic");
+      assertEquals("Sort column for topic should be 'created'", "created", column);
+      
+      // test the sorting direction
+      boolean sortDescending = clientConfig.hasDescendingSort("browse");
+      assertFalse("browse screen should use an ascending sort", sortDescending);
+      
+      sortDescending = clientConfig.hasDescendingSort("topic");
+      assertTrue("topic screen should use a descending sort", sortDescending);
+   }
+   
+   /**
+    * Tests the navigation config i.e. the custom element reader and config element
+    */
+   public void testNavigation()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+
+      // *** Test the returning of a view id override
+      Config testCfg = svc.getConfig("viewid-navigation-result");
+      assertNotNull("viewid-navigation-result config should not be null", testCfg);
+      
+      NavigationConfigElement navCfg = (NavigationConfigElement)testCfg.getConfigElement("navigation");
+      assertNotNull("navigation config should not be null", navCfg);
+      
+      // get the result for the browse view id
+      NavigationResult navResult = navCfg.getOverride("/jsp/browse/browse.jsp", null);
+      assertEquals("result should be '/jsp/forums/forums.jsp'", "/jsp/forums/forums.jsp", 
+            navResult.getResult());
+      assertFalse("isOutcome test should be false", navResult.isOutcome());
+      
+      // get the result for the browse outcome
+      navResult = navCfg.getOverride(null, "browse");
+      assertEquals("result should be '/jsp/forums/topics.jsp'", "/jsp/forums/topics.jsp", 
+            navResult.getResult());
+      assertFalse("isOutcome test should be false", navResult.isOutcome());
+      
+      // get the result when passing both the browse view id and outcome, make
+      // sure we get the result for the outcome as it should take precedence
+      navResult = navCfg.getOverride("/jsp/browse/browse.jsp", "browse");
+      assertEquals("result should be '/jsp/forums/topics.jsp'", "/jsp/forums/topics.jsp", 
+            navResult.getResult());
+      assertFalse("isOutcome test should be false", navResult.isOutcome());
+      
+      // *** Test the returning of an outcome override
+      testCfg = svc.getConfig("outcome-navigation-result");
+      assertNotNull("outcome-navigation-result config should not be null", testCfg);
+      
+      navCfg = (NavigationConfigElement)testCfg.getConfigElement("navigation");
+      assertNotNull("navigation config should not be null", navCfg);
+      
+      // get the result for the browse view id
+      navResult = navCfg.getOverride("/jsp/browse/browse.jsp", null);
+      assertEquals("result should be 'showSomethingElse'", "showSomethingElse", 
+            navResult.getResult());
+      assertTrue("isOutcome test should be true", navResult.isOutcome());
+      
+      // get the result for the browse outcome
+      navResult = navCfg.getOverride(null, "browse");
+      assertEquals("result should be 'showSomethingElse'", "showSomethingElse", 
+            navResult.getResult());
+      assertTrue("isOutcome test should be true", navResult.isOutcome());
+      
+      // get the result when passing both the browse view id and outcome, make
+      // sure we get the result for the outcome as it should take precedence
+      navResult = navCfg.getOverride("/jsp/browse/browse.jsp", "browse");
+      assertEquals("result should be 'showSomethingElse'", "showSomethingElse", 
+            navResult.getResult());
+      assertTrue("isOutcome test should be true", navResult.isOutcome());
+      
+      // *** Test the duplicate result config 
+      testCfg = svc.getConfig("duplicate-navigation-overrides");
+      assertNotNull("duplicate-navigation-overrides config should not be null", testCfg);
+      
+      navCfg = (NavigationConfigElement)testCfg.getConfigElement("navigation");
+      assertNotNull("navigation config should not be null", navCfg);
+      
+      // make sure the outcome result is 'newOutcome'
+      navResult = navCfg.getOverride(null, "browse");
+      assertEquals("result should be 'newOutcome'", "newOutcome", 
+            navResult.getResult());
+      assertTrue("isOutcome test should be true", navResult.isOutcome());
+      
+      // call getOverride passing a valid view id but an invalid outcome
+      // and make sure the result is null
+      navResult = navCfg.getOverride("/jsp/browse/browse.jsp", "nonExistentOutcome");
+      assertNull("result should be null", navResult);
+   }
+   
+   public void testNavigationGenericConfig()
+   {
+      // setup the config service
+      String configFiles = getResourcesDir() + "test-config.xml";
+      XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
+      svc.init();
+      
+      // do a lookup using the generic config elements and make sure the correct
+      // info comes out
+      Config testCfg = svc.getConfig("duplicate-navigation-overrides");
+      assertNotNull("duplicate-navigation-overrides config should not be null", testCfg);
+      
+      ConfigElement ce = testCfg.getConfigElement("navigation");
+      assertNotNull("navigation config should not be null", ce);
+      
+      List<ConfigElement> children = ce.getChildren();
+      assertNotNull(children);
+      
+      // make sure there are 2 children
+      assertEquals("There should be 2 children", 2, children.size());
+      
+      // get the first child and make sure the attributes are correct,
+      // from-view-id should be '/jsp/browse/browse.jsp' and to-view-id
+      // should be '/jsp/forums/forums.jsp'
+      ConfigElement child = children.get(0);
+      String fromViewId = child.getAttribute("from-view-id");
+      String fromOutcome = child.getAttribute("from-outcome");
+      String toViewId = child.getAttribute("to-view-id");
+      String toOutcome = child.getAttribute("to-outcome");
+      
+      logger.info("fromViewId = " + fromViewId);
+      logger.info("fromOutcome = " + fromOutcome);
+      logger.info("toViewId = " + toViewId);
+      logger.info("toOutcome = " + toOutcome);
+      
+      assertNull(fromOutcome);
+      assertNull(toOutcome);
+      
+      assertEquals("/jsp/browse/browse.jsp", fromViewId);
+      assertEquals("/jsp/forums/forums.jsp", toViewId);
+      
+      // get the second child and make sure the attributes are correct,
+      // from-outcome should be 'browse' and to-outcome should be 'newOutcome'
+      child = children.get(1);
+      fromViewId = child.getAttribute("from-view-id");
+      fromOutcome = child.getAttribute("from-outcome");
+      toViewId = child.getAttribute("to-view-id");
+      toOutcome = child.getAttribute("to-outcome");
+      
+      logger.info("fromViewId = " + fromViewId);
+      logger.info("fromOutcome = " + fromOutcome);
+      logger.info("toViewId = " + toViewId);
+      logger.info("toOutcome = " + toOutcome);
+      
+      assertNull(fromViewId);
+      assertNull(toViewId);
+      
+      assertEquals("browse", fromOutcome);
+      assertEquals("newOutcome", toOutcome);
+   }
+}
diff --git a/source/java/org/alfresco/web/data/IDataContainer.java b/source/java/org/alfresco/web/data/IDataContainer.java
new file mode 100644
index 0000000000..9ba03ecbe5
--- /dev/null
+++ b/source/java/org/alfresco/web/data/IDataContainer.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.data;
+
+/**
+ * @author kevinr
+ */
+public interface IDataContainer
+{
+   /**
+    * Return the currently sorted column if any
+    * 
+    * @return current sorted column if any
+    */
+   public String getCurrentSortColumn();
+   
+   /**
+    * Returns the current sort direction. Only valid if a sort column is set.
+    * True is returned for descending sort, false for accending sort.
+    * 
+    * @return true for descending sort, false for accending sort
+    */
+   public boolean isCurrentSortDescending();
+   
+   /**
+    * Returns the current page size used for this list, or -1 for no paging.
+    */
+   public int getPageSize();
+   
+   /**
+    * Return the current page the list is displaying
+    * 
+    * @return Current page with zero based index
+    */
+   public int getCurrentPage();
+   
+   /**
+    * Set the current page to display.
+    * 
+    * @param index      Zero based page index to display
+    */
+   public void setCurrentPage(int index);
+   
+   /**
+    * Return the count of max available pages
+    * 
+    * @return count of max available pages
+    */
+   public int getPageCount();
+   
+   /**
+    * Returns true if a row of data is available
+    * 
+    * @return true if data is available, false otherwise
+    */
+   public boolean isDataAvailable();
+   
+   /**
+    * Returns the next row of data from the data model
+    * 
+    * @return next row of data as a Bean object
+    */
+   public Object nextRow();
+   
+   /**
+    * Sort the dataset using the specified sort parameters
+    * 
+    * @param column        Column to sort
+    * @param descending    True for descending sort, false for ascending
+    * @param mode          Sort mode to use (see IDataContainer constants)
+    */
+   public void sort(String column, boolean descending, String mode);
+   
+   public final static String SORT_CASEINSENSITIVE = "case-insensitive";
+   public final static String SORT_CASESENSITIVE   = "case-sensitive";
+}
diff --git a/source/java/org/alfresco/web/data/MergeSort.java b/source/java/org/alfresco/web/data/MergeSort.java
new file mode 100644
index 0000000000..6bb4b6eaff
--- /dev/null
+++ b/source/java/org/alfresco/web/data/MergeSort.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.data;
+
+import java.util.List;
+
+/**
+ * @author kevinr
+ */
+public final class MergeSort extends Sort
+{
+   /**
+    * Constructor
+    * 
+    * @param data             a the List of String[] data to sort
+    * @param column           the column getter method to use on the row to sort
+    * @param bForward         true for a forward sort, false for a reverse sort
+    * @param mode             sort mode to use (see IDataContainer constants)
+    */
+   public MergeSort(List data, String column, boolean bForward, String mode)
+   {
+      super(data, column, bForward, mode);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Sort Implementation
+   
+   /**
+    * Runs the Quick Sort routine on the current dataset
+    */
+   public void sort()
+   {
+      if (this.data.size() != 0)
+      {
+         // TODO: finish this!
+         //mergesort(this.data, 0, this.data.size() - 1);
+         
+         /*a = this.data;
+          
+          int n = a.length;
+          
+          b = new int[(n+1) >> 1];
+          mergesort(0, n-1);*/
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private methods
+   
+   /*private static Object[] a, b;
+   
+   private static void mergesort(int lo, int hi)
+   {
+      if (lo<hi)
+      {
+         int m=(lo+hi) >> 1;
+         mergesort(lo, m);
+         mergesort(m+1, hi);
+         merge(lo, m, hi);
+      }
+   }
+   
+   private static void merge(int lo, int m, int hi)
+   {
+      int i, j, k;
+      
+      i=0;
+      j=lo;
+      
+      // copy first half of array a to auxiliary array b
+      while (j <= m)
+      {
+         b[i++] = a[j++];
+      }
+      
+      i=0;
+      k=lo;
+      
+      // copy back next-greatest element at each time
+      while (k < j && j <= hi)
+      {
+         if (b[i] <= a[j])
+         {
+            a[k++]=b[i++];
+         }
+         else
+         {
+            a[k++]=a[j++];
+         }
+      }
+      
+      // copy back remaining elements of first half (if any)
+      while (k < j)
+      {
+         a[k++] = b[i++];
+      }
+   }*/
+}
diff --git a/source/java/org/alfresco/web/data/QuickSort.java b/source/java/org/alfresco/web/data/QuickSort.java
new file mode 100644
index 0000000000..98cc13c1d7
--- /dev/null
+++ b/source/java/org/alfresco/web/data/QuickSort.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.data;
+
+import java.util.List;
+
+/**
+ * QuickSort
+ * 
+ * Implementation of a locale sensitive Quick Sort algorithm. The sorting supports
+ * locale specific case sensitive, case in-sensitive and numeric data sorting. The
+ * numeric sorting handles integer, floating point and scientific formats, with
+ * short-circuit value parsing.
+ * 
+ * @author Kevin Roast
+ */
+public final class QuickSort extends Sort
+{
+   /**
+    * Constructor
+    * 
+    * @param data             a the List of String[] data to sort
+    * @param column           the column getter method to use on the row to sort
+    * @param bForward         true for a forward sort, false for a reverse sort
+    * @param mode             sort mode to use (see IDataContainer constants)
+    */
+   public QuickSort(List data, String column, boolean bForward, String mode)
+   {
+      super(data, column, bForward, mode);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Sort Implementation
+   
+   /**
+    * Runs the Quick Sort routine on the current dataset
+    */
+   public void sort()
+   {
+      if (this.data.size() != 0)
+      {
+         qsort(this.data, 0, this.data.size() - 1);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private methods
+   
+   /**
+    * recursive Quicksort function.
+    * 
+    * @param v       the array out of which to take a slice.
+    * @param lower   the lower bound of this slice.
+    * @param upper   the upper bound of this slice.
+    */
+   private void qsort(final List v, final int lower, final int upper)
+   {
+      int sliceLength = upper - lower + 1 ;
+      if (sliceLength > 1)
+      {
+         if (sliceLength < 7)
+         {
+            // Insertion sort on smallest datasets
+            for (int i=lower; i<=upper; i++)
+            {
+               if (this.bForward == true)
+               {
+                  for (int j=i; j > lower && getComparator().compare(this.keys.get(j - 1), this.keys.get(j)) > 0; j--)
+                  {
+                     // swap both the keys and the actual row data
+                     swap(this.keys, j - 1, j);
+                     swap(v, j - 1, j);
+                  }
+               }
+               else
+               {
+                  for (int j=i; j > lower && getComparator().compare(this.keys.get(j - 1), this.keys.get(j)) < 0; j--)
+                  {
+                     // swap both the keys and the actual row data
+                     swap(this.keys, j - 1, j);
+                     swap(v, j - 1, j);
+                  }
+               }
+            }
+         }
+         else
+         {
+            int pivotIndex = partition(v, lower, upper);
+            qsort(v, lower, pivotIndex);
+            qsort(v, pivotIndex + 1, upper);
+         }
+      }
+   }
+   
+   /**
+    *  Partition an array in two using the pivot value that is at the
+    *  centre of the array being partitioned.
+    *
+    *  This partition implementation based on that in Winder, R
+    *  (1993) "Developing C++ Software", Wiley, p.395.  NB. This
+    *  implementation (unlike most others) does not guarantee that
+    *  the split point contains the pivot value.  Unlike other
+    *  implementations, it requires only < (or >) relation and not
+    *  both < and <= (or > and >=).  Also, it seems easier to program
+    *  and to understand.
+    *
+    *  @param v       the List out of which to take a slice.
+    *  @param lower   the lower bound of this slice.
+    *  @param upper   the upper bound of this slice.
+    */
+   private int partition(final List v, int lower, int upper)
+   {
+      List keys = this.keys;
+      Object pivotValue = keys.get((upper + lower + 1) >> 1) ;
+      
+      int size = keys.size();
+      
+      while (lower <= upper)
+      {
+         if (this.bForward == true)
+         {
+            while (getComparator().compare(keys.get(lower), pivotValue) < 0)
+            {
+               lower++;
+            }
+            while (getComparator().compare(pivotValue, keys.get(upper)) < 0)
+            {
+               upper--;
+            }
+         }
+         else
+         {
+            while (getComparator().compare(keys.get(lower), pivotValue) > 0)
+            {
+               lower++;
+            }
+            while (getComparator().compare(pivotValue, keys.get(upper)) > 0)
+            {
+               upper--;
+            }
+         }
+         if (lower <= upper)
+         {
+            if (lower < upper)
+            {
+               swap(keys, lower, upper);
+               swap(v, lower, upper);
+            }
+            lower++;
+            upper--;
+         }
+      }
+      
+      return upper;
+   }
+   
+} // end class QuickSort
diff --git a/source/java/org/alfresco/web/data/Sort.java b/source/java/org/alfresco/web/data/Sort.java
new file mode 100644
index 0000000000..67bc8fac81
--- /dev/null
+++ b/source/java/org/alfresco/web/data/Sort.java
@@ -0,0 +1,440 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.data;
+
+import java.lang.reflect.Method;
+import java.text.CollationKey;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Sort
+ * 
+ * Base sorting helper supports locale specific case sensitive, case in-sensitive and
+ * numeric data sorting.
+ * 
+ * @author Kevin Roast
+ */
+public abstract class Sort
+{
+   // ------------------------------------------------------------------------------
+   // Construction
+   
+   /**
+    * Constructor
+    * 
+    * @param data             a the List of String[] data to sort
+    * @param column           the column getter method to use on the row to sort
+    * @param bForward         true for a forward sort, false for a reverse sort
+    * @param mode             sort mode to use (see IDataContainer constants)
+    */
+   public Sort(List data, String column, boolean bForward, String mode)
+   {
+      this.data = data;
+      this.column = column;
+      this.bForward = bForward;
+      this.sortMode = mode;
+      
+      if (this.data.size() != 0)
+      {
+         // setup the Collator for our Locale
+         Collator collator = Collator.getInstance(Locale.getDefault());
+         
+         // set the strength according to the sort mode
+         if (mode.equals(IDataContainer.SORT_CASEINSENSITIVE))
+         {
+            collator.setStrength(Collator.SECONDARY);
+         }
+         else
+         {
+            collator.setStrength(Collator.IDENTICAL);
+         }
+         
+         this.keys = buildCollationKeys(collator);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Abstract Methods
+   
+   /**
+    * Runs the Sort routine on the current dataset
+    */
+   public abstract void sort();
+   
+   
+   // ------------------------------------------------------------------------------
+   // Helper methods
+   
+   /**
+    * Build a list of collation keys for comparing locale sensitive strings or build
+    * the appropriate objects for comparison for other standard data types.
+    * 
+    * @param collator      the Collator object to use to build String keys
+    */
+   protected List buildCollationKeys(Collator collator)
+   {
+      List data = this.data;
+      int iSize = data.size();
+      List keys = new ArrayList(iSize);
+      
+      try
+      {
+         // create the Bean getter method invoker to retrieve the value for a colunm
+         String methodName = getGetterMethodName(this.column);
+         Class returnType = null;;
+         Method getter = null;
+         // there will always be at least one item to sort if we get to this method
+         Object bean = this.data.get(0);
+         try
+         {
+            getter = bean.getClass().getMethod(methodName, (Class [])null);
+            returnType = getter.getReturnType();
+         }
+         catch (NoSuchMethodException nsmerr)
+         {
+            // no bean getter method found - try Map implementation
+            if (bean instanceof Map)
+            {
+               Object obj = ((Map)bean).get(this.column);
+               if (obj != null)
+               {
+                  returnType = obj.getClass();
+               }
+               else
+               {
+                  if (s_logger.isInfoEnabled())
+                  {
+                     s_logger.info("Unable to get return type class for RichList column: " + column +
+                           ". Suggest set java type directly in sort component tag.");
+                  }
+                  returnType = Object.class;
+               }
+            }
+            else
+            {
+               throw new IllegalStateException("Unable to find bean getter or Map impl for column name: " + this.column);
+            }
+         }
+         
+         // create appropriate comparator instance based on data type
+         // using the strategy pattern so  sub-classes of Sort simply invoke the
+         // compare() method on the comparator interface - no type info required
+         boolean bknownType = true;
+         if (returnType.equals(String.class))
+         {
+            if (strongStringCompare == true)
+            {
+               this.comparator = new StringComparator();
+            }
+            else
+            {
+               this.comparator = new SimpleStringComparator();
+            }
+         }
+         else if (returnType.equals(Date.class))
+         {
+            this.comparator = new DateComparator();
+         }
+         else if (returnType.equals(boolean.class) || returnType.equals(Boolean.class))
+         {
+            this.comparator = new BooleanComparator();
+         }
+         else if (returnType.equals(int.class) || returnType.equals(Integer.class))
+         {
+            this.comparator = new IntegerComparator();
+         }
+         else if (returnType.equals(long.class) || returnType.equals(Long.class))
+         {
+            this.comparator = new LongComparator();
+         }
+         else if (returnType.equals(float.class) || returnType.equals(Float.class))
+         {
+            this.comparator = new FloatComparator();
+         }
+         else
+         {
+            s_logger.warn("Unsupported sort data type: " + returnType + " defaulting to .toString()");
+            this.comparator = new SimpleComparator();
+            bknownType = false;
+         }
+         
+         // create a collation key for each required column item in the dataset
+         for (int iIndex=0; iIndex<iSize; iIndex++)
+         {
+            Object obj;
+            if (getter != null)
+            {
+               // if we have a bean getter method impl use that
+               obj = getter.invoke(data.get(iIndex), (Object [])null);
+            }
+            else
+            {
+               // else we must have a bean Map impl
+               obj = ((Map)data.get(iIndex)).get(column);
+            }
+            
+            if (obj instanceof String)
+            {
+               String str = (String)obj;
+               if (strongStringCompare == true)
+               {
+                  if (str.indexOf(' ') != -1)
+                  {
+                     // quote white space characters or they will be ignored by the Collator!
+                     int iLength = str.length();
+                     StringBuilder s = new StringBuilder(iLength + 4);
+                     char c;
+                     for (int i=0; i<iLength; i++)
+                     {
+                        c = str.charAt(i);
+                        if (c != ' ')
+                        {
+                           s.append(c);
+                        }
+                        else
+                        {
+                           s.append('\'').append(c).append('\'');
+                        }
+                     }
+                     str = s.toString();
+                  }
+                  keys.add(collator.getCollationKey(str));
+               }
+               else
+               {
+                  keys.add(str);
+               }
+            }
+            else if (bknownType == true)
+            {
+               // the appropriate wrapper object will be create by the reflection
+               // system to wrap primative types e.g. int and boolean.
+               // therefore the correct type will be ready for use by the comparator
+               keys.add(obj);
+            }
+            else
+            {
+               if (obj != null)
+               {
+                  keys.add(obj.toString());
+               }
+               else
+               {
+                  keys.add(null);
+               }
+            }
+         }
+      }
+      catch (Exception err)
+      {
+         throw new RuntimeException(err);
+      }
+      
+      return keys;
+   }
+   
+   /**
+    * Given the array and two indices, swap the two items in the
+    * array.
+    */
+   protected void swap(final List v, final int a, final int b)
+   {
+      Object temp = v.get(a);
+      v.set(a, v.get(b));
+      v.set(b, temp);
+   }
+   
+   /**
+    * Return the comparator to be used during column value comparison
+    * 
+    * @return Comparator for the appropriate column data type
+    */
+   protected Comparator getComparator()
+   {
+      return this.comparator;
+   }
+   
+   /**
+    * Return the name of the Bean getter method for the specified getter name
+    * 
+    * @param name of the field to build getter method name for e.g. "value"
+    * 
+    * @return the name of the Bean getter method for the field name e.g. "getValue"
+    */
+   protected static String getGetterMethodName(String name)
+   {
+      return "get" + name.substring(0, 1).toUpperCase() +
+             name.substring(1, name.length());
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes for data type comparison
+   
+   private class SimpleComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return (obj1.toString()).compareTo(obj2.toString());
+      }
+   }
+   
+   private class SimpleStringComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((String)obj1).compareToIgnoreCase((String)obj2);
+      }
+   }
+   
+   private class StringComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((CollationKey)obj1).compareTo((CollationKey)obj2);
+      }
+   }
+   
+   private class IntegerComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((Integer)obj1).compareTo((Integer)obj2);
+      }
+   }
+   
+   private class FloatComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((Float)obj1).compareTo((Float)obj2);
+      }
+   }
+   
+   private class LongComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((Long)obj1).compareTo((Long)obj2);
+      }
+   }
+   
+   private class BooleanComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((Boolean)obj1).equals((Boolean)obj2) ? -1 : 1;
+      }
+   }
+   
+   private class DateComparator implements Comparator
+   {
+      /**
+       * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object)
+       */
+      public int compare(final Object obj1, final Object obj2)
+      {
+         if (obj1 == null && obj2 == null) return 0;
+         if (obj1 == null) return -1;
+         if (obj2 == null) return 1;
+         return ((Date)obj1).compareTo((Date)obj2);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private Data
+   
+   /** list of Object[] data to sort */
+   protected List data;
+   
+   /** column name to sort against */
+   protected String column;
+   
+   /** sort direction */
+   protected boolean bForward;
+   
+   /** sort mode (see IDataContainer constants) */
+   protected String sortMode;
+   
+   /** locale sensitive collator */
+   protected Collator collator;
+   
+   /** collation keys for comparisons */
+   protected List keys = null;
+   
+   /** the comparator instance to use for comparing values when sorting */
+   private Comparator comparator = null;
+   
+   // TODO: make this configurable
+   /** config value whether to use strong collation Key string comparisons */
+   private boolean strongStringCompare = false;
+   
+   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   
+} // end class Sort
diff --git a/source/java/org/alfresco/web/ui/common/ComponentConstants.java b/source/java/org/alfresco/web/ui/common/ComponentConstants.java
new file mode 100644
index 0000000000..de4acd43d4
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/ComponentConstants.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+/**
+ * @author Kevin Roast
+ */
+public final class ComponentConstants
+{
+   public static final String JAVAX_FACES_INPUT          = "javax.faces.Input";
+   public static final String JAVAX_FACES_TEXT           = "javax.faces.Text";
+   public static final String JAVAX_FACES_OUTPUT         = "javax.faces.Output";
+   public static final String JAVAX_FACES_GRID           = "javax.faces.Grid";
+   public static final String JAVAX_FACES_PANEL          = "javax.faces.Panel";
+   public static final String JAVAX_FACES_CHECKBOX       = "javax.faces.Checkbox";
+   public static final String JAVAX_FACES_SELECT_BOOLEAN = "javax.faces.SelectBoolean";
+
+   /**
+    * Private constructor
+    */
+   private ComponentConstants()
+   {
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/ConstantMethodBinding.java b/source/java/org/alfresco/web/ui/common/ConstantMethodBinding.java
new file mode 100644
index 0000000000..4d5f6ee935
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/ConstantMethodBinding.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+
+public class ConstantMethodBinding extends MethodBinding implements StateHolder
+{
+   private String outcome = null;
+   private boolean transientFlag = false;
+
+   public ConstantMethodBinding()
+   {
+   }
+
+   public ConstantMethodBinding(String yourOutcome)
+   {
+      outcome = yourOutcome;
+   }
+
+   public Object invoke(FacesContext context, Object params[])
+   {
+      return outcome;
+   }
+
+   public Class getType(FacesContext context)
+   {
+      return String.class;
+   }
+
+   public Object saveState(FacesContext context)
+   {
+      return outcome;
+   }
+
+   public void restoreState(FacesContext context, Object state)
+   {
+      outcome = (String) state;
+   }
+
+   public boolean isTransient()
+   {
+      return (this.transientFlag);
+   }
+
+   public void setTransient(boolean transientFlag)
+   {
+      this.transientFlag = transientFlag;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/PanelGenerator.java b/source/java/org/alfresco/web/ui/common/PanelGenerator.java
new file mode 100644
index 0000000000..761596c1e0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/PanelGenerator.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Helper to generate the rounded panel HTML templates
+ * 
+ * @author kevinr
+ */
+public final class PanelGenerator
+{
+   public static void generatePanel(Writer out, String contextPath, String panel, String inner)
+      throws IOException
+   {
+      generatePanel(out, contextPath, panel, inner, BGCOLOR_WHITE);
+   }
+   
+   public static void generatePanel(Writer out, String contextPath, String panel, String inner, String bgColor)
+      throws IOException
+   {
+      generatePanel(out, contextPath, panel, inner, bgColor, false);
+   }
+   
+   public static void generatePanel(Writer out, String contextPath, String panel, String inner, String bgColor, boolean dialog)
+      throws IOException
+   {
+      generatePanelStart(out, contextPath, panel, bgColor, dialog);
+      out.write(inner);
+      generatePanelEnd(out, contextPath, panel);
+   }
+   
+   public static void generatePanelStart(Writer out, String contextPath, String panel, String bgColor)
+      throws IOException
+   {
+      generatePanelStart(out, contextPath, panel, bgColor, false);
+   }
+   
+   public static void generatePanelStart(Writer out, String contextPath, String panel, String bgColor, boolean dialog)
+      throws IOException
+   {
+      out.write("<table cellspacing=0 cellpadding=0 border=0 width=100%><tr><td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_01.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_02.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_02.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_03");
+      if (dialog)
+      {
+         out.write("_squared");
+      }
+      out.write(".gif' width=7 height=7 alt=''></td></tr>");
+      
+      out.write("<tr><td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_04.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_04.gif' width=7 height=7 alt=''></td><td bgcolor='");
+      out.write(bgColor);
+      out.write("'>");
+   }
+   
+   public static void generatePanelEnd(Writer out, String contextPath, String panel)
+      throws IOException
+   {
+      out.write("</td><td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_06.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_06.gif' width=7 height=7 alt=''></td></tr>");
+      
+      out.write("<tr><td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_07.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_08.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_08.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(panel);
+      out.write("_09.gif' width=7 height=7 alt=''></td></tr></table>");
+   }
+   
+   public static void generateTitledPanelMiddle(Writer out, String contextPath, String titlePanel, 
+         String contentPanel, String contentBgColor) throws IOException
+   {
+      // generate the expanded part, just under the title
+      out.write("</td><td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_06.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_06.gif' width=7 height=7 alt=''></td></tr>");
+      
+      out.write("<tr><td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_");
+      out.write(contentPanel);
+      out.write("_07.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_08.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_08.gif' width=7 height=7 alt=''></td>");
+      
+      out.write("<td width=7><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(titlePanel);
+      out.write("_");
+      out.write(contentPanel);
+      out.write("_09.gif' width=7 height=7 alt=''></td></tr>");
+      
+      out.write("<tr><td background='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(contentPanel);
+      out.write("_04.gif'><img src='");
+      out.write(contextPath);
+      out.write("/images/parts/");
+      out.write(contentPanel);
+      out.write("_04.gif' width=7 height=7 alt=''></td><td bgcolor='");
+      out.write(contentBgColor);
+      out.write("' style='padding-top:6px;'>");
+   }
+   
+   public final static String BGCOLOR_WHITE = "#FFFFFF";
+}
diff --git a/source/java/org/alfresco/web/ui/common/SortableSelectItem.java b/source/java/org/alfresco/web/ui/common/SortableSelectItem.java
new file mode 100644
index 0000000000..a5b3536fe3
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/SortableSelectItem.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+import javax.faces.model.SelectItem;
+
+/**
+ * Wrapper class to facilitate case-insensitive sorting functionality against our SelectItem objects
+ * 
+ * @author Kevin Roast
+ */
+public final class SortableSelectItem extends SelectItem implements Comparable
+{
+   public SortableSelectItem(String value, String label, String sort)
+   {
+      super(value, label);
+      this.sort = sort;
+   }
+   
+   public int compareTo(Object obj2)
+   {
+      if (this.sort == null && obj2 == null) return 0;
+      if (this.sort == null) return -1;
+      if (obj2 == null) return 1;
+      return this.sort.compareToIgnoreCase( ((SortableSelectItem)obj2).sort );
+   }
+   
+   private String sort;
+}
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
new file mode 100644
index 0000000000..eb11553ecc
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -0,0 +1,996 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.filesys.CIFSServer;
+import org.alfresco.filesys.server.filesys.DiskSharedDevice;
+import org.alfresco.filesys.smb.server.repo.ContentContext;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.webdav.WebDAVServlet;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
+import org.alfresco.web.app.servlet.ExternalAccessServlet;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.ui.common.component.UIStatusMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.renderkit.html.HtmlFormRendererBase;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Class containing misc helper methods used by the JSF components.
+ * 
+ * @author Kevin Roast
+ */
+public final class Utils
+{
+   private static final String MSG_TIME_PATTERN = "time_pattern";
+   private static final String MSG_DATE_PATTERN = "date_pattern";
+   private static final String MSG_DATE_TIME_PATTERN = "date_time_pattern";
+   
+   private static final String IMAGE_PREFIX16 = "/images/filetypes/";
+   private static final String IMAGE_PREFIX32 = "/images/filetypes32/";
+   private static final String IMAGE_POSTFIX = ".gif";
+   private static final String DEFAULT_FILE_IMAGE16 = IMAGE_PREFIX16 + "_default" + IMAGE_POSTFIX;
+   private static final String DEFAULT_FILE_IMAGE32 = IMAGE_PREFIX32 + "_default" + IMAGE_POSTFIX;
+   
+   private static final Map<String, String> s_fileExtensionMap = new HashMap<String, String>(89, 1.0f);
+   
+   private static Log logger = LogFactory.getLog(Utils.class);
+   
+   /**
+    * Private constructor
+    */
+   private Utils()
+   {
+   }
+   
+   /**
+    * Encodes the given string, so that it can be used within an HTML page.
+    * 
+    * @param string     the String to convert
+    */
+   public static String encode(String string)
+   {
+      if (string == null)
+      {
+         return "";
+      }
+
+      StringBuilder sb = null;      //create on demand
+      String enc;
+      char c;
+      for (int i = 0; i < string.length(); i++)
+      {
+         enc = null;
+         c = string.charAt(i);
+         switch (c)
+         {
+            case '"': enc = "&quot;"; break;    //"
+            case '&': enc = "&amp;"; break;     //&
+            case '<': enc = "&lt;"; break;      //<
+            case '>': enc = "&gt;"; break;      //>
+             
+            //german umlauts
+            case '\u00E4' : enc = "&auml;";  break;
+            case '\u00C4' : enc = "&Auml;";  break;
+            case '\u00F6' : enc = "&ouml;";  break;
+            case '\u00D6' : enc = "&Ouml;";  break;
+            case '\u00FC' : enc = "&uuml;";  break;
+            case '\u00DC' : enc = "&Uuml;";  break;
+            case '\u00DF' : enc = "&szlig;"; break;
+            
+            //misc
+            //case 0x80: enc = "&euro;"; break;  sometimes euro symbol is ascii 128, should we suport it?
+            case '\u20AC': enc = "&euro;";  break;
+            case '\u00AB': enc = "&laquo;"; break;
+            case '\u00BB': enc = "&raquo;"; break;
+            case '\u00A0': enc = "&nbsp;"; break;
+            
+            default:
+               if (((int)c) >= 0x80)
+               {
+                  //encode all non basic latin characters
+                  enc = "&#" + ((int)c) + ";";
+               }
+               break;
+         }
+         
+         if (enc != null)
+         {
+            if (sb == null)
+            {
+               String soFar = string.substring(0, i);
+               sb = new StringBuilder(i + 8);
+               sb.append(soFar);
+            }
+            sb.append(enc);
+         }
+         else
+         {
+            if (sb != null)
+            {
+               sb.append(c);
+            }
+         }
+      }
+      
+      if (sb == null)
+      {
+         return string;
+      }
+      else
+      {
+         return sb.toString();
+      }
+   }
+   
+   /**
+    * Crop a label within a SPAN element, using ellipses '...' at the end of label and
+    * and encode the result for HTML output. A SPAN will only be generated if the label
+    * is beyond the default setting of 32 characters in length.
+    * 
+    * @param text       to crop and encode
+    * 
+    * @return encoded and cropped resulting label HTML
+    */
+   public static String cropEncode(String text)
+   {
+      return cropEncode(text, 32);
+   }
+   
+   /**
+    * Crop a label within a SPAN element, using ellipses '...' at the end of label and
+    * and encode the result for HTML output. A SPAN will only be generated if the label
+    * is beyond the specified number of characters in length.
+    * 
+    * @param text       to crop and encode
+    * @param length     length of string to crop too
+    * 
+    * @return encoded and cropped resulting label HTML
+    */
+   public static String cropEncode(String text, int length)
+   {
+      if (text.length() > length)
+      {
+         String label = text.substring(0, length - 3) + "...";
+         StringBuilder buf = new StringBuilder(length + 32 + text.length());
+         buf.append("<span title=\"")
+            .append(Utils.encode(text))
+            .append("\">")
+            .append(Utils.encode(label))
+            .append("</span>");
+         return buf.toString();
+      }
+      else
+      {
+         return Utils.encode(text);
+      }
+   }
+   
+   /**
+    * Replace one string instance with another within the specified string
+    * 
+    * @param str
+    * @param repl
+    * @param with
+    * 
+    * @return replaced string
+    */
+   public static String replace(String str, String repl, String with)
+   {
+       int lastindex = 0;
+       int pos = str.indexOf(repl);
+
+       // If no replacement needed, return the original string
+       // and save StringBuffer allocation/char copying
+       if (pos < 0)
+       {
+           return str;
+       }
+       
+       int len = repl.length();
+       int lendiff = with.length() - repl.length();
+       StringBuilder out = new StringBuilder((lendiff <= 0) ? str.length() : (str.length() + (lendiff << 3)));
+       for (; pos >= 0; pos = str.indexOf(repl, lastindex = pos + len))
+       {
+           out.append(str.substring(lastindex, pos)).append(with);
+       }
+       
+       return out.append(str.substring(lastindex, str.length())).toString();
+   }
+   
+   /**
+    * Remove all occurances of a String from a String
+    * 
+    * @param str     String to remove occurances from
+    * @param match   The string to remove
+    * 
+    * @return new String with occurances of the match removed
+    */
+   public static String remove(String str, String match)
+   {
+      int lastindex = 0;
+      int pos = str.indexOf(match);
+
+      // If no replacement needed, return the original string
+      // and save StringBuffer allocation/char copying
+      if (pos < 0)
+      {
+          return str;
+      }
+      
+      int len = match.length();
+      StringBuilder out = new StringBuilder(str.length());
+      for (; pos >= 0; pos = str.indexOf(match, lastindex = pos + len))
+      {
+          out.append(str.substring(lastindex, pos));
+      }
+      
+      return out.append(str.substring(lastindex, str.length())).toString();
+   }
+   
+   /**
+    * Helper to output an attribute to the output stream
+    * 
+    * @param out        ResponseWriter
+    * @param attr       attribute value object (cannot be null)
+    * @param mapping    mapping to output as e.g. style="..."
+    * 
+    * @throws IOException
+    */
+   public static void outputAttribute(ResponseWriter out, Object attr, String mapping)
+      throws IOException
+   {
+      if (attr != null)
+      {
+         out.write(' ');
+         out.write(mapping);
+         out.write("=\"");
+         out.write(attr.toString());
+         out.write('"');
+      }
+   }
+   
+   /**
+    * Get the hidden field name for any action component.
+    * 
+    * All components that wish to simply encode a form value with their client ID can reuse the same
+    * hidden field within the parent form. NOTE: components which use this method must only encode
+    * their client ID as the value and nothing else!
+    * 
+    * Build a shared field name from the parent form name and the string "act".
+    * 
+    * @return hidden field name shared by all action components within the Form.
+    */
+   public static String getActionHiddenFieldName(FacesContext context, UIComponent component)
+   {
+      return Utils.getParentForm(context, component).getClientId(context) + NamingContainer.SEPARATOR_CHAR + "act";
+   }
+   
+   /**
+    * Helper to recursively render a component and it's child components
+    * 
+    * @param context    FacesContext
+    * @param component  UIComponent
+    * 
+    * @throws IOException
+    */
+   public static void encodeRecursive(FacesContext context, UIComponent component)
+      throws IOException
+   {
+      if (component.isRendered() == true)
+      {
+         component.encodeBegin(context);
+         
+         // follow the spec for components that render their children
+         if (component.getRendersChildren() == true)
+         {
+            component.encodeChildren(context);
+         }
+         else
+         {
+            if (component.getChildCount() != 0)
+            {
+               for (Iterator i=component.getChildren().iterator(); i.hasNext(); /**/)
+               {
+                  encodeRecursive(context, (UIComponent)i.next());
+               }
+            }
+         }
+         
+         component.encodeEnd(context);
+      }
+   }
+   
+   /**
+    * Generate the JavaScript to submit set the specified hidden Form field to the
+    * supplied value and submit the parent Form.
+    * 
+    * NOTE: the supplied hidden field name is added to the Form Renderer map for output.
+    * 
+    * @param context       FacesContext
+    * @param component     UIComponent to generate JavaScript for
+    * @param fieldId       Hidden field id to set value for
+    * @param fieldValue    Hidden field value to set hidden field too on submit
+    * 
+    * @return JavaScript event code
+    */
+   public static String generateFormSubmit(FacesContext context, UIComponent component, String fieldId, String fieldValue)
+   {
+      return generateFormSubmit(context, component, fieldId, fieldValue, null);
+   }
+   
+   /**
+    * Generate the JavaScript to submit set the specified hidden Form field to the
+    * supplied value and submit the parent Form.
+    * 
+    * NOTE: the supplied hidden field name is added to the Form Renderer map for output.
+    * 
+    * @param context       FacesContext
+    * @param component     UIComponent to generate JavaScript for
+    * @param fieldId       Hidden field id to set value for
+    * @param fieldValue    Hidden field value to set hidden field too on submit
+    * @param params        Optional map of param name/values to output
+    * 
+    * @return JavaScript event code
+    */
+   public static String generateFormSubmit(FacesContext context, UIComponent component, String fieldId, String fieldValue, Map<String, String> params)
+   {
+      UIForm form = Utils.getParentForm(context, component);
+      if (form == null)
+      {
+         throw new IllegalStateException("Must nest components inside UIForm to generate form submit!");
+      }
+      
+      String formClientId = form.getClientId(context);
+      
+      StringBuilder buf = new StringBuilder(200);
+      buf.append("document.forms[");
+      buf.append("'");
+      buf.append(formClientId);
+      buf.append("'");
+      buf.append("]['");
+      buf.append(fieldId);
+      buf.append("'].value='");
+      buf.append(fieldValue);
+      buf.append("';");
+      
+      if (params != null)
+      {
+         for (String name : params.keySet())
+         {
+            buf.append("document.forms[");
+            buf.append("'");
+            buf.append(formClientId);
+            buf.append("'");
+            buf.append("]['");
+            buf.append(name);
+            buf.append("'].value='");
+            buf.append(params.get(name));
+            buf.append("';");
+            
+            // weak, but this seems to be the way Sun RI do it...
+            //FormRenderer.addNeededHiddenField(context, name);
+            HtmlFormRendererBase.addHiddenCommandParameter(form, name);
+         }
+      }
+      
+      buf.append("document.forms[");
+      buf.append("'");
+      buf.append(formClientId);
+      buf.append("'");
+      buf.append("].submit()");
+      
+      buf.append(";return false;");
+      
+      // weak, but this seems to be the way Sun RI do it...
+      //FormRenderer.addNeededHiddenField(context, fieldId);
+      HtmlFormRendererBase.addHiddenCommandParameter(form, fieldId);
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Generate the JavaScript to submit the parent Form.
+    * 
+    * @param context       FacesContext
+    * @param component     UIComponent to generate JavaScript for
+    * 
+    * @return JavaScript event code
+    */
+   public static String generateFormSubmit(FacesContext context, UIComponent component)
+   {
+      UIForm form = Utils.getParentForm(context, component);
+      if (form == null)
+      {
+         throw new IllegalStateException("Must nest components inside UIForm to generate form submit!");
+      }
+      
+      String formClientId = form.getClientId(context);
+      
+      StringBuilder buf = new StringBuilder(48);
+      
+      buf.append("document.forms[");
+      buf.append("'");
+      buf.append(formClientId);
+      buf.append("'");
+      buf.append("].submit()");
+      
+      buf.append(";return false;");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Enum representing the client URL type to generate
+    */
+   public enum URLMode {HTTP_DOWNLOAD, HTTP_INLINE, WEBDAV, CIFS, SHOW_DETAILS, FTP}
+   
+   /**
+    * Generates a URL for the given usage for the given node.
+    * 
+    * The supported values for the usage parameter are of URLMode enum type
+    * @see URLMode
+    * 
+    * @param context Faces context
+    * @param node The node to generate the URL for
+    * @param usage What the URL is going to be used for 
+    * @return The URL for the requested usage without the context path
+    */
+   public static String generateURL(FacesContext context, Node node, URLMode usage)
+   {
+      String url = null;
+      
+      switch (usage)
+      {
+         case WEBDAV:
+         {
+            // calculate a WebDAV URL for the given node
+            FileFolderService fileFolderService = Repository.getServiceRegistry(
+                  context).getFileFolderService();
+            try
+            {
+               List<FileInfo> paths = fileFolderService.getNamePath(null, node.getNodeRef());
+               User user = Application.getCurrentUser(context);
+               
+               // build up the webdav url
+               StringBuilder path = new StringBuilder("/").append(WebDAVServlet.WEBDAV_PREFIX);
+               
+               // build up the path skipping the first path as it is the root folder
+               boolean homeSpaceFound = false;
+               for (int x = 1; x < paths.size(); x++)
+               {
+                  path.append("/").append(paths.get(x).getName());
+               }
+               
+               url = path.toString();
+            }
+            catch (Exception e)
+            {
+               if (logger.isWarnEnabled())
+                  logger.warn("Failed to calculate webdav url", e);
+            }
+            break;
+         }
+         
+         case CIFS:
+         {
+            // calculate a CIFS path for the given node
+            
+            // get hold of the node service, cifsServer and navigation bean
+            NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
+            NavigationBean navBean = (NavigationBean)context.getExternalContext().
+                  getSessionMap().get("NavigationBean");
+            CIFSServer cifsServer = (CIFSServer)FacesContextUtils.getRequiredWebApplicationContext(
+                  context).getBean("cifsServer");
+   
+            if (nodeService != null && navBean != null && cifsServer != null)
+            {
+               DiskSharedDevice diskShare = cifsServer.getConfiguration().getPrimaryFilesystem();
+               
+               if (diskShare != null)
+               {
+                   ContentContext contentCtx = (ContentContext) diskShare.getContext();
+                   NodeRef rootNode = contentCtx.getRootNode();
+                   Path path = nodeService.getPath(node.getNodeRef());
+                   url = Repository.getNamePath(nodeService, path, rootNode, "\\", 
+                         "file:///" + navBean.getCIFSServerPath(diskShare));
+               }
+            }
+            break;
+         }
+         
+         case HTTP_DOWNLOAD:
+         {
+            url = DownloadContentServlet.generateDownloadURL(node.getNodeRef(), node.getName());
+            break;
+         }
+         
+         case HTTP_INLINE:
+         {
+            url = DownloadContentServlet.generateBrowserURL(node.getNodeRef(), node.getName());
+            break;
+         }
+         
+         case SHOW_DETAILS:
+         {
+            DictionaryService dd = Repository.getServiceRegistry(context).getDictionaryService();
+            
+            // default to showing details of content
+            String outcome = "showDocDetails";
+            
+            // if the node is a type of folder then make the outcome to show space details
+            if (dd.isSubClass(node.getType(), ContentModel.TYPE_FOLDER))
+            {
+               outcome = "showSpaceDetails";
+            }
+            
+            // build the url
+            url = ExternalAccessServlet.generateExternalURL(outcome, 
+                  Repository.getStoreRef().getProtocol() + "/" + 
+                  Repository.getStoreRef().getIdentifier() + "/" + node.getId());
+            break;
+         }
+         
+         case FTP:
+         {
+            // not implemented yet!
+            break;
+         }
+      }
+      
+      return url;
+   }
+   
+   /**
+    * Build a context path safe image tag for the supplied image path.
+    * Image path should be supplied with a leading slash '/'.
+    * 
+    * @param context       FacesContext
+    * @param image         The local image path from the web folder with leading slash '/'
+    * @param width         Width in pixels
+    * @param height        Height in pixels
+    * @param alt           Optional alt/title text
+    * @param onclick       JavaScript onclick event handler code
+    * 
+    * @return Populated <code>img</code> tag
+    */
+   public static String buildImageTag(FacesContext context, String image, int width, int height, String alt, String onclick)
+   {
+      return buildImageTag(context, image, width, height, alt, onclick, null);
+   }
+   
+   /**
+    * Build a context path safe image tag for the supplied image path.
+    * Image path should be supplied with a leading slash '/'.
+    * 
+    * @param context       FacesContext
+    * @param image         The local image path from the web folder with leading slash '/'
+    * @param width         Width in pixels
+    * @param height        Height in pixels
+    * @param alt           Optional alt/title text
+    * @param onclick       JavaScript onclick event handler code
+    * @param align         Optional HTML alignment value
+    * 
+    * @return Populated <code>img</code> tag
+    */
+   public static String buildImageTag(FacesContext context, String image, int width, int height, String alt, String onclick, String align)
+   {
+      StringBuilder buf = new StringBuilder(200);
+      
+      buf.append("<img src=\"")
+         .append(context.getExternalContext().getRequestContextPath())
+         .append(image)
+         .append("\" width=")
+         .append(width)
+         .append(" height=")
+         .append(height)
+         .append(" border=0");
+      
+      if (alt != null)
+      {
+         alt = Utils.encode(alt);
+         buf.append(" alt=\"")
+            .append(alt)
+            .append("\" title=\"")
+            .append(alt)
+            .append('"');
+      }
+      
+      if (align != null)
+      {
+         buf.append(" align=")
+            .append(align);
+      }
+      
+      if (onclick != null)
+      {
+         buf.append(" onclick=\"")
+            .append(onclick)
+            .append("\" style='cursor:pointer'");
+      }
+      
+      buf.append('>');
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Build a context path safe image tag for the supplied image path.
+    * Image path should be supplied with a leading slash '/'.
+    * 
+    * @param context       FacesContext
+    * @param image         The local image path from the web folder with leading slash '/'
+    * @param width         Width in pixels
+    * @param height        Height in pixels
+    * @param alt           Optional alt/title text
+    * 
+    * @return Populated <code>img</code> tag
+    */
+   public static String buildImageTag(FacesContext context, String image, int width, int height, String alt)
+   {
+      return buildImageTag(context, image, width, height, alt, null);
+   }
+   
+   /**
+    * Build a context path safe image tag for the supplied image path.
+    * Image path should be supplied with a leading slash '/'.
+    * 
+    * @param context       FacesContext
+    * @param image         The local image path from the web folder with leading slash '/'
+    * @param alt           Optional alt/title text
+    * 
+    * @return Populated <code>img</code> tag
+    */
+   public static String buildImageTag(FacesContext context, String image, String alt)
+   {
+      return buildImageTag(context, image, alt, null);
+   }
+   
+   /**
+    * Build a context path safe image tag for the supplied image path.
+    * Image path should be supplied with a leading slash '/'.
+    * 
+    * @param context       FacesContext
+    * @param image         The local image path from the web folder with leading slash '/'
+    * @param alt           Optional alt/title text
+    * @param align         Optional HTML alignment value
+    * 
+    * @return Populated <code>img</code> tag
+    */
+   public static String buildImageTag(FacesContext context, String image, String alt, String align)
+   {
+      StringBuilder buf = new StringBuilder(128);
+      
+      buf.append("<img src=\"")
+         .append(context.getExternalContext().getRequestContextPath())
+         .append(image)
+         .append("\" border=0");
+      
+      if (alt != null)
+      {
+         alt = Utils.encode(alt);
+         buf.append(" alt=\"")
+            .append(alt)
+            .append("\" title=\"")
+            .append(alt)
+            .append('"');
+      }
+      if (align != null)
+      {
+         buf.append(" align=")
+            .append(align);
+      }
+      
+      buf.append('>');
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Return the parent UIForm component for the specified UIComponent
+    * 
+    * @param context       FaceContext
+    * @param component     The UIComponent to find parent Form for
+    * 
+    * @return UIForm parent or null if none found in hiearachy
+    */
+   public static UIForm getParentForm(FacesContext context, UIComponent component)
+   {
+      UIComponent parent = component.getParent();
+      while (parent != null)
+      {
+         if (parent instanceof UIForm)
+         {
+            break;
+         }
+         parent = parent.getParent();
+      }
+      return (UIForm)parent;
+   }
+   
+   /**
+    * Return the parent UIComponent implementing the NamingContainer interface for
+    * the specified UIComponent.
+    * 
+    * @param context       FaceContext
+    * @param component     The UIComponent to find parent Form for
+    * 
+    * @return NamingContainer parent or null if none found in hiearachy
+    */
+   public static UIComponent getParentNamingContainer(FacesContext context, UIComponent component)
+   {
+      UIComponent parent = component.getParent();
+      while (parent != null)
+      {
+         if (parent instanceof NamingContainer)
+         {
+            break;
+         }
+         parent = parent.getParent();
+      }
+      return (UIComponent)parent;
+   }
+   
+   /**
+    * Return the parent UIComponent implementing the IDataContainer interface for
+    * the specified UIComponent.
+    * 
+    * @param context       FaceContext
+    * @param component     The UIComponent to find parent IDataContainer for
+    * 
+    * @return IDataContainer parent or null if none found in hiearachy
+    */
+   public static IDataContainer getParentDataContainer(FacesContext context, UIComponent component)
+   {
+      UIComponent parent = component.getParent();
+      while (parent != null)
+      {
+         if (parent instanceof IDataContainer)
+         {
+            break;
+         }
+         parent = parent.getParent();
+      }
+      return (IDataContainer)parent;
+   }
+   
+   /**
+    * Determines whether the given component is disabled or readonly
+    * 
+    * @param component The component to test
+    * @return true if the component is either disabled or set to readonly
+    */
+   public static boolean isComponentDisabledOrReadOnly(UIComponent component)
+   {
+      boolean disabled = false;
+      boolean readOnly = false;
+      
+      Object disabledAttr = component.getAttributes().get("disabled");
+      if (disabledAttr != null)
+      {
+         disabled = disabledAttr.equals(Boolean.TRUE);
+      }
+      
+      if (disabled == false)
+      {
+         Object readOnlyAttr = component.getAttributes().get("disabled");
+         if (readOnlyAttr != null)
+         {
+            readOnly = readOnlyAttr.equals(Boolean.TRUE);
+         }
+      }
+
+      return disabled || readOnly;
+   }
+   
+   /**
+    * Invoke the method encapsulated by the supplied MethodBinding
+    * 
+    * @param context    FacesContext
+    * @param method     MethodBinding to invoke
+    * @param event      ActionEvent to pass to the method of signature:
+    *                   public void myMethodName(ActionEvent event)
+    */
+   public static void processActionMethod(FacesContext context, MethodBinding method, ActionEvent event)
+   {
+      try
+      {
+         method.invoke(context, new Object[] {event});
+      }
+      catch (EvaluationException e)
+      {
+         Throwable cause = e.getCause();
+         if (cause instanceof AbortProcessingException)
+         {
+            throw (AbortProcessingException)cause;
+         }
+         else
+         {
+            throw e;
+         }
+      }   
+   }
+   
+   /**
+    * Adds a global error message
+    * 
+    * @param msg        The error message
+    */
+   public static void addErrorMessage(String msg)
+   {
+      addErrorMessage(msg, null);
+   }
+   
+   /**
+    * Adds a global error message and logs exception details
+    * 
+    * @param msg        The error message
+    * @param err        The exception to log
+    */
+   public static void addErrorMessage(String msg, Throwable err)
+   {
+      FacesContext context = FacesContext.getCurrentInstance( );
+      FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
+      context.addMessage(null, facesMsg);
+      if (err != null)
+      {
+         if ((err instanceof InvalidNodeRefException == false &&
+              err instanceof AccessDeniedException == false) || logger.isDebugEnabled())
+         {
+            logger.error(msg, err);
+         }
+      }
+   }
+   
+   /**
+    * Adds a global status message that will be displayed by a Status Message UI component
+    * 
+    * @param severity   Severity of the message
+    * @param msg        Text of the message
+    */
+   public static void addStatusMessage(FacesMessage.Severity severity, String msg)
+   {
+      FacesContext fc = FacesContext.getCurrentInstance();
+      String time = getTimeFormat(fc).format(new Date(System.currentTimeMillis()));
+      FacesMessage fm = new FacesMessage(severity, time, msg);
+      fc.addMessage(UIStatusMessage.STATUS_MESSAGE, fm);
+   }
+   
+   /**
+    * @return the formatter for locale sensitive Time formatting
+    */
+   public static DateFormat getTimeFormat(FacesContext fc)
+   {
+      return getDateFormatFromPattern(fc, Application.getMessage(fc, MSG_TIME_PATTERN));
+   }
+   
+   /**
+    * @return the formatter for locale sensitive Date formatting
+    */
+   public static DateFormat getDateFormat(FacesContext fc)
+   {
+      return getDateFormatFromPattern(fc, Application.getMessage(fc, MSG_DATE_PATTERN));
+   }
+   
+   /**
+    * @return the formatter for locale sensitive Date & Time formatting
+    */
+   public static DateFormat getDateTimeFormat(FacesContext fc)
+   {
+      return getDateFormatFromPattern(fc, Application.getMessage(fc, MSG_DATE_TIME_PATTERN));
+   }
+   
+   /**
+    * @return DataFormat object for the specified pattern
+    */
+   private static DateFormat getDateFormatFromPattern(FacesContext fc, String pattern)
+   {
+      if (pattern == null)
+      {
+         throw new IllegalArgumentException("DateTime pattern is mandatory.");
+      }
+      try
+      {
+         return new SimpleDateFormat(pattern, Application.getLanguage(fc));
+      }
+      catch (IllegalArgumentException err)
+      {
+         throw new AlfrescoRuntimeException("Invalid DateTime pattern", err);
+      }
+   }
+
+   /**
+    * Return the image path to the filetype icon for the specified file name string
+    * 
+    * @param name       File name to build filetype icon path for
+    * @param small      True for the small 16x16 icon or false for the large 32x32 
+    * 
+    * @return the image path for the specified node type or the default icon if not found
+    */
+   public static String getFileTypeImage(String name, boolean small)
+   {
+      String image = (small ? DEFAULT_FILE_IMAGE16 : DEFAULT_FILE_IMAGE32);
+      
+      int extIndex = name.lastIndexOf('.');
+      if (extIndex != -1 && name.length() > extIndex + 1)
+      {
+         String ext = name.substring(extIndex + 1).toLowerCase();
+         String key = ext + ' ' + (small ? "16" : "32");
+         
+         // found file extension for appropriate size image
+         synchronized (s_fileExtensionMap)
+         {
+            image = s_fileExtensionMap.get(key);
+            if (image == null)
+            {
+               // not found create for first time
+               image = (small ? IMAGE_PREFIX16 : IMAGE_PREFIX32) + ext + IMAGE_POSTFIX;
+               
+               // does this image exist on the web-server?
+               if (FacesContext.getCurrentInstance().getExternalContext().getResourceAsStream(image) != null)
+               {
+                  // found the image for this extension - save it for later
+                  s_fileExtensionMap.put(key, image);
+               }
+               else
+               {
+                  // not found, save the default image for this extension instead
+                  image = (small ? DEFAULT_FILE_IMAGE16 : DEFAULT_FILE_IMAGE32);
+                  s_fileExtensionMap.put(key, image);
+               }
+            }
+         }
+      }
+      
+      return image;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/WebResources.java b/source/java/org/alfresco/web/ui/common/WebResources.java
new file mode 100644
index 0000000000..7cf4318b66
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/WebResources.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common;
+
+/**
+ * Class containing well known web resource paths for images etc.
+ * 
+ * @author Kevin Roast
+ */
+public class WebResources
+{
+   // Image paths
+   public static final String IMAGE_PREVIOUSPAGE_NONE   = "/images/icons/PreviousPage_unavailable.gif";
+   public static final String IMAGE_PREVIOUSPAGE        = "/images/icons/PreviousPage.gif";
+   public static final String IMAGE_FIRSTPAGE_NONE      = "/images/icons/FirstPage_unavailable.gif";
+   public static final String IMAGE_FIRSTPAGE           = "/images/icons/FirstPage.gif";
+   public static final String IMAGE_NEXTPAGE_NONE       = "/images/icons/NextPage_unavailable.gif";
+   public static final String IMAGE_NEXTPAGE            = "/images/icons/NextPage.gif";
+   public static final String IMAGE_LASTPAGE_NONE       = "/images/icons/LastPage_unavailable.gif";
+   public static final String IMAGE_LASTPAGE            = "/images/icons/LastPage.gif";
+   
+   public static final String IMAGE_SORTUP     = "/images/icons/sort_up.gif";
+   public static final String IMAGE_SORTDOWN   = "/images/icons/sort_down.gif";
+   public static final String IMAGE_SORTNONE   = "/images/icons/sort_flat.gif";
+   
+   public static final String IMAGE_EXPANDED   = "/images/icons/expanded.gif";
+   public static final String IMAGE_COLLAPSED  = "/images/icons/collapsed.gif";
+   
+   public static final String IMAGE_MOVELEFT   = "/images/icons/move_left.gif";
+   public static final String IMAGE_MOVERIGHT  = "/images/icons/move_right.gif";
+   public static final String IMAGE_GO_UP      = "/images/icons/up.gif";
+   
+   public static final String IMAGE_INFO       = "/images/icons/info_icon.gif";
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java b/source/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java
new file mode 100644
index 0000000000..deceeb7c36
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/IBreadcrumbHandler.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.Serializable;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Kevin Roast
+ */
+public interface IBreadcrumbHandler extends Serializable
+{
+   /**
+    * Override Object.toString()
+    * 
+    * @return the element display label for this handler instance.
+    */
+   public String toString();
+   
+   /**
+    * Perform appropriate processing logic and then return a JSF navigation outcome.
+    * This method will be called by the framework when the handler instance is selected by the user.
+    * 
+    * @param breadcrumb    The UIBreadcrumb component that caused the navigation
+    * 
+    * @return JSF navigation outcome
+    */
+   public String navigationOutcome(UIBreadcrumb breadcrumb);
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/SelfRenderingComponent.java b/source/java/org/alfresco/web/ui/common/component/SelfRenderingComponent.java
new file mode 100644
index 0000000000..22864b00c4
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/SelfRenderingComponent.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.ResponseWriter;
+
+
+/**
+ * @author kevinr
+ */
+public abstract class SelfRenderingComponent extends UIComponentBase
+{
+   /**
+    * Default Constructor
+    */
+   public SelfRenderingComponent()
+   {
+      // specifically set the renderer type to null to indicate to the framework
+      // that this component renders itself - there is no abstract renderer class
+      setRendererType(null);
+   }
+   
+   /**
+    * Helper to output an attribute to the output stream
+    * 
+    * @param out        ResponseWriter
+    * @param attr       attribute value object (cannot be null)
+    * @param mapping    mapping to output as e.g. style="..."
+    * 
+    * @throws IOException
+    */
+   protected static void outputAttribute(ResponseWriter out, Object attr, String mapping)
+      throws IOException
+   {
+      if (attr != null)
+      {
+         out.write(' ');
+         out.write(mapping);
+         out.write("=\"");
+         out.write(attr.toString());
+         out.write('"');
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIActionLink.java b/source/java/org/alfresco/web/ui/common/component/UIActionLink.java
new file mode 100644
index 0000000000..0bb6889ff2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIActionLink.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.component.UICommand;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author kevinr
+ */
+public class UIActionLink extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Construction 
+   
+   /**
+    * Default Constructor
+    */
+   public UIActionLink()
+   {
+      setRendererType("org.alfresco.faces.ActionLinkRenderer");
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.padding = (Integer)values[1];
+      this.image = (String)values[2];
+      this.showLink = (Boolean)values[3];
+      this.params = (Map)values[4];
+      this.href = (String)values[5];
+      this.tooltip = (String)values[6];
+      this.target = (String)values[7];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[8];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.padding;
+      values[2] = this.image;
+      values[3] = this.showLink;
+      values[4] = this.params;
+      values[5] = this.href;
+      values[6] = this.tooltip;
+      values[7] = this.target;
+      return (values);
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * Return the current child parameter map for this action link instance.
+    * This map is filled with name/value pairs from any child UIParameter components.
+    * 
+    * @return Map of name/value pairs
+    */
+   public Map<String, String> getParameterMap()
+   {
+      if (this.params == null)
+      {
+         this.params = new HashMap<String, String>(3, 1.0f);
+      }
+      return this.params;
+   }
+   
+   /**
+    * Get whether to show the link as well as the image if specified
+    * 
+    * @return true to show the link as well as the image if specified
+    */
+   public boolean getShowLink()
+   {
+      ValueBinding vb = getValueBinding("showLink");
+      if (vb != null)
+      {
+         this.showLink = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.showLink != null)
+      {
+         return this.showLink.booleanValue();
+      }
+      else
+      {
+         // return default
+         return true;
+      }
+   }
+   
+   /**
+    * Set whether to show the link as well as the image if specified
+    * 
+    * @param showLink      Whether to show the link as well as the image if specified
+    */
+   public void setShowLink(boolean showLink)
+   {
+      this.showLink = Boolean.valueOf(showLink);
+   }
+   
+   /**
+    * Get the padding value for rendering this component in a table.
+    * 
+    * @return the padding in pixels, if set != 0 then a table will be rendering around the items
+    */
+   public int getPadding()
+   {
+      ValueBinding vb = getValueBinding("padding");
+      if (vb != null)
+      {
+         this.padding = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      if (this.padding != null)
+      {
+         return this.padding.intValue();
+      }
+      else
+      {
+         // return default
+         return 0;
+      }
+   }
+   
+   /**
+    * Set the padding value for rendering this component in a table.
+    * 
+    * @param padding       value in pixels, if set != 0 then a table will be rendering around the items
+    */
+   public void setPadding(int padding)
+   {
+      this.padding = padding;
+   }
+   
+   /**
+    * Return the Image path to use for this actionlink.
+    * If an image is specified, it is shown in additon to the value text unless
+    * the 'showLink' property is set to 'false'.
+    * 
+    * @return the image path to display
+    */
+   public String getImage()
+   {
+      ValueBinding vb = getValueBinding("image");
+      if (vb != null)
+      {
+         this.image = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.image;
+   }
+   
+   /**
+    * Set the Image path to use for this actionlink.
+    * If an image is specified, it is shown in additon to the value text unless
+    * the 'showLink' property is set to 'false'.
+    * 
+    * @param image      Image path to display
+    */
+   public void setImage(String image)
+   {
+      this.image = image;
+   }
+   
+   /**
+    * @return Returns the href.
+    */
+   public String getHref()
+   {
+      ValueBinding vb = getValueBinding("href");
+      if (vb != null)
+      {
+         this.href = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.href;
+   }
+   
+   /**
+    * @param href The href to set.
+    */
+   public void setHref(String href)
+   {
+      this.href = href;
+   }
+   
+   /**
+    * Get the tooltip title text
+    *
+    * @return the tooltip
+    */
+   public String getTooltip()
+   {
+      ValueBinding vb = getValueBinding("tooltip");
+      if (vb != null)
+      {
+         this.tooltip = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.tooltip;
+   }
+
+   /**
+    * Set the tooltip title text
+    *
+    * @param tooltip     the tooltip
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+   
+   /**
+    * Get the target
+    *
+    * @return the target
+    */
+   public String getTarget()
+   {
+      ValueBinding vb = getValueBinding("target");
+      if (vb != null)
+      {
+         this.target = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.target;
+   }
+
+   /**
+    * Set the target
+    *
+    * @param target     the target
+    */
+   public void setTarget(String target)
+   {
+      this.target = target;
+   }
+   
+   /**
+    * Returns the onclick handler
+    * 
+    * @return The onclick handler
+    */
+   public String getOnclick()
+   {
+      ValueBinding vb = getValueBinding("onclick");
+      if (vb != null)
+      {
+         this.onclick = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.onclick;
+   }
+
+   /**
+    * Sets the onclick handler
+    * 
+    * @param onclick The onclick handler
+    */
+   public void setOnclick(String onclick)
+   {
+      this.onclick = onclick;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** the padding value in pixels, if set != 0 then a table will be rendered around the items */
+   private Integer padding = null;
+   
+   /** True to show the link as well as the image if specified */
+   private Boolean showLink = null;
+   
+   /** If an image is specified, it is shown in additon to the value text */
+   private String image = null;
+   
+   /** static href to use instead of an action/actionlistener */
+   private String href = null;
+   
+   /** tooltip title text to display on the action link */
+   private String tooltip = null;
+   
+   /** the target reference */
+   private String target = null;
+   
+   /** the onclick handler */
+   private String onclick = null;
+   
+   /** Map of child param name/values pairs */
+   private Map<String, String> params = null;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java b/source/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java
new file mode 100644
index 0000000000..c3c3df75b5
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIBreadcrumb.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+/**
+ * @author kevinr
+ */
+public class UIBreadcrumb extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Construction 
+   
+   /**
+    * Default Constructor
+    */
+   public UIBreadcrumb()
+   {
+      setRendererType("org.alfresco.faces.BreadcrumbRenderer");
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Component implementation 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.separator = (String)values[1];
+      this.showRoot = (Boolean)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.separator;
+      values[2] = this.showRoot;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof BreadcrumbEvent)
+      {
+         setSelectedPathIndex( ((BreadcrumbEvent)event).SelectedIndex );
+      }
+      
+      // default ActionEvent processing for a UICommand
+      super.broadcast(event);
+   }
+
+   /**
+    * Set the selected path index. This modifies the current path value.
+    * 
+    * @return last selected path index
+    */
+   public void setSelectedPathIndex(int index)
+   {
+      // getValue() will return a List of IBreadcrumbHandler (see impl below)
+      List<IBreadcrumbHandler> elements = (List)getValue();
+      
+      if (elements.size() >= index)
+      {
+         // copy path elements up to the selected index to a new List
+         List<IBreadcrumbHandler> path = new ArrayList<IBreadcrumbHandler>(index + 1);
+         path.addAll(elements.subList(0, index + 1));
+         
+         // set the new List as our new path value
+         setValue(path);
+         
+         // call the app logic for the element handler and perform any required navigation
+         String outcome = path.get(index).navigationOutcome(this);
+         if (outcome != null)
+         {
+            String viewId = getFacesContext().getViewRoot().getViewId();
+            getFacesContext().getApplication().getNavigationHandler().handleNavigation(
+                  getFacesContext(), viewId, outcome);
+         }
+      }
+   }
+   
+   /**
+    * Override getValue() to deal with converting a String path into a valid List of IBreadcrumbHandler
+    */
+   public Object getValue()
+   {
+      List<IBreadcrumbHandler> elements = null;
+      
+      Object value = super.getValue();
+      if (value instanceof String)
+      {
+         elements = new ArrayList(8);
+         // found a String based path - convert to List of IBreadcrumbHandler instances
+         StringTokenizer t = new StringTokenizer((String)value, SEPARATOR);
+         while (t.hasMoreTokens() == true)
+         {
+            IBreadcrumbHandler handler = new DefaultPathHandler(t.nextToken());
+            elements.add(handler);
+         }
+         
+         // save result so we don't need to repeat the conversion
+         setValue(elements);
+      }
+      else if (value instanceof List)
+      {
+         elements = (List)value;
+      }
+      else if (value != null)
+      {
+         throw new IllegalArgumentException("UIBreadcrumb value must be a String path or List of IBreadcrumbHandler!");
+      }
+      else
+      {
+         elements = new ArrayList(8);
+      }
+      
+      return elements;
+   }
+   
+   /**
+    * Append a handler object to the current breadcrumb structure
+    * 
+    * @param handler    The IBreadcrumbHandler to append
+    */
+   public void appendHandler(IBreadcrumbHandler handler)
+   {
+      if (handler == null)
+      {
+         throw new NullPointerException("IBreadcrumbHandler instance cannot be null!");
+      }
+      
+      List elements = (List)getValue();
+      elements.add(handler);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * Get the separator string to output between each breadcrumb element
+    * 
+    * @return separator string
+    */
+   public String getSeparator()
+   {
+      ValueBinding vb = getValueBinding("separator");
+      if (vb != null)
+      {
+         this.separator = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.separator;
+   }
+   
+   /**
+    * Set separator
+    * 
+    * @param separator     the separator string to output between each breadcrumb element
+    */
+   public void setSeparator(String separator)
+   {
+      this.separator = separator;
+   }
+   
+   /**
+    * Get whether to show the root of the path
+    * 
+    * @return true to show the root of the path, false to hide it
+    */
+   public boolean getShowRoot()
+   {
+      ValueBinding vb = getValueBinding("showRoot");
+      if (vb != null)
+      {
+         this.showRoot = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.showRoot != null)
+      {
+         return this.showRoot.booleanValue();
+      }
+      else
+      {
+         // return default
+         return true;
+      }
+   }
+   
+   /**
+    * Set whether to show the root of the path
+    * 
+    * @param showRoot      Whether to show the root of the path
+    */
+   public void setShowRoot(boolean showRoot)
+   {
+      this.showRoot = Boolean.valueOf(showRoot);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the clicking of a breadcrumb element.
+    */
+   public static class BreadcrumbEvent extends ActionEvent
+   {
+      public BreadcrumbEvent(UIComponent component, int selectedIndex)
+      {
+         super(component);
+         SelectedIndex = selectedIndex;
+      }
+      
+      public int SelectedIndex = 0;
+   }
+   
+   /**
+    * Class representing a handler for the default String path based breadcrumb
+    */
+   private static class DefaultPathHandler implements IBreadcrumbHandler
+   {
+      /**
+       * Constructor
+       * 
+       * @param label      The element display label
+       */
+      public DefaultPathHandler(String label)
+      {
+         this.label = label;
+      }
+      
+      /**
+       * Return the element display label
+       */
+      public String toString()
+      {
+         return this.label;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.component.IBreadcrumbHandler#navigationOutcome(org.alfresco.web.ui.common.component.UIBreadcrumb)
+       */
+      public String navigationOutcome(UIBreadcrumb breadcrumb)
+      {
+         // no outcome for the default handler - return to current page
+         return null;
+      }
+      
+      private String label;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** visible separator value */
+   private String separator = null;
+   
+   /** true to show the root of the breadcrumb path, false otherwise */
+   private Boolean showRoot = null;
+   
+   /** the separator for a breadcrumb path value */
+   public final static String SEPARATOR = "/";
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
new file mode 100644
index 0000000000..7abf042253
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
@@ -0,0 +1,644 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.common.Utils;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIGenericPicker extends UICommand
+{
+   /** action ids */
+   private final static int ACTION_NONE   = -1;
+   private final static int ACTION_SEARCH = 0;
+   private final static int ACTION_CLEAR  = 1;
+   private final static int ACTION_FILTER = 2;
+   private final static int ACTION_ADD    = 3;
+   
+   /** form field postfixes */
+   private final static String FIELD_FILTER   = "_filter";
+   private final static String FIELD_CONTAINS = "_contains";
+   private final static String FIELD_RESULTS  = "_results";
+   
+   /** I18N message strings */
+   private final static String MSG_SEARCH   = "search";
+   private final static String MSG_CLEAR    = "clear";
+   private final static String MSG_ADD      = "add";
+   private final static String MSG_RESULTS1 = "results_contains";
+   private final static String MSG_RESULTS2 = "results_contains_filter";
+   
+   private final static int DEFAULT_HEIGHT = 100;
+   private final static int DEFAULT_WIDTH = 250;
+   
+   private MethodBinding queryCallback = null;
+   private Boolean showFilter = null;
+   private Boolean showContains = null;
+   private Boolean showAddButton = null;
+   private Boolean filterRefresh = null;
+   private String addButtonLabel;
+   private Integer width = null;
+   private Integer height = null;
+   
+   private SelectItem[] filters = null;
+   private int filterIndex = 0;
+   private String contains = "";
+   private String[] selectedResults = null;
+   private SelectItem[] currentResults = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.GenericPicker";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      showFilter = (Boolean)values[1];
+      showContains = (Boolean)values[2];
+      showAddButton = (Boolean)values[3];
+      addButtonLabel = (String)values[4];
+      width = (Integer)values[5];
+      height = (Integer)values[6];
+      filterIndex = (Integer)values[7];
+      contains = (String)values[8];
+      queryCallback = (MethodBinding)values[9];
+      selectedResults = (String[])values[10];
+      currentResults = (SelectItem[])values[11];
+      filters = (SelectItem[])values[12];
+      filterRefresh = (Boolean)values[13];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[14];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = showFilter;
+      values[2] = showContains;
+      values[3] = showAddButton;
+      values[4] = addButtonLabel;
+      values[5] = width;
+      values[6] = height;
+      values[7] = filterIndex;
+      values[8] = contains;
+      values[9] = queryCallback;
+      values[10] = selectedResults;
+      values[11] = currentResults;
+      values[12] = filters;
+      values[13] = filterRefresh;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      Map valuesMap = context.getExternalContext().getRequestParameterValuesMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      int action = ACTION_NONE;
+      if (value != null && value.length() != 0)
+      {
+         // decode the values - we are expecting an action identifier
+         action = Integer.parseInt(value);
+      }
+      
+      // we always process these values to keep the component up-to-date
+      
+      // now find the Filter drop-down value
+      int filterIndex = 0;
+      String strFilterIndex = (String)requestMap.get(fieldId + FIELD_FILTER);
+      if (strFilterIndex != null && strFilterIndex.length() != 0)
+      {
+         filterIndex = Integer.parseInt(strFilterIndex);
+      }
+      
+      // and the Contains text box value
+      String contains = (String)requestMap.get(fieldId + FIELD_CONTAINS);
+      
+      // and the Results selections
+      String[] results = (String[])valuesMap.get(fieldId + FIELD_RESULTS);
+      
+      // queue an event
+      PickerEvent event = new PickerEvent(this, action, filterIndex, contains, results);
+      queueEvent(event);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof PickerEvent)
+      {
+         PickerEvent pickerEvent = (PickerEvent)event;
+         
+         // set component state from event properties
+         this.filterIndex = pickerEvent.FilterIndex;
+         this.contains = pickerEvent.Contains;
+         this.selectedResults = pickerEvent.Results;
+         
+         // delegate to appropriate action logic
+         switch (pickerEvent.Action)
+         {
+            case ACTION_ADD:
+               // call super for actionlistener execution
+               // it's up to the handler to get the results from the getSelectedResults() method
+               super.broadcast(event);
+               break;
+            
+            case ACTION_CLEAR:
+               this.contains = "";
+               this.filterIndex = 0;
+               this.selectedResults = null;
+               this.currentResults = null;
+               break;
+            
+            case ACTION_FILTER:
+               // filter changed then query with new settings
+            case ACTION_SEARCH:
+               // query with current settings
+               MethodBinding callback = getQueryCallback();
+               if (callback != null)
+               {
+                  // use reflection to execute the query callback method and retrieve results
+                  Object result = callback.invoke(getFacesContext(), new Object[] {
+                     this.filterIndex, this.contains});
+                  
+                  if (result instanceof SelectItem[])
+                  {
+                     this.currentResults = (SelectItem[])result;
+                  }
+                  else
+                  {
+                     this.currentResults = null;
+                  }
+               }
+               break;
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      ResourceBundle bundle = Application.getBundle(context);
+      
+      String clientId = getClientId(context);
+      
+      // start outer table
+      out.write("<table border=0 cellspacing=4 cellpadding=0>");
+      
+      // top row
+      out.write("<tr valign=top><td>");
+      
+      // filter drop-down
+      if (getShowFilter() == true)
+      {
+         out.write("<select name='");
+         out.write(clientId + FIELD_FILTER);
+         out.write("' size='1'");
+         
+         // apply onchange Form submit here if component attributes require it
+         if (getFilterRefresh() == true)
+         {
+            out.write(" onchange=\"");
+            out.write(generateFormSubmit(context, ACTION_FILTER));
+            out.write("\"");
+         }
+         
+         out.write(">");
+         
+         // output filter options
+         SelectItem[] items = getFilterOptions();
+         if (items != null)
+         {
+            for (int i=0; i<items.length; i++)
+            {
+               out.write("<option value=\"");
+               out.write(items[i].getValue().toString());
+               if (this.filterIndex != i)
+               {
+                  out.write("\">");
+               }
+               else
+               {
+                  out.write("\" selected=\"true\">");
+               }
+               out.write(items[i].getLabel());
+               out.write("</option>");
+            }
+         }
+         
+         out.write("</select>");
+      }
+      out.write("</td><td align=right>");
+      
+      // Contains textbox
+      if (getShowContains() == true)
+      {
+         out.write("<input name='");
+         out.write(clientId + FIELD_CONTAINS);
+         out.write("' type='text' maxlength='256' style='width:120px' value=\"");
+         out.write(Utils.replace(this.contains, "\"", "&quot;"));
+         out.write("\">&nbsp;");
+      }
+      
+      // Search button
+      out.write("<input type='submit' value='");
+      out.write(Utils.encode(bundle.getString(MSG_SEARCH)));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, ACTION_SEARCH));
+      out.write("\">");
+      out.write("</td></tr>");
+      
+      // information row
+      if (this.currentResults != null && getShowContains() == true)
+      {
+         out.write("<tr><td colspan=3>");
+         String resultsMsg;
+         if (getShowFilter() == false)
+         {
+            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS1), new Object[] {this.contains});
+         }
+         else
+         {
+            String filterMsg = this.filters[this.filterIndex].getLabel();
+            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS2), new Object[] {this.contains, filterMsg});
+         }
+         out.write(resultsMsg);
+         out.write("&nbsp;");
+         out.write("<a href='#' onclick=\"");
+         out.write(generateFormSubmit(context, ACTION_CLEAR));
+         out.write("\">");
+         out.write(Utils.encode(bundle.getString(MSG_CLEAR)));
+         out.write("</a></td></tr>");
+      }
+      
+      // results list row
+      out.write("<tr><td colspan=2>");
+      out.write("<select size='8' style='width:");
+      out.write(Integer.toString(getWidth()));
+      out.write("px;height:");
+      out.write(Integer.toString(getHeight()));
+      out.write("px' name='");
+      out.write(clientId + FIELD_RESULTS);
+      out.write("' multiple>");
+      
+      // results
+      if (currentResults != null)
+      {
+         // show each of the items in the results listbox
+         for (int i=0; i<currentResults.length; i++)
+         {
+            out.write("<option value=\"");
+            out.write(currentResults[i].getValue().toString());
+            out.write("\">");
+            out.write(currentResults[i].getLabel());
+            out.write("</option>");
+         }
+      }
+      
+      // end results list
+      out.write("</select>");
+      out.write("</td></tr>");
+      
+      // bottom row - add button
+      if (getShowAddButton() == true)
+      {
+         out.write("<tr><td colspan=2>");
+         out.write("<input type='submit' value='");
+         String msg = getAddButtonLabel();
+         if (msg == null || msg.length() == 0)
+         {
+            msg = bundle.getString(MSG_ADD);
+         }
+         out.write(Utils.encode(msg));
+         out.write("' onclick=\"");
+         out.write(generateFormSubmit(context, ACTION_ADD));
+         out.write("\">");
+         out.write("</td></tr>");
+      }
+      
+      // end outer table
+      out.write("</table>");
+   }
+   
+   /**
+    * @return the filter options
+    */
+   public SelectItem[] getFilterOptions()
+   {
+      if (this.filters == null)
+      {
+         ValueBinding vb = (ValueBinding)getValueBinding("filters");
+         if (vb != null)
+         {
+            this.filters = (SelectItem[])vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.filters;
+   }
+   
+   /**
+    * @return current filter drop-down selected index value 
+    */
+   public int getFilterIndex()
+   {
+      return this.filterIndex;
+   }
+
+   /**
+    * @return Returns the addButtonLabel.
+    */
+   public String getAddButtonLabel()
+   {
+      ValueBinding vb = getValueBinding("addButtonLabel");
+      if (vb != null)
+      {
+         this.addButtonLabel = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.addButtonLabel;
+   }
+
+   /**
+    * @param addButtonLabel The addButtonLabel to set.
+    */
+   public void setAddButtonLabel(String addButtonLabel)
+   {
+      this.addButtonLabel = addButtonLabel;
+   }
+   
+   /**
+    * @return Returns the showAddButton.
+    */
+   public boolean getShowAddButton()
+   {
+      ValueBinding vb = getValueBinding("showAddButton");
+      if (vb != null)
+      {
+         this.showAddButton = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      return showAddButton != null ? showAddButton.booleanValue() : true;
+   }
+
+   /**
+    * @param showAddButton The showAddButton to set.
+    */
+   public void setShowAddButton(boolean showAddButton)
+   {
+      this.showAddButton = Boolean.valueOf(showAddButton);
+   }
+
+   /**
+    * @return Returns the showContains.
+    */
+   public boolean getShowContains()
+   {
+      ValueBinding vb = getValueBinding("showContains");
+      if (vb != null)
+      {
+         this.showContains = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      return showContains != null ? showContains.booleanValue() : true;
+   }
+
+   /**
+    * @param showContains The showContains to set.
+    */
+   public void setShowContains(boolean showContains)
+   {
+      this.showContains = Boolean.valueOf(showContains);
+   }
+
+   /**
+    * @return Returns the showFilter.
+    */
+   public boolean getShowFilter()
+   {
+      ValueBinding vb = getValueBinding("showFilter");
+      if (vb != null)
+      {
+         this.showFilter = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      return showFilter != null ? showFilter.booleanValue() : true;
+   }
+
+   /**
+    * @param showFilter The showFilter to set.
+    */
+   public void setShowFilter(boolean showFilter)
+   {
+      this.showFilter = Boolean.valueOf(showFilter);
+   }
+
+   /**
+    * @return Returns the filterRefresh.
+    */
+   public boolean getFilterRefresh()
+   {
+      ValueBinding vb = getValueBinding("filterRefresh");
+      if (vb != null)
+      {
+         this.filterRefresh = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      return filterRefresh != null ? filterRefresh.booleanValue() : false;
+   }
+
+   /**
+    * @param filterRefresh The filterRefresh to set.
+    */
+   public void setFilterRefresh(boolean filterRefresh)
+   {
+      this.filterRefresh = Boolean.valueOf(filterRefresh);
+   }
+
+   /**
+    * @return Returns the width.
+    */
+   public int getWidth()
+   {
+      ValueBinding vb = getValueBinding("width");
+      if (vb != null)
+      {
+         this.width = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      return width != null ? width.intValue() : DEFAULT_WIDTH;
+   }
+
+   /**
+    * @param width The width to set.
+    */
+   public void setWidth(int width)
+   {
+      this.width = Integer.valueOf(width);
+   }
+   
+   /**
+    * @return Returns the height.
+    */
+   public int getHeight()
+   {
+      ValueBinding vb = getValueBinding("height");
+      if (vb != null)
+      {
+         this.height = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      return height != null ? height.intValue() : DEFAULT_HEIGHT;
+   }
+
+   /**
+    * @param height The height to set.
+    */
+   public void setHeight(int height)
+   {
+      this.height = Integer.valueOf(height);
+   }
+   
+   /**
+    * @return Returns the queryCallback.
+    */
+   public MethodBinding getQueryCallback()
+   {
+      return this.queryCallback;
+   }
+
+   /**
+    * @param binding    The queryCallback MethodBinding to set.
+    */
+   public void setQueryCallback(MethodBinding binding)
+   {
+      this.queryCallback = binding;
+   }
+   
+   /**
+    * @return The selected results. An array of whatever string objects were attached to the
+    *         SelectItem[] objects supplied as the result of the picker query.
+    */
+   public String[] getSelectedResults()
+   {
+      return this.selectedResults;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field per picker instance on the page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   /**
+    * Generate FORM submit JavaScript for the specified action
+    *  
+    * @param context    FacesContext
+    * @param action     Action index
+    * 
+    * @return FORM submit JavaScript
+    */
+   private String generateFormSubmit(FacesContext context, int action)
+   {
+      return Utils.generateFormSubmit(context, this, getHiddenFieldName(), Integer.toString(action));
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action relevant to the Generic Selector component.
+    */
+   public static class PickerEvent extends ActionEvent
+   {
+      public PickerEvent(UIComponent component, int action, int filterIndex, String contains, String[] results)
+      {
+         super(component);
+         Action = action;
+         FilterIndex = filterIndex;
+         Contains = contains;
+         Results = results;
+      }
+      
+      public int Action;
+      public int FilterIndex;
+      public String Contains;
+      public String[] Results;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIImagePicker.java b/source/java/org/alfresco/web/ui/common/component/UIImagePicker.java
new file mode 100644
index 0000000000..c6864714e6
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIImagePicker.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Component to represent a selectable list of images 
+ * 
+ * @author gavinc
+ */
+public class UIImagePicker extends UIInput
+{   
+   private static Log logger = LogFactory.getLog(UIImagePicker.class);
+   
+   /**
+    * Default constructor
+    */
+   public UIImagePicker()
+   {
+      // set the default renderer for an image picker component
+      setRendererType("org.alfresco.faces.Radio");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.ImagePicker";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[1];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      return (values);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIListItem.java b/source/java/org/alfresco/web/ui/common/component/UIListItem.java
new file mode 100644
index 0000000000..fb4bbe1a13
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIListItem.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author kevinr
+ */
+public class UIListItem extends SelfRenderingComponent
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[5];
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      values[2] = this.disabled;
+      values[3] = this.label;
+      values[4] = this.tooltip;
+      return ((Object) (values));
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+      this.disabled = (Boolean)values[2];
+      this.label = (String)values[3];
+      this.tooltip = (String)values[4];
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors
+   
+   /**
+    * Get the value - the value is used in a equals() match against the current value in the
+    * parent ModeList component to set the selected item.
+    *
+    * @return the value
+    */
+   public Object getValue()
+   {
+      ValueBinding vb = getValueBinding("value");
+      if (vb != null)
+      {
+         this.value = vb.getValue(getFacesContext());
+      }
+      
+      return this.value;
+   }
+
+   /**
+    * Set the value - the value is used in a equals() match against the current value in the
+    * parent ModeList component to set the selected item.
+    *
+    * @param value     the value
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Returns the disabled flag
+    * 
+    * @return true if the mode list is disabled
+    */
+   public boolean isDisabled()
+   {
+      ValueBinding vb = getValueBinding("disabled");
+      if (vb != null)
+      {
+         this.disabled = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.disabled != null)
+      {
+         return this.disabled.booleanValue();
+      }
+      else
+      {
+         // return the default
+         return false;
+      }
+   }
+
+   /**
+    * Sets whether the mode list is disabled
+    * 
+    * @param disabled   the disabled flag
+    */
+   public void setDisabled(boolean disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the tooltip.
+    */
+   public String getTooltip()
+   {
+      ValueBinding vb = getValueBinding("tooltip");
+      if (vb != null)
+      {
+         this.tooltip = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.tooltip;
+   }
+
+   /**
+    * @param tooltip The tooltip to set.
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** the component value */
+   private Object value = null;
+   
+   /** disabled flag */
+   private Boolean disabled = null;
+   
+   /** the tooltip */
+   private String tooltip;
+
+   /** the label */
+   private String label;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIListItems.java b/source/java/org/alfresco/web/ui/common/component/UIListItems.java
new file mode 100644
index 0000000000..a4fd4b4c45
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIListItems.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * Allows a group of UIListItem objects to be represented.
+ * 
+ * @author gavinc
+ */
+public class UIListItems extends SelfRenderingComponent
+{
+   private Object value;
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.ListItems";
+   }
+   
+   /**
+    * @return Returns the object holding the decriptions
+    */
+   public Object getValue()
+   {
+      if (this.value == null)
+      {
+         ValueBinding vb = getValueBinding("value");
+         if (vb != null)
+         {
+            this.value = vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.value;
+   }
+
+   /**
+    * @param value Sets the object holding the description
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      return (values);
+   }
+}
+
diff --git a/source/java/org/alfresco/web/ui/common/component/UIMenu.java b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
new file mode 100644
index 0000000000..881a63b6fe
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.Utils;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIMenu extends SelfRenderingComponent
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // output a textual label with an optional icon to show the menu
+      String menuId = getNextMenuId(context);
+      out.write("<a href='#' onclick=\"javascript:_toggleMenu(event, '");
+      out.write(menuId);
+      out.write("');return false;\"");
+      outputAttribute(out, getAttributes().get("style"), "style");
+      outputAttribute(out, getAttributes().get("styleClass"), "class");
+      outputAttribute(out, getTooltip(), "title");
+      out.write('>');
+      
+      // output label text
+      String label = getLabel();
+      if (label != null)
+      {
+         out.write("<span>");
+         out.write(Utils.encode(label));
+         out.write("</span>");
+      }
+      
+      // output image
+      if (getAttributes().get("image") != null)
+      {
+         out.write(Utils.buildImageTag(context, (String)getAttributes().get("image"), null, "absmiddle"));
+      }
+      
+      out.write("</a>");
+      
+      // output the hidden DIV section to contain the menu item table
+      // also output the javascript handlers used to hide the menu after a delay of non-use
+      out.write("<br><div id='");
+      out.write(menuId);
+      out.write("' style=\"position:absolute;display:none;padding-left:2px;\">");
+      out.write("<table border=0 cellpadding=0");
+      outputAttribute(out, getAttributes().get("itemSpacing"), "cellspacing");
+      outputAttribute(out, getAttributes().get("menuStyle"), "style");
+      outputAttribute(out, getAttributes().get("menuStyleClass"), "class");
+      out.write(">");
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeEnd(javax.faces.context.FacesContext)
+    */
+   public void encodeEnd(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // end the menu table and the hidden DIV section
+      out.write("</table></div>");
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.label = (String)values[1];
+      this.tooltip = (String)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.label;
+      values[2] = this.tooltip;
+      return values;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the tooltip.
+    */
+   public String getTooltip()
+   {
+      ValueBinding vb = getValueBinding("tooltip");
+      if (vb != null)
+      {
+         this.tooltip = (String)vb.getValue(getFacesContext());
+      }
+      return this.tooltip;
+   }
+
+   /**
+    * @param tooltip The tooltip to set.
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Return the next usable menu DIV id in a sequence
+    * 
+    * @param context       FacesContext
+    * 
+    * @return next menu ID
+    */
+   private String getNextMenuId(FacesContext context)
+   {
+      Integer val = (Integer)context.getExternalContext().getRequestMap().get(MENU_ID_KEY);
+      if (val == null)
+      {
+         val = Integer.valueOf(0);
+      }
+      
+      // build next id in sequence
+      String id = getClientId(context) + '_' + val.toString();
+      
+      // save incremented value in the request ready for next menu component instance
+      val = Integer.valueOf( val.intValue() + 1 );
+      context.getExternalContext().getRequestMap().put(MENU_ID_KEY, val);
+      
+      return id;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private members
+   
+   private final static String MENU_ID_KEY = "__awc_menu_id";
+   
+   private String label;
+   
+   private String tooltip;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIModeList.java b/source/java/org/alfresco/web/ui/common/component/UIModeList.java
new file mode 100644
index 0000000000..bb2812e6f1
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIModeList.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIModeList extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Construction
+   
+   /**
+    * Default constructor
+    */
+   public UIModeList()
+   {
+      setRendererType("org.alfresco.faces.ModeListRenderer");
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.iconColumnWidth = (Integer)values[1];
+      this.horizontal = (Boolean)values[2];
+      this.disabled = (Boolean)values[3];
+      this.label = (String)values[4];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[5];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.iconColumnWidth;
+      values[2] = this.horizontal;
+      values[3] = this.disabled;
+      values[4] = this.label;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ModeListItemSelectedEvent)
+      {
+         // found an event for us, update the value for this component
+         setValue( ((ModeListItemSelectedEvent)event).SelectedValue );
+      }
+      
+      // default ActionEvent processing for a UICommand
+      super.broadcast(event);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed property accessors 
+   
+   /**
+    * Get the horizontal rendering flag
+    *
+    * @return true for horizontal rendering, false otherwise
+    */
+   public boolean isHorizontal()
+   {
+      ValueBinding vb = getValueBinding("horizontal");
+      if (vb != null)
+      {
+         this.horizontal = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.horizontal != null)
+      {
+         return this.horizontal.booleanValue();
+      }
+      else
+      {
+         // return the default
+         return false;
+      }
+   }
+
+   /**
+    * Set true for horizontal rendering, false otherwise
+    *
+    * @param horizontal       the horizontal
+    */
+   public void setHorizontal(boolean horizontal)
+   {
+      this.horizontal = horizontal;
+   }
+   
+   /**
+    * Get the icon column width
+    *
+    * @return the icon column width
+    */
+   public int getIconColumnWidth()
+   {
+      ValueBinding vb = getValueBinding("iconColumnWidth");
+      if (vb != null)
+      {
+         this.iconColumnWidth = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      if (this.iconColumnWidth != null)
+      {
+         return this.iconColumnWidth.intValue();
+      }
+      else
+      {
+         // return the default
+         return 20;
+      }
+   }
+
+   /**
+    * Set the icon column width
+    *
+    * @param iconColumnWidth     the icon column width
+    */
+   public void setIconColumnWidth(int iconColumnWidth)
+   {
+      this.iconColumnWidth = Integer.valueOf(iconColumnWidth);
+   }
+
+   /**
+    * Returns the disabled flag
+    * 
+    * @return true if the mode list is disabled
+    */
+   public boolean isDisabled()
+   {
+      ValueBinding vb = getValueBinding("disabled");
+      if (vb != null)
+      {
+         this.disabled = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.disabled != null)
+      {
+         return this.disabled.booleanValue();
+      }
+      else
+      {
+         // return the default
+         return false;
+      }
+   }
+
+   /**
+    * Sets whether the mode list is disabled
+    * 
+    * @param disabled   the disabled flag
+    */
+   public void setDisabled(boolean disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data 
+
+   /** the icon column width */
+   private Integer iconColumnWidth;
+
+   /** true for horizontal rendering, false otherwise */
+   private Boolean horizontal = null;
+   
+   /** disabled flag */
+   private Boolean disabled = null;
+   
+   /** the label */
+   private String label;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing a change in selection for a ModeList component.
+    */
+   public static class ModeListItemSelectedEvent extends ActionEvent
+   {
+      private static final long serialVersionUID = 3618135654274774322L;
+
+      public ModeListItemSelectedEvent(UIComponent component, Object selectedValue)
+      {
+         super(component);
+         SelectedValue = selectedValue;
+      }
+      
+      public Object SelectedValue = null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIOutputText.java b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
new file mode 100644
index 0000000000..7cf2116bea
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+
+import javax.faces.component.UIOutput;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+/**
+ * Component that simply renders text
+ * 
+ * @author gavinc
+ */
+public class UIOutputText extends UIOutput
+{
+   /**
+    * Default constructor
+    */
+   public UIOutputText()
+   {
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.OutputText";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      out.write((String)getValue());
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIPanel.java b/source/java/org/alfresco/web/ui/common/component/UIPanel.java
new file mode 100644
index 0000000000..6d12cafcd2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIPanel.java
@@ -0,0 +1,606 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.ui.common.PanelGenerator;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+
+/**
+ * @author kevinr
+ */
+public class UIPanel extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * Default constructor
+    */
+   public UIPanel()
+   {
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Controls";
+   }
+   
+   /**
+    * Return the UI Component to be displayed on the right of the panel title area
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getTitleComponent()
+   {
+      UIComponent titleComponent = null;
+      
+      // attempt to find a component with the specified ID
+      String facetsId = getFacetsId();
+      if (facetsId != null)
+      {
+         UIForm parent = Utils.getParentForm(FacesContext.getCurrentInstance(), this);
+         UIComponent facetsComponent = parent.findComponent(facetsId);
+         if (facetsComponent != null)
+         {
+            // get the 'title' facet from the component
+            titleComponent = facetsComponent.getFacet("title");
+         }
+      }
+      
+      return titleComponent;
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // determine if we have a component on the header
+      UIComponent titleComponent = getTitleComponent();
+      
+      // determine whether we have any adornments
+      String label = getLabel();
+      if (label != null || isProgressive() == true || titleComponent != null)
+      {
+         this.hasAdornments = true;
+      }
+      
+      // make sure we have a default background color for the content area
+      String bgcolor = getBgcolor();
+      if (bgcolor == null)
+      {
+         bgcolor = PanelGenerator.BGCOLOR_WHITE;
+      }
+      
+      // determine if we have a bordered title area, note, we also need to have
+      // the content area border defined as well
+      if ((getTitleBgcolor() != null) && (getTitleBorder() != null) && 
+          (getBorder() != null) && this.hasAdornments)
+      {
+         this.hasBorderedTitleArea = true;
+      }
+      
+      // output first part of border table
+      if (this.hasBorderedTitleArea)
+      {
+         PanelGenerator.generatePanelStart(
+               out,
+               context.getExternalContext().getRequestContextPath(),
+               getTitleBorder(),
+               getTitleBgcolor());
+      }
+      else if (getBorder() != null)
+      {
+         PanelGenerator.generatePanelStart(
+               out,
+               context.getExternalContext().getRequestContextPath(),
+               getBorder(),
+               bgcolor);
+      }
+
+      if (this.hasAdornments)
+      {
+         // start the containing table if we have any adornments
+         out.write("<table border='0' cellspacing='0' cellpadding='0' width='100%'><tr><td>");
+      }
+
+      // output progressive disclosure icon in appropriate state
+      // TODO: manage state of this icon via component Id!
+      if (isProgressive() == true)
+      {
+         out.write("<a href='#' onclick=\"");
+         String value = getClientId(context) + NamingContainer.SEPARATOR_CHAR + Boolean.toString(!isExpanded());
+         out.write(Utils.generateFormSubmit(context, this, getHiddenFieldName(), value));
+         out.write("\">");
+         
+         if (isExpanded() == true)
+         {
+            out.write(Utils.buildImageTag(context, WebResources.IMAGE_EXPANDED, 11, 11, ""));
+         }
+         else
+         {
+            out.write(Utils.buildImageTag(context, WebResources.IMAGE_COLLAPSED, 11, 11, ""));
+         }
+         
+         out.write("</a>&nbsp;&nbsp;");
+      }
+      
+      // output textual label
+      if (label != null)
+      {
+         out.write("<span");
+         Utils.outputAttribute(out, getAttributes().get("style"), "style");
+         Utils.outputAttribute(out, getAttributes().get("styleClass"), "class");
+         out.write('>');
+         
+         out.write(Utils.encode(label));
+         
+         out.write("</span>");
+      }
+
+      if (this.hasAdornments)
+      {
+         out.write("</td>");
+      }
+      
+      // render the title component if supplied
+      if (titleComponent != null)
+      {
+         out.write("<td align='right'>");
+         Utils.encodeRecursive(context, titleComponent);
+         out.write("</td>");
+      }
+      
+      if (this.hasAdornments)
+      {
+         out.write("</tr></table>");
+      }
+      
+      // if we have the titled border area, output the middle section
+      if (this.hasBorderedTitleArea && isExpanded())
+      {
+         PanelGenerator.generateTitledPanelMiddle(
+               out,
+               context.getExternalContext().getRequestContextPath(),
+               getTitleBorder(),
+               getBorder(),
+               getBgcolor());
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeEnd(javax.faces.context.FacesContext)
+    */
+   public void encodeEnd(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // output final part of border table
+      if (this.hasBorderedTitleArea && isExpanded() == false)
+      {
+         PanelGenerator.generatePanelEnd(
+               out,
+               context.getExternalContext().getRequestContextPath(),
+               getTitleBorder());
+      }
+      else if (getBorder() != null)
+      {
+         PanelGenerator.generatePanelEnd(
+               out,
+               context.getExternalContext().getRequestContextPath(),
+               getBorder());
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.startsWith(getClientId(context)))
+      {
+         // we were clicked, strip out the value
+         value = value.substring(getClientId(context).length() + 1);
+         
+         // the expand/collapse icon was clicked, so toggle the state
+         ExpandedEvent event = new ExpandedEvent(this, Boolean.parseBoolean(value));
+         queueEvent(event);
+         
+         //
+         // TODO: See http://forums.java.sun.com/thread.jspa?threadID=524925&start=15&tstart=0
+         //       Bug/known issue in JSF 1.1 RI
+         //       This causes a problem where the View attempts to assign duplicate Ids
+         //       to components when createUniqueId() on UIViewRoot is called before the
+         //       render phase. This occurs in the Panel tag as it must call getComponent()
+         //       early to decide whether to allow the tag to render contents or not.
+         //
+         // context.getViewRoot().setTransient(true);
+         //
+         //       The other solution is to explicity give ALL child components of the
+         //       panel a unique Id rather than a generated one! 
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ExpandedEvent)
+      {
+         // expanded event - we handle this
+         setExpanded( ((ExpandedEvent)event).State );
+         
+         if (getExpandedActionListener() != null)
+         {
+            Utils.processActionMethod(getFacesContext(), getExpandedActionListener(), (ExpandedEvent)event);
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      setExpanded( ((Boolean)values[1]).booleanValue() );
+      this.progressive = (Boolean)values[2];
+      this.border = (String)values[3];
+      this.bgcolor = (String)values[4];
+      this.label = (String)values[5];
+      this.titleBgcolor = (String)values[6];
+      this.titleBorder = (String)values[7];
+      this.expandedActionListener = (MethodBinding)values[8];
+      this.facetsId = (String)values[9];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[10];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = (isExpanded() ? Boolean.TRUE : Boolean.FALSE);
+      values[2] = this.progressive;
+      values[3] = this.border;
+      values[4] = this.bgcolor;
+      values[5] = this.label;
+      values[6] = this.titleBgcolor;
+      values[7] = this.titleBorder;
+      values[8] = this.expandedActionListener;
+      values[9] = this.facetsId;
+      return values;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /** 
+    * @param binding    The MethodBinding to call when expand/collapse is performed by the user.
+    */
+   public void setExpandedActionListener(MethodBinding binding)
+   {
+      this.expandedActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call when expand/collapse is performed by the user.
+    */
+   public MethodBinding getExpandedActionListener()
+   {
+      return this.expandedActionListener;
+   }
+   
+   /**
+    * @return Returns the bgcolor.
+    */
+   public String getBgcolor()
+   {
+      ValueBinding vb = getValueBinding("bgcolor");
+      if (vb != null)
+      {
+         this.bgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.bgcolor;
+   }
+   
+   /**
+    * @param bgcolor    The bgcolor to set.
+    */
+   public void setBgcolor(String bgcolor)
+   {
+      this.bgcolor = bgcolor;
+   }
+
+   /**
+    * @return Returns the border name.
+    */
+   public String getBorder()
+   {
+      ValueBinding vb = getValueBinding("border");
+      if (vb != null)
+      {
+         this.border = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.border;
+   }
+
+   /**
+    * @param border  The border name to user.
+    */
+   public void setBorder(String border)
+   {
+      this.border = border;
+   }
+   
+   /**
+    * @return Returns the bgcolor of the title area
+    */
+   public String getTitleBgcolor()
+   {
+      ValueBinding vb = getValueBinding("titleBgcolor");
+      if (vb != null)
+      {
+         this.titleBgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.titleBgcolor;
+   }
+
+   /**
+    * @param titleBgcolor Sets the bgcolor of the title area
+    */
+   public void setTitleBgcolor(String titleBgcolor)
+   {
+      this.titleBgcolor = titleBgcolor;
+   }
+
+   /**
+    * @return Returns the border style of the title area
+    */
+   public String getTitleBorder()
+   {
+      ValueBinding vb = getValueBinding("titleBorder");
+      if (vb != null)
+      {
+         this.titleBorder = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.titleBorder;
+   }
+
+   /**
+    * @param titleBorder Sets the border style of the title area
+    */
+   public void setTitleBorder(String titleBorder)
+   {
+      this.titleBorder = titleBorder;
+   }
+
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the progressive display setting.
+    */
+   public boolean isProgressive()
+   {
+      ValueBinding vb = getValueBinding("progressive");
+      if (vb != null)
+      {
+         this.progressive = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.progressive != null)
+      {
+         return this.progressive.booleanValue();
+      }
+      else
+      {
+         // return default
+         return false;
+      }
+   }
+   
+   /**
+    * @param progressive   The progressive display boolean to set.
+    */
+   public void setProgressive(boolean progressive)
+   {
+      this.progressive = Boolean.valueOf(progressive);
+   }
+   
+   /**
+    * Returns whether the component show allow rendering of its child components.
+    */
+   public boolean isExpanded()
+   {
+      ValueBinding vb = getValueBinding("expanded");
+      if (vb != null)
+      {
+         this.expanded = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.expanded != null)
+      {
+         return this.expanded.booleanValue();
+      }
+      else
+      {
+         // return default
+         return true;
+      }
+   }
+   
+   /**
+    * Sets whether the component show allow rendering of its child components.
+    * For this component we change this value if the user indicates to change the
+    * hidden/visible state of the progressive panel.
+    */
+   public void setExpanded(boolean expanded)
+   {
+      this.expanded = Boolean.valueOf(expanded);
+   }
+   
+   /**
+    * Get the facets component Id to use
+    *
+    * @return the facets component Id
+    */
+   public String getFacetsId()
+   {
+      ValueBinding vb = getValueBinding("facets");
+      if (vb != null)
+      {
+         this.facetsId = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.facetsId;
+   }
+
+   /**
+    * Set the facets component Id to use
+    *
+    * @param facets     the facets component Id
+    */
+   public void setFacetsId(String facets)
+   {
+      this.facetsId = facets;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name based on the parent form component Id and
+    * the string "panel" to give a hidden field name that can be shared by all panels
+    * within a single UIForm component.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      UIForm form = Utils.getParentForm(getFacesContext(), this);
+      return form.getClientId(getFacesContext()) + NamingContainer.SEPARATOR_CHAR + "panel";
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private members 
+   
+   // component settings
+   private String border = null;
+   private String bgcolor = null;
+   private String titleBorder = null;
+   private String titleBgcolor = null;
+   private Boolean progressive = null;
+   private String label = null;
+   private String facetsId = null;
+   private MethodBinding expandedActionListener = null;
+   
+   // component state
+   private boolean hasAdornments = false;
+   private boolean hasBorderedTitleArea = false;
+   private Boolean expanded = Boolean.TRUE;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action relevant when the panel is expanded or collapsed.
+    */
+   public static class ExpandedEvent extends ActionEvent
+   {
+      public ExpandedEvent(UIComponent component, boolean state)
+      {
+         super(component);
+         State = state;
+      }
+      
+      public boolean State;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
new file mode 100644
index 0000000000..2da387abb9
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.common.PanelGenerator;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIStatusMessage extends SelfRenderingComponent
+{
+   /**
+    * Default Constructor 
+    */
+   public UIStatusMessage()
+   {
+      setRendererType(null);
+      
+      // add default message to display
+      FacesContext fc = FacesContext.getCurrentInstance();
+      String msg = Application.getMessage(fc, MSG_DEFAULT_STATUS);
+      String time = Utils.getTimeFormat(fc).format(new Date(System.currentTimeMillis()));
+      this.messages.add(new FacesMessage(FacesMessage.SEVERITY_INFO, time, msg));
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.StatusMessage";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.border = (String)values[1];
+      this.bgcolor = (String)values[2];
+      this.messages = (List)values[3];
+      this.currentMessage = ((Integer)values[4]).intValue();
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[5];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.border;
+      values[2] = this.bgcolor;
+      values[3] = this.messages;
+      values[4] = Integer.valueOf(this.currentMessage);
+      return values;
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      String bgColor = getBgcolor();
+      if (bgColor == null)
+      {
+         bgColor = PanelGenerator.BGCOLOR_WHITE;
+      }
+      
+      String panel = getBorder();
+      if (panel != null)
+      {
+         PanelGenerator.generatePanelStart(out,
+               context.getExternalContext().getRequestContextPath(),
+               panel,
+               bgColor);
+      }
+      
+      // Previous Message icon image - clicking shows previous message
+      out.write("<table width=100% cellspacing=0 cellpadding=0><tr><td>");
+      String field = getHiddenFieldName();
+      String leftValue = getClientId(context) + NamingContainer.SEPARATOR_CHAR + Integer.toString(ACTION_PREVIOUS);
+      String leftOnclick = Utils.generateFormSubmit(context, this, field, leftValue);
+      out.write(Utils.buildImageTag(context, WebResources.IMAGE_MOVELEFT, 12, 12, null, leftOnclick, "absmiddle"));
+      out.write("</td><td width=100% align=center>");
+      
+      // get messages for the component and crop the stack to the maximum history size
+      Iterator<FacesMessage> msgIterator = context.getMessages(STATUS_MESSAGE);
+      while (msgIterator.hasNext())
+      {
+         if (messages.size() >= HISTORY_SIZE)
+         {
+            messages.remove(HISTORY_SIZE);
+         }
+         // add new messages to the stack in turn
+         messages.add(0, msgIterator.next());
+         // reset current message to top if new one added
+         currentMessage = 0;
+      }
+      
+      // TODO: show different icon depending on SEVERITY of the message?
+      // Message text
+      String style = CSS_ERROR;
+      String icon = WebResources.IMAGE_INFO;
+      FacesMessage msg = messages.get(currentMessage);
+      if (msg.getSeverity() == FacesMessage.SEVERITY_INFO)
+      {
+         style = CSS_INFO;
+      }
+      else if (msg.getSeverity() == FacesMessage.SEVERITY_WARN)
+      {
+         style = CSS_WARNING;
+      }
+      
+      out.write(Utils.buildImageTag(context, icon, null, "absmiddle"));
+      out.write("&nbsp;<span class='");
+      out.write(style);
+      out.write("'>");
+      out.write(msg.getSummary());
+      out.write(" - ");
+      out.write(Utils.encode(msg.getDetail()));
+      out.write("</span>");
+      out.write("</td><td>");
+      
+      // Next Message icon image - clicking shows next message
+      String rightValue = getClientId(context) + NamingContainer.SEPARATOR_CHAR + Integer.toString(ACTION_NEXT);
+      String rightOnclick = Utils.generateFormSubmit(context, this, field, rightValue);
+      out.write(Utils.buildImageTag(context, WebResources.IMAGE_MOVERIGHT, 12, 12, null, rightOnclick, "absmiddle"));
+      out.write("</td></tr></table>");
+      
+      if (panel != null)
+      {
+         PanelGenerator.generatePanelEnd(out, 
+               context.getExternalContext().getRequestContextPath(),
+               panel);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.startsWith(getClientId(context)))
+      {
+         // we were clicked, strip out the value
+         int action = Integer.parseInt(value.substring(getClientId(context).length() + 1));
+         
+         // raise an event to represent the requested action
+         MessageEvent event = new MessageEvent(this, action);
+         queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof MessageEvent)
+      {
+         switch (((MessageEvent)event).Action)
+         {
+            case ACTION_NEXT:
+               currentMessage++;
+               if (currentMessage >= this.messages.size())
+               {
+                  currentMessage = 0;
+               }
+               break;
+               
+            case ACTION_PREVIOUS:
+               currentMessage--;
+               if (currentMessage < 0)
+               {
+                  currentMessage = this.messages.size() - 1;
+               }
+               break;
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   /**
+    * @return Returns the bgcolor.
+    */
+   public String getBgcolor()
+   {
+      ValueBinding vb = getValueBinding("bgcolor");
+      if (vb != null)
+      {
+         this.bgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.bgcolor;
+   }
+   
+   /**
+    * @param bgcolor    The bgcolor to set.
+    */
+   public void setBgcolor(String bgcolor)
+   {
+      this.bgcolor = bgcolor;
+   }
+
+   /**
+    * @return Returns the border name.
+    */
+   public String getBorder()
+   {
+      ValueBinding vb = getValueBinding("border");
+      if (vb != null)
+      {
+         this.border = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.border;
+   }
+
+   /**
+    * @param border  The border name to user.
+    */
+   public void setBorder(String border)
+   {
+      this.border = border;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name based on the parent form component Id and
+    * the string "status" to give a hidden field name that can be shared by all status messages
+    * within a single UIForm component.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      UIForm form = Utils.getParentForm(getFacesContext(), this);
+      return form.getClientId(getFacesContext()) + NamingContainer.SEPARATOR_CHAR + "status";
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private members 
+   
+   public static final String STATUS_MESSAGE = "status-message";
+   
+   private final static String CSS_INFO      = "statusInfoText";
+   private final static String CSS_WARNING   = "statusWarningText";
+   private final static String CSS_ERROR     = "statusErrorText";
+   
+   private final static int ACTION_PREVIOUS = 0;
+   private final static int ACTION_NEXT = 1;
+   
+   private final static int HISTORY_SIZE = 10;
+   
+   private final static String MSG_DEFAULT_STATUS = "status_message_default";
+   
+   private List<FacesMessage> messages = new LinkedList<FacesMessage>();
+   private int currentMessage = 0;
+   
+   // component settings
+   private String border = null;
+   private String bgcolor = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action that occurs when the previous/next buttons are clicked.
+    */
+   public static class MessageEvent extends ActionEvent
+   {
+      public MessageEvent(UIComponent component, int action)
+      {
+         super(component);
+         Action = action;
+      }
+      
+      public int Action;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java b/source/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java
new file mode 100644
index 0000000000..0cd1d453de
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/GridArrayDataModel.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+/**
+ * @author kevinr
+ */
+public class GridArrayDataModel implements IGridDataModel
+{
+   /**
+    * Constructor
+    * 
+    * @param data    Array of Object (beans) row data 
+    */
+   public GridArrayDataModel(Object[] data)
+   {
+      this.data = data;
+   }
+   
+   /**
+    * Get a row object for the specified row index
+    * 
+    * @param index      valid row index
+    * 
+    * @return row object for the specified index
+    */
+   public Object getRow(int index)
+   {
+      return this.data[index];
+   }
+   
+   /**
+    * Return the number of rows in the data model
+    * 
+    * @return row count
+    */
+   public int size()
+   {
+      return this.data.length;
+   }
+   
+   /**
+    * Sort the data set using the specified sort parameters
+    * 
+    * @param column        Column to sort
+    * @param descending    True for descending sort, false for ascending
+    * @param mode          Sort mode to use (see IDataContainer constants)
+    */
+   public void sort(String column, boolean descending, String mode)
+   {
+   }
+   
+   private Object[] data = null;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java b/source/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java
new file mode 100644
index 0000000000..0251aa0e02
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/GridListDataModel.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+import java.util.List;
+
+import org.alfresco.web.data.QuickSort;
+
+/**
+ * @author kevinr
+ */
+public class GridListDataModel implements IGridDataModel
+{
+   /**
+    * Constructor
+    * 
+    * @param data    List of Object[] row data
+    */
+   public GridListDataModel(List data)
+   {
+      this.data = data;
+   }
+   
+   /**
+    * Get a row object for the specified row index
+    * 
+    * @param index      valid row index
+    * 
+    * @return row object for the specified index
+    */
+   public Object getRow(int index)
+   {
+      return this.data.get(index);
+   }
+   
+   /**
+    * Return the number of rows in the data model
+    * 
+    * @return row count
+    */
+   public int size()
+   {
+      return this.data.size();
+   }
+   
+   /**
+    * Sort the data set using the specified sort parameters
+    * 
+    * @param column        Column to sort
+    * @param descending    True for descending sort, false for ascending
+    * @param mode          Sort mode to use (see IDataContainer constants)
+    */
+   public void sort(String column, boolean descending, String mode)
+   {
+      try
+      {
+         QuickSort sorter = new QuickSort(this.data, column, !descending, mode);
+         sorter.sort();
+      }
+      catch (Exception err)
+      {
+         throw new RuntimeException("Failed to sort data: " + err.getMessage(), err);
+      }
+   }
+   
+   private List data = null;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java b/source/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java
new file mode 100644
index 0000000000..4f0e58ea8c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/IGridDataModel.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+/**
+ * @author kevinr
+ */
+public interface IGridDataModel
+{
+   /**
+    * Get a row object for the specified row index
+    * 
+    * @param index      valid row index
+    * 
+    * @return row object for the specified index
+    */
+   public Object getRow(int index);
+   
+   /**
+    * Return the number of rows in the data model
+    * 
+    * @return row count
+    */
+   public int size();
+   
+   /**
+    * Sort the data set using the specified sort parameters
+    * 
+    * @param column        Column to sort
+    * @param descending    True for descending sort, false for ascending
+    * @param mode          Sort mode to use (see IDataContainer constants)
+    */
+   public void sort(String column, boolean descending, String mode);
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIColumn.java b/source/java/org/alfresco/web/ui/common/component/data/UIColumn.java
new file mode 100644
index 0000000000..9a3f2f3c20
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/UIColumn.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIColumn extends UIComponentBase
+{
+   // ------------------------------------------------------------------------------
+   // Component implementation 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Data";
+   }
+   
+   /**
+    * Return the UI Component to be used as the header for this column
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getHeader()
+   {
+      return getFacet("header");
+   }
+   
+   /**
+    * Return the UI Component to be used as the footer for this column
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getFooter()
+   {
+      return getFacet("footer");
+   }
+   
+   /**
+    * Return the UI Component to be used as the large icon for this column
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getLargeIcon()
+   {
+      return getFacet("large-icon");
+   }
+   
+   /**
+    * Return the UI Component to be used as the small icon for this column
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getSmallIcon()
+   {
+      return getFacet("small-icon");
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.primary = ((Boolean)values[1]).booleanValue();
+      this.actions = ((Boolean)values[2]).booleanValue();
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = (this.primary ? Boolean.TRUE : Boolean.FALSE);
+      values[2] = (this.actions ? Boolean.TRUE : Boolean.FALSE);
+      return (values);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors
+   
+   /**
+    * @return true if this is the primary column
+    */
+   public boolean getPrimary()
+   {
+      ValueBinding vb = getValueBinding("primary");
+      if (vb != null)
+      {
+         this.primary = (Boolean)vb.getValue(getFacesContext());
+      }
+      return this.primary;
+   }
+   
+   /**
+    * @param primary    True if this is the primary column, false otherwise
+    */
+   public void setPrimary(boolean primary)
+   {
+      this.primary = primary;
+   }
+   
+   /**
+    * @return true if this is the column containing actions for the current row
+    */
+   public boolean getActions()
+   {
+      ValueBinding vb = getValueBinding("actions");
+      if (vb != null)
+      {
+         this.actions = (Boolean)vb.getValue(getFacesContext());
+      }
+      return this.actions;
+   }
+   
+   /**
+    * @param actions    True if this is the column containing actions for the current row
+    */
+   public void setActions(boolean actions)
+   {
+      this.actions = actions;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data 
+   
+   private boolean primary = false;
+   private boolean actions = false;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java b/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
new file mode 100644
index 0000000000..05a3a85f7e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.apache.log4j.Logger;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIDataPager extends UICommand
+{
+   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   
+   private static final String LAST_PAGE = "last_page";
+   private static final String NEXT_PAGE = "next_page";
+   private static final String PREVIOUS_PAGE = "prev_page";
+   private static final String FIRST_PAGE = "first_page";
+   private static final String MSG_PAGEINFO = "page_info";
+   
+   
+   // ------------------------------------------------------------------------------
+   // Construction 
+   
+   /**
+    * Default constructor
+    */
+   public UIDataPager()
+   {
+      setRendererType(null);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      IDataContainer dataContainer = getDataContainer();
+      if (dataContainer == null)
+      {
+         throw new IllegalStateException("Must nest UISortLink inside component implementing IDataContainer!"); 
+      }
+      
+      // this component will only render itself if the parent DataContainer is setup
+      // with a valid "pageSize" property
+      if (isRendered() == false || dataContainer.getPageSize() == -1)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      ResourceBundle bundle = Application.getBundle(context);
+      StringBuilder buf = new StringBuilder(512);
+      
+      int currentPage = dataContainer.getCurrentPage();
+      int pageCount = dataContainer.getPageCount();
+      
+      buf.append("<span");
+      if (getAttributes().get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(getAttributes().get("style"))
+            .append('"');
+      }
+      if (getAttributes().get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(getAttributes().get("styleClass"));
+      }
+      buf.append('>');
+      
+      // output Page X of Y text
+      buf.append(MessageFormat.format(bundle.getString(MSG_PAGEINFO), new Object[] {
+            Integer.toString(currentPage + 1),  // current page can be zero if no data present
+            Integer.toString(pageCount)
+            }));
+      
+      buf.append("&nbsp;");
+      
+      // output HTML links or labels to render the paging controls
+      // first page
+      if (currentPage != 0)
+      {
+         buf.append("<a href='#' onclick=\"");
+         buf.append(generateEventScript(0));
+         buf.append("\">");
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_FIRSTPAGE, 16, 16, bundle.getString(FIRST_PAGE)));
+         buf.append("</a>");
+      }
+      else
+      {
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_FIRSTPAGE_NONE, 16, 16, null));
+      }
+      
+      // previous page
+      if (currentPage != 0)
+      {
+         buf.append("<a href='#' onclick=\"");
+         buf.append(generateEventScript(currentPage - 1));
+         buf.append("\">");
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_PREVIOUSPAGE, 16, 16, bundle.getString(PREVIOUS_PAGE)));
+         buf.append("</a>");
+      }
+      else
+      {
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_PREVIOUSPAGE_NONE, 16, 16, null));
+      }
+      
+      buf.append("&nbsp;");
+      
+      // clickable digits for pages 1 to 10
+      int totalIndex = (pageCount < 10 ? pageCount : 10);
+      for (int i=0; i<totalIndex; i++)
+      {
+         if (i != currentPage)
+         {
+            buf.append("<a href='#' onclick=\"")
+               .append(generateEventScript(i))
+               .append("\">")
+               .append(i + 1)
+               .append("</a>&nbsp;");
+         }
+         else
+         {
+            buf.append("<b>")
+               .append(i + 1)
+               .append("</b>&nbsp;");
+         }
+      }
+      // clickable digits for pages 20 to 100 (in jumps of 10)
+      if (pageCount >= 20)
+      {
+         buf.append("...&nbsp;");
+         totalIndex = (pageCount / 10) * 10;
+         totalIndex = (totalIndex < 100 ? totalIndex : 100);
+         for (int i=19; i<totalIndex; i += 10)
+         {
+            if (i != currentPage)
+            {
+               buf.append("<a href='#' onclick=\"")
+                  .append(generateEventScript(i))
+                  .append("\">")
+                  .append(i + 1)
+                  .append("</a>&nbsp;");
+            }
+            else
+            {
+               buf.append("<b>")
+                  .append(i + 1)
+                  .append("</b>&nbsp;");
+            }
+         }
+      }
+      // clickable digits for last page if > 10 and not already shown
+      if ((pageCount > 10) && (pageCount % 10 != 0))
+      {
+         if (pageCount-1 != currentPage)
+         {
+            if (pageCount < 20)
+            {
+               buf.append("...&nbsp;");
+            }
+            buf.append("<a href='#' onclick=\"")
+               .append(generateEventScript(pageCount-1))
+               .append("\">")
+               .append(pageCount)
+               .append("</a>&nbsp;");
+         }
+         else
+         {
+            if (pageCount < 20)
+            {
+               buf.append("...&nbsp;");
+            }
+            buf.append("<b>")
+               .append(pageCount)
+               .append("</b>&nbsp;");
+         }
+      }
+      
+      // next page
+      if ((dataContainer.getCurrentPage() < dataContainer.getPageCount() - 1) == true)
+      {
+         buf.append("<a href='#' onclick=\"");
+         buf.append(generateEventScript(currentPage + 1));
+         buf.append("\">");
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_NEXTPAGE, 16, 16, bundle.getString(NEXT_PAGE)));
+         buf.append("</a>");
+      }
+      else
+      {
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_NEXTPAGE_NONE, 16, 16, null));
+      }
+      
+      // last page
+      if ((dataContainer.getCurrentPage() < dataContainer.getPageCount() - 1) == true)
+      {
+         buf.append("<a href='#' onclick=\"");
+         buf.append(generateEventScript(dataContainer.getPageCount() - 1));
+         buf.append("\">");
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_LASTPAGE, 16, 16, bundle.getString(LAST_PAGE)));
+         buf.append("</a>");
+      }
+      else
+      {
+         buf.append(Utils.buildImageTag(context, WebResources.IMAGE_LASTPAGE_NONE, 16, 16, null));
+      }
+      
+      buf.append("</span>");
+      
+      out.write(buf.toString());
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      if (value != null && value.length() != 0)
+      {
+         // we were clicked - queue an event to represent the click
+         // cannot handle the event here as other components etc. have not had
+         // a chance to decode() - we queue an event to be processed later
+         PageEvent actionEvent = new PageEvent(this, Integer.valueOf(value).intValue());
+         this.queueEvent(actionEvent);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof PageEvent == false)
+      {
+         // let the super class handle events which we know nothing about
+         super.broadcast(event);
+      }
+      else
+      {
+         // found a sort event for us!
+         if (s_logger.isDebugEnabled())
+            s_logger.debug("Handling paging event to index: " + ((PageEvent)event).Page);
+         getDataContainer().setCurrentPage(((PageEvent)event).Page);
+      } 
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Return the parent data container for this component
+    */
+   private IDataContainer getDataContainer()
+   {
+      return Utils.getParentDataContainer(getFacesContext(), this);
+   }
+   
+   /**
+    * Output the JavaScript event script to jump to a specified page
+    * 
+    * @param page    page index to generate script to jump too
+    */
+   private String generateEventScript(int page)
+   {
+      return Utils.generateFormSubmit(getFacesContext(), this, getHiddenFieldName(), Integer.toString(page));
+   }
+   
+   /**
+    * We use a hidden field name based on the parent data container component Id and
+    * the string "pager" to give a field name that can be shared by all pager links
+    * within a single data container component.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      UIComponent dataContainer = (UIComponent)Utils.getParentDataContainer(getFacesContext(), this);
+      return dataContainer.getClientId(getFacesContext()) + NamingContainer.SEPARATOR_CHAR + "pager";
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the clicking of a sortable column.
+    */
+   private static class PageEvent extends ActionEvent
+   {
+      public PageEvent(UIComponent component, int page)
+      {
+         super(component);
+         Page = page;
+      }
+      
+      public int Page = 0;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
new file mode 100644
index 0000000000..e6071c7cd3
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java
@@ -0,0 +1,538 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.ui.common.renderer.data.IRichListRenderer;
+import org.alfresco.web.ui.common.renderer.data.RichListRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIRichList extends UIComponentBase implements IDataContainer
+{
+   // ------------------------------------------------------------------------------
+   // Construction
+   
+   /**
+    * Default constructor
+    */
+   public UIRichList()
+   {
+      setRendererType("org.alfresco.faces.RichListRenderer");
+
+      
+      IRichListRenderer test = new RichListRenderer.IconViewRenderer();
+      
+      // get the list of views from the client configuration
+      ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+            FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE);
+      ClientConfigElement clientConfig = (ClientConfigElement)configSvc.getGlobalConfig().
+            getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID);
+      List<String> views = clientConfig.getViews();
+      
+      // instantiate each renderer and add to the list
+      for (String view : views)
+      {
+         try
+         {
+            Class clazz = Class.forName(view);
+            IRichListRenderer renderer = (IRichListRenderer)clazz.newInstance();
+            UIRichList.viewRenderers.put(renderer.getViewModeID(), renderer);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Added view '" + renderer.getViewModeID() + 
+                            "' to UIRichList");
+         }
+         catch (Exception e)
+         {
+            if (logger.isWarnEnabled())
+            {
+               logger.warn("Failed to create renderer: " + view, e);
+            }
+         }
+      }
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Data";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.currentPage = ((Integer)values[1]).intValue();
+      this.sortColumn = (String)values[2];
+      this.sortDescending = ((Boolean)values[3]).booleanValue();
+      this.value = values[4];                      // not serializable!
+      this.dataModel = (IGridDataModel)values[5];  // not serializable!
+      this.viewMode = (String)values[6];
+      this.pageSize = ((Integer)values[7]).intValue();
+      this.initialSortColumn = (String)values[8];
+      this.initialSortDescending = ((Boolean)values[9]).booleanValue();
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[10];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = Integer.valueOf(this.currentPage);
+      values[2] = this.sortColumn;
+      values[3] = (this.sortDescending ? Boolean.TRUE : Boolean.FALSE);
+      values[4] = this.value;
+      values[5] = this.dataModel;
+      values[6] = this.viewMode;
+      values[7] = Integer.valueOf(this.pageSize);
+      values[8] = this.initialSortColumn;
+      values[9] = (this.initialSortDescending ? Boolean.TRUE : Boolean.FALSE);
+      
+      return (values);
+   }
+   
+   /**
+    * Get the value (for this component the value is an object used as the DataModel)
+    *
+    * @return the value
+    */
+   public Object getValue()
+   {
+      if (this.value == null)
+      {
+         ValueBinding vb = getValueBinding("value");
+         if (vb != null)
+         {
+            this.value = vb.getValue(getFacesContext());
+         }
+      }
+      return this.value;
+   }
+
+   /**
+    * Set the value (for this component the value is an object used as the DataModel)
+    *
+    * @param value     the value
+    */
+   public void setValue(Object value)
+   {
+      this.dataModel = null;
+      this.value = value;
+   }
+   
+   /**
+    * Clear the current sorting settings back to the defaults
+    */
+   public void clearSort()
+   {
+      this.sortColumn = null;
+      this.sortDescending = true;
+      this.initialSortColumn = null;
+      this.initialSortDescending = false;
+   }
+   
+   /**
+    * Get the view mode for this Rich List
+    * 
+    * @return view mode as a String
+    */
+   public String getViewMode()
+   {
+      ValueBinding vb = getValueBinding("viewMode");
+      if (vb != null)
+      {
+         this.viewMode = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.viewMode;
+   }
+   
+   /**
+    * Set the current view mode for this Rich List
+    * 
+    * @param viewMode      the view mode as a String
+    */
+   public void setViewMode(String viewMode)
+   {
+      this.viewMode = viewMode;
+   }
+   
+   /**
+    * Return the UI Component to be used as the "no items available" message
+    * 
+    * @return UIComponent
+    */
+   public UIComponent getEmptyMessage()
+   {
+      return getFacet("empty");
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // IDataContainer implementation 
+   
+   /**
+    * Return the currently sorted column if any
+    * 
+    * @return current sorted column if any
+    */
+   public String getCurrentSortColumn()
+   {
+      return this.sortColumn;
+   }
+   
+   /**
+    * @see org.alfresco.web.data.IDataContainer#isCurrentSortDescending()
+    */
+   public boolean isCurrentSortDescending()
+   {
+      return this.sortDescending;
+   }
+   
+   /**
+    * @return Returns the initialSortColumn.
+    */
+   public String getInitialSortColumn()
+   {
+      return this.initialSortColumn;
+   }
+
+   /**
+    * @param initialSortColumn The initialSortColumn to set.
+    */
+   public void setInitialSortColumn(String initialSortColumn)
+   {
+      this.initialSortColumn = initialSortColumn;
+   }
+
+   /**
+    * @return Returns the initialSortDescending.
+    */
+   public boolean isInitialSortDescending()
+   {
+      return this.initialSortDescending;
+   }
+
+   /**
+    * @param initialSortDescending The initialSortDescending to set.
+    */
+   public void setInitialSortDescending(boolean initialSortDescending)
+   {
+      this.initialSortDescending = initialSortDescending;
+   }
+   
+   /**
+    * Returns the current page size used for this list, or -1 for no paging.
+    */
+   public int getPageSize()
+   {
+      ValueBinding vb = getValueBinding("pageSize");
+      if (vb != null)
+      {
+         int pageSize = ((Integer)vb.getValue(getFacesContext())).intValue();
+         if (pageSize != this.pageSize)
+         {
+            // force a reset of the current page - else the bind may show a page that isn't there
+            setPageSize(pageSize);
+         }
+      }
+      
+      return this.pageSize;
+   }
+   
+   /**
+    * Sets the current page size used for the list.
+    * 
+    * @param val
+    */
+   public void setPageSize(int val)
+   {
+      if (val >= -1)
+      {
+         this.pageSize = val;
+         setCurrentPage(0);
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.data.IDataContainer#getPageCount()
+    */
+   public int getPageCount()
+   {
+      return this.pageCount;
+   }
+   
+   /**
+    * Return the current page the list is displaying
+    * 
+    * @return current page zero based index
+    */
+   public int getCurrentPage()
+   {
+      return this.currentPage;
+   }
+   
+   /**
+    * @see org.alfresco.web.data.IDataContainer#setCurrentPage(int)
+    */
+   public void setCurrentPage(int index)
+   {
+      this.currentPage = index;
+   }
+
+   /**
+    * Returns true if a row of data is available
+    * 
+    * @return true if data is available, false otherwise
+    */
+   public boolean isDataAvailable()
+   {
+      return this.rowIndex < this.maxRowIndex;
+   }
+   
+   /**
+    * Returns the next row of data from the data model
+    * 
+    * @return next row of data as a Bean object
+    */
+   public Object nextRow()
+   {
+      // get next row and increment row count
+      Object rowData = getDataModel().getRow(this.rowIndex + 1);
+      
+      // Prepare the data-binding variable "var" ready for the next cycle of
+      // renderering for the child components. 
+      String var = (String)getAttributes().get("var");
+      if (var != null)
+      {
+         Map requestMap = getFacesContext().getExternalContext().getRequestMap();
+         if (isDataAvailable() == true)
+         {
+            requestMap.put(var, rowData);
+         }
+         else
+         {
+            requestMap.remove(var);
+         }
+      }
+      
+      this.rowIndex++;
+      
+      return rowData;
+   }
+   
+   /**
+    * Sort the dataset using the specified sort parameters
+    * 
+    * @param column        Column to sort
+    * @param descending    True for descending sort, false for ascending
+    * @param mode          Sort mode to use (see IDataContainer constants)
+    */
+   public void sort(String column, boolean descending, String mode)
+   {
+      this.sortColumn = column;
+      this.sortDescending = descending;
+      
+      // delegate to the data model to sort its contents
+      // place in a UserTransaction as we may need to perform a LOT of node calls to complete
+      UserTransaction tx = null;
+      try
+      {
+         if (getDataModel().size() > 64)
+         {
+            FacesContext context = FacesContext.getCurrentInstance();
+            tx = Repository.getUserTransaction(context, true);
+            tx.begin();
+         }
+         
+         getDataModel().sort(column, descending, mode);
+         
+         // commit the transaction
+         if (tx != null)
+         {
+            tx.commit();
+         }
+      }
+      catch (Exception err)
+      {
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // UIRichList implementation
+   
+   /**
+    * Method called to bind the RichList component state to the data model value
+    */
+   public void bind()
+   {
+      int rowCount = getDataModel().size();
+      // if a page size is specified, then we use that
+      int pageSize = getPageSize();
+      if (pageSize != -1)
+      {
+         // calc start row index based on current page index
+         this.rowIndex = (this.currentPage * pageSize) - 1;
+         
+         // calc total number of pages available
+         this.pageCount = (rowCount / this.pageSize) + 1;
+         if (rowCount % pageSize == 0 && this.pageCount != 1)
+         {
+            this.pageCount--;
+         }
+         
+         // calc the maximum row index that can be returned
+         this.maxRowIndex = this.rowIndex + pageSize;
+         if (this.maxRowIndex >= rowCount)
+         {
+            this.maxRowIndex = rowCount - 1;
+         }
+      }
+      // else we are not paged so show all data from start
+      else
+      {
+         this.rowIndex = -1;
+         this.pageCount = 1;
+         this.maxRowIndex = (rowCount - 1);
+      }
+      if (logger.isDebugEnabled())
+         logger.debug("Bound datasource: PageSize: " + pageSize + "; CurrentPage: " + this.currentPage + "; RowIndex: " + this.rowIndex + "; MaxRowIndex: " + this.maxRowIndex + "; RowCount: " + rowCount);
+   }
+   
+   /**
+    * @return A new IRichListRenderer implementation for the current view mode
+    */
+   public IRichListRenderer getViewRenderer()
+   {
+      // get type from current view mode, then create an instance of the renderer
+      IRichListRenderer renderer = null;
+      if (getViewMode() != null)
+      {
+         renderer = (IRichListRenderer)UIRichList.viewRenderers.get(getViewMode());
+      }
+      return renderer;
+   }
+   
+   /**
+    * Return the data model wrapper
+    * 
+    * @return IGridDataModel 
+    */
+   private IGridDataModel getDataModel()
+   {
+      if (this.dataModel == null)
+      {
+         // build the appropriate data-model wrapper object
+         Object val = getValue();
+         if (val instanceof List)
+         {
+            this.dataModel = new GridListDataModel((List)val);
+         }
+         else if ( (java.lang.Object[].class).isAssignableFrom(val.getClass()) )
+         {
+            this.dataModel = new GridArrayDataModel((Object[])val);
+         }
+         else
+         {
+            throw new IllegalStateException("UIRichList 'value' attribute binding should specify data model of a supported type!"); 
+         }
+         
+         // sort first time on initially sorted column if set
+         if (this.sortColumn == null)
+         {
+            String initialSortColumn = getInitialSortColumn();
+            if (initialSortColumn != null && initialSortColumn.length() != 0)
+            {
+               boolean descending = isInitialSortDescending();
+               
+               // TODO: add support for retrieving correct column sort mode here
+               this.sortColumn = initialSortColumn;
+               this.sortDescending = descending;
+            }
+         }
+         if (this.sortColumn != null)
+         {
+            // delegate to the data model to sort its contents
+            this.dataModel.sort(this.sortColumn, this.sortDescending, IDataContainer.SORT_CASEINSENSITIVE);
+         }
+         
+         // reset current page
+         this.currentPage = 0;
+      }
+      
+      return this.dataModel;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** map of available IRichListRenderer instances */
+   private final static Map<String, IRichListRenderer> viewRenderers = new HashMap<String, IRichListRenderer>(5);
+   
+   // component state
+   private int currentPage = 0;
+   private String sortColumn = null;
+   private boolean sortDescending = true;
+   private Object value = null;
+   private IGridDataModel dataModel = null;
+   private String viewMode = null;
+   private int pageSize = -1;
+   private String initialSortColumn = null;
+   private boolean initialSortDescending = false;
+   
+   // transient component state that exists during a single page refresh only
+   private int rowIndex = -1;
+   private int maxRowIndex = -1;
+   private int pageCount = 1;
+   
+   private static Log logger = LogFactory.getLog(IDataContainer.class);
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UISortLink.java b/source/java/org/alfresco/web/ui/common/component/data/UISortLink.java
new file mode 100644
index 0000000000..1f8777cc0c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/data/UISortLink.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.data;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.apache.log4j.Logger;
+
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UISortLink extends UICommand
+{
+   /**
+    * Default Constructor
+    */
+   public UISortLink()
+   {
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      ResponseWriter out = context.getResponseWriter();
+      
+      IDataContainer dataContainer = getDataContainer();
+      if (dataContainer == null)
+      {
+         throw new IllegalStateException("Must nest UISortLink inside component implementing IDataContainer!"); 
+      }
+      
+      // swap sort direction if we were last sorted column
+      boolean bPreviouslySorted = false;
+      boolean descending = true;
+      String lastSortedColumn = dataContainer.getCurrentSortColumn();
+      if (lastSortedColumn == (String)getValue())
+      {
+         descending = !dataContainer.isCurrentSortDescending();
+         bPreviouslySorted = true;
+      }
+      
+      // render sort link
+      StringBuilder buf = new StringBuilder(256);
+      buf.append("<nobr><a href='#' onclick=\"");
+      // generate some JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(context), getClientId(context)));
+      buf.append('"');
+      
+      if (getAttributes().get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(getAttributes().get("style"))
+            .append('"');
+      }
+      if (getAttributes().get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(getAttributes().get("styleClass"));
+      }
+      if (getAttributes().get("tooltip") != null)
+      {
+         buf.append(" title=\"")
+            .append(getAttributes().get("tooltip"))
+            .append('"');
+      }
+      buf.append('>');
+      
+      // output column label
+      buf.append((String)getAttributes().get("label"));
+      
+      if (bPreviouslySorted == true)
+      {
+         if (descending == true)
+         {
+            buf.append(" ")
+               .append(Utils.buildImageTag(context, WebResources.IMAGE_SORTUP, 10, 6, null));
+         }
+         else
+         {
+            buf.append(" ")
+               .append(Utils.buildImageTag(context, WebResources.IMAGE_SORTDOWN, 10, 6, null));
+         }
+      }
+      else
+      {
+         buf.append(" ")
+            .append(Utils.buildImageTag(context, WebResources.IMAGE_SORTNONE, 10, 7, null));
+      }
+      buf.append("</a></nobr>");
+      
+      out.write(buf.toString());
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName(context);
+      String value = (String)requestMap.get(fieldId);
+      if (value != null && value.equals(getClientId(context)))
+      {
+         // we were clicked - queue an event to represent the click
+         // cannot handle the event here as other components etc. have not had
+         // a chance to decode() - we queue an event to be processed later
+         SortEvent actionEvent = new SortEvent(this, (String)this.getValue());
+         this.queueEvent(actionEvent);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof SortEvent == false)
+      {
+         // let the super class handle events which we know nothing about
+         super.broadcast(event);
+      }
+      else if ( ((SortEvent)event).Column.equals(getColumn()) )
+      {
+         // found a sort event for us!
+         if (s_logger.isDebugEnabled())
+            s_logger.debug("Handling sort event for column: " + ((SortEvent)event).Column);
+         
+         if (getColumn().equals(getDataContainer().getCurrentSortColumn()) == true)
+         {
+            // reverse sort direction
+            this.descending = !this.descending;
+         }
+         else
+         {
+            // revert to default sort direction
+            this.descending = true;
+         }
+         getDataContainer().sort(getColumn(), this.descending, getMode());
+      }  
+   }
+   
+   /**
+    * We use a hidden field name based on the parent data container component Id and
+    * the string "sort" to give a field name that can be shared by all sort links
+    * within a single data container component.
+    * 
+    * @param context    FacesContext
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName(FacesContext context)
+   {
+      UIComponent dataContainer = (UIComponent)Utils.getParentDataContainer(context, this);
+      return dataContainer.getClientId(context) + NamingContainer.SEPARATOR_CHAR + "sort";
+   }
+   
+   /**
+    * Column name referenced by this link
+    * 
+    * @return column name
+    */
+   public String getColumn()
+   {
+      return (String)getValue();
+   }
+   
+   /**
+    * Sorting mode - see IDataContainer constants
+    * 
+    * @return sorting mode - see IDataContainer constants
+    */
+   public String getMode()
+   {
+      return this.mode;
+   }
+   
+   /**
+    * Set the sorting mode - see IDataContainer constants
+    * 
+    * @param sortMode      the sorting mode- see IDataContainer constants
+    */
+   public void setMode(String sortMode)
+   {
+      this.mode = sortMode;
+   }
+   
+   /**
+    * Returns true for descending sort, false for ascending
+    * 
+    * @return true for descending sort, false for ascending
+    */
+   public boolean isDescending()
+   {
+      return this.descending;
+   }
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the tooltip.
+    */
+   public String getTooltip()
+   {
+      ValueBinding vb = getValueBinding("tooltip");
+      if (vb != null)
+      {
+         this.tooltip = (String)vb.getValue(getFacesContext());
+      }
+      return this.tooltip;
+   }
+
+   /**
+    * @param tooltip The tooltip to set.
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.descending = ((Boolean)values[1]).booleanValue();
+      this.mode = (String)values[2];
+      this.label = (String)values[3];
+      this.tooltip = (String)values[4];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[5];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = (this.descending ? Boolean.TRUE : Boolean.FALSE);
+      values[2] = this.mode;
+      values[3] = this.label;
+      values[4] = this.tooltip;
+      return values;
+   }
+   
+   /**
+    * Return the parent data container for this component
+    */
+   private IDataContainer getDataContainer()
+   {
+      return Utils.getParentDataContainer(getFacesContext(), this);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the clicking of a sortable column.
+    */
+   private static class SortEvent extends ActionEvent
+   {
+      public SortEvent(UIComponent component, String column)
+      {
+         super(component);
+         Column = column;
+      }
+      
+      public String Column = null;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Constants
+   
+   private static Logger s_logger = Logger.getLogger(IDataContainer.class);
+   
+   /** sorting mode */
+   private String mode = IDataContainer.SORT_CASEINSENSITIVE;
+   
+   private String label;
+   
+   private String tooltip;
+   
+   /** true for descending sort, false for ascending */
+   private boolean descending = false;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java b/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
new file mode 100644
index 0000000000..b86fd5839b
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/BaseDebugComponent.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * Base class for all debug components
+ * 
+ * @author gavinc
+ */
+public abstract class BaseDebugComponent extends SelfRenderingComponent
+{
+   private String title;
+
+   /**
+    * Retrieves the debug data to show for the component as a Map
+    * 
+    * @return The Map of data
+    */
+   public abstract Map getDebugData();
+   
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      out.write("<table cellpadding='3' cellspacing='3' border='1'>");
+      
+      if (this.getTitle() != null)
+      {
+         out.write("<tr><td colspan='2'>");
+         out.write(this.getTitle());
+         out.write("</td></tr>");
+      }
+      
+      out.write("<tr><th align='left'>Property</th><th align='left'>Value</th></tr>");
+      
+      Map session = getDebugData();
+      for (Object key : session.keySet())
+      {
+         out.write("<tr><td>");
+         out.write(key.toString());
+         out.write("</td><td>");
+         String value = session.get(key).toString();
+         if (value == null || value.length() == 0)
+         {
+            out.write("&nbsp;");
+         }
+         else
+         {
+            // replace any ; characters with ;<space> as that will help break up long lines
+            value = value.replaceAll(";", "; ");
+            out.write(value);
+         }
+         out.write("</td></tr>");
+      }
+      
+      out.write("</table>");
+      
+      super.encodeBegin(context);
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return false;
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.title = (String)values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.title;
+      return (values);
+   }
+   
+   /**
+    * Returns the title
+    * 
+    * @return The title
+    */
+   public String getTitle()
+   {
+      ValueBinding vb = getValueBinding("title");
+      if (vb != null)
+      {
+         this.title = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.title;
+   }
+
+   /**
+    * Sets the title
+    * 
+    * @param title The title
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java
new file mode 100644
index 0000000000..b57278393b
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpApplicationState.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Component which displays the current state of the HTTP session
+ * 
+ * @author gavinc
+ */
+public class UIHttpApplicationState extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.HttpApplicationState";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java
new file mode 100644
index 0000000000..77b2b395a2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestHeaders.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Component which displays the headers for the current HTTP request
+ * 
+ * @author gavinc
+ */
+public class UIHttpRequestHeaders extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.HttpRequestHeaders";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getRequestHeaderMap();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java
new file mode 100644
index 0000000000..9dce57c0c8
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestParams.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Component which displays the parameters for the current HTTP request
+ * 
+ * @author gavinc
+ */
+public class UIHttpRequestParams extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.HttpRequestParams";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java
new file mode 100644
index 0000000000..19591623af
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpRequestState.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Component which displays the current state of the HTTP request
+ * 
+ * @author gavinc
+ */
+public class UIHttpRequestState extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.HttpRequestState";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java
new file mode 100644
index 0000000000..252a189b7e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UIHttpSessionState.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * Component which displays the current state of the HTTP session
+ * 
+ * @author gavinc
+ */
+public class UIHttpSessionState extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.HttpSessionState";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java b/source/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java
new file mode 100644
index 0000000000..5ec200545f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/debug/UISystemProperties.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.debug;
+
+import java.util.Map;
+
+/**
+ * Component which displays the system properties of the VM
+ * 
+ * @author gavinc
+ */
+public class UISystemProperties extends BaseDebugComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.debug.SystemProperties";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.component.debug.BaseDebugComponent#getDebugData()
+    */
+   public Map getDebugData()
+   {
+      return System.getProperties();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java b/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java
new file mode 100644
index 0000000000..3bac55508d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDescription.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.description;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * Description component that outputs a dynamic description
+ * 
+ * @author gavinc
+ */
+public class UIDescription extends SelfRenderingComponent
+{
+   private String controlValue;
+   private String text;
+
+   /**
+    * @return The control value the description is for
+    */
+   public String getControlValue()
+   {
+      if (this.controlValue == null)
+      {
+         ValueBinding vb = getValueBinding("controlValue");
+         if (vb != null)
+         {
+            this.controlValue = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.controlValue;
+   }
+
+   /**
+    * @param controlValue Sets the control value this description is for
+    */
+   public void setControlValue(String controlValue)
+   {
+      this.controlValue = controlValue;
+   }
+
+   /**
+    * @return Returns the description text
+    */
+   public String getText()
+   {
+      if (this.text == null)
+      {
+         ValueBinding vb = getValueBinding("text");
+         if (vb != null)
+         {
+            this.text = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.text;
+   }
+
+   /**
+    * @param text Sets the description text 
+    */
+   public void setText(String text)
+   {
+      this.text = text;
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Description";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.controlValue = (String)values[1];
+      this.text = (String)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.controlValue;
+      values[2] = this.text;
+      return (values);
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return false;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java b/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
new file mode 100644
index 0000000000..e2a7c00f5c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDescriptions.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.description;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * Descriptions component that outputs descriptions held in a backing object
+ * 
+ * @author gavinc
+ */
+public class UIDescriptions extends SelfRenderingComponent
+{
+   private Object value;
+   
+   /**
+    * @return Returns the object holding the decriptions
+    */
+   public Object getValue()
+   {
+      if (this.value == null)
+      {
+         ValueBinding vb = getValueBinding("value");
+         if (vb != null)
+         {
+            this.value = vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.value;
+   }
+
+   /**
+    * @param value Sets the object holding the description
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Descriptions";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      return (values);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
new file mode 100644
index 0000000000..ad5bdc2f68
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.description;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Dynamic description component that switches text based on the events
+ * of another input control
+ * 
+ * @author gavinc
+ */
+public class UIDynamicDescription extends SelfRenderingComponent
+{
+   private static Log logger = LogFactory.getLog(UIDynamicDescription.class);
+   private String selected;
+   private String functionName;
+   
+   /**
+    * @return The id of the selected description
+    */
+   public String getSelected()
+   {
+      if (this.selected == null)
+      {
+         ValueBinding vb = getValueBinding("selected");
+         if (vb != null)
+         {
+            this.selected = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.selected;
+   }
+
+   /**
+    * @param selected The id of the selected
+    */
+   public void setSelected(String selected)
+   {
+      this.selected = selected;
+   }
+   
+   /**
+    * @return Returns the JavaScript function name to use
+    */
+   public String getFunctionName()
+   {
+      if (this.functionName == null)
+      {
+         this.functionName = "itemSelected";
+      }
+      
+      return this.functionName;
+   }
+
+   /**
+    * @param functionName Sets the name of the JavaScript function to use 
+    */
+   public void setFunctionName(String functionName)
+   {
+      this.functionName = functionName;
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.DynamicDescription";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (this.isRendered() == false)
+      {
+         return;
+      }
+      
+      // output the required JavaScript
+      ResponseWriter out = context.getResponseWriter();
+      
+      out.write("<script language='JavaScript'>\n");
+      out.write("var m_");
+      out.write(getFunctionName());
+      out.write(" = '");
+      if (getSelected() != null)
+      {  
+         out.write("desc-");
+         out.write(getSelected());
+      }
+      out.write("';\n");
+      out.write("function ");
+      out.write(getFunctionName());
+      out.write("(inputControl) {\n");
+      out.write("if (m_");
+      out.write(getFunctionName());
+      out.write(" != '') {\n");
+      out.write("   document.getElementById(m_");
+      out.write(getFunctionName());
+      out.write(").style.display = 'none';\n");
+      out.write("}\nm_");
+      out.write(getFunctionName());
+      out.write(" = 'desc-' + inputControl.value;\n");
+      out.write("document.getElementById(m_");
+      out.write(getFunctionName());
+      out.write(").style.display = 'inline';\n");
+      out.write("} </script>\n");
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#encodeChildren(javax.faces.context.FacesContext)
+    */
+   public void encodeChildren(FacesContext context) throws IOException
+   {
+      if (this.isRendered() == false)
+      {
+         return;
+      }
+      
+      List<UIComponent> kids = getChildren();
+      for (UIComponent child : kids)
+      {
+         if (child instanceof UIDescription)
+         {
+            // render the single description
+            renderDescription(context, ((UIDescription)child).getControlValue(),
+                  ((UIDescription)child).getText());
+         }
+         else if (child instanceof UIDescriptions)
+         {
+            // retrieve the object being pointed to and get
+            // the descriptions from that
+            renderDescriptions(context, (UIDescriptions)child);
+         }
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#encodeEnd(javax.faces.context.FacesContext)
+    */
+   public void encodeEnd(FacesContext context) throws IOException
+   {
+      // don't need to do anything
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.selected = (String)values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.selected;
+      return (values);
+   }
+   
+   /**
+    * Renders a description item
+    * 
+    * @param context The faces context
+    * @param controlId The id of the control the description is for
+    * @param test The description text 
+    */
+   private void renderDescription(FacesContext context, String controlId, String text)
+      throws IOException
+   {
+      ResponseWriter out = context.getResponseWriter();
+      out.write("<span");
+      String spanId = "desc-" + controlId;
+      outputAttribute(out, spanId, "id");
+      
+      if (controlId.equals(this.selected))
+      {
+         outputAttribute(out, "display: inline", "style");
+      }
+      else
+      {
+         outputAttribute(out, "display: none", "style");
+      }
+      
+      out.write(">");
+      out.write(Utils.encode(text));
+      out.write("</span>\n");
+   }
+   
+   /**
+    * Renders the given descriptions component
+    * 
+    * @param context The faces context
+    * @param descriptions The descriptions to render
+    */
+   private void renderDescriptions(FacesContext context, UIDescriptions descriptions)
+      throws IOException
+   {
+      // get hold of the object holding the descriptions and make sure
+      // it is of the correct type
+      Object obj = descriptions.getValue();
+      
+      if (obj instanceof Map)
+      {
+         Map<String, String> items = (Map)obj;
+         for (String id : items.keySet())
+         {
+            renderDescription(context, id, items.get(id));
+         }
+      }
+      else if (obj instanceof List)
+      {
+         Iterator iter = ((List)obj).iterator();
+         while (iter.hasNext())
+         {
+            UIDescription desc = (UIDescription)iter.next();
+            renderDescription(context, desc.getControlValue(), desc.getText());
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java b/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
new file mode 100644
index 0000000000..58d38b667a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/evaluator/BaseEvaluator.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.evaluator;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.apache.log4j.Logger;
+
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * @author kevinr
+ */
+public abstract class BaseEvaluator extends SelfRenderingComponent
+{
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public final String getFamily()
+   {
+      return "org.alfresco.faces.evaluators";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#getRendersChildren()
+    */
+   public final boolean getRendersChildren()
+   {
+      return !evaluate();
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public final void encodeBegin(FacesContext context) throws IOException
+   {
+      // no output for this component
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeChildren(javax.faces.context.FacesContext)
+    */
+   public final void encodeChildren(FacesContext context) throws IOException
+   {
+      // if this is called, then the evaluate returned false which means
+      // the child components show not be allowed to render themselves
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeEnd(javax.faces.context.FacesContext)
+    */
+   public final void encodeEnd(FacesContext context) throws IOException
+   {
+      // no output for this component
+   }
+   
+   /**
+    * Get the value for this component to be evaluated against
+    *
+    * @return the value for this component to be evaluated against
+    */
+   public Object getValue()
+   {
+      ValueBinding vb = getValueBinding("value");
+      if (vb != null)
+      {
+         this.value = vb.getValue(getFacesContext());
+      }
+      
+      return this.value;
+   }
+
+   /**
+    * Set the value for this component to be evaluated against
+    *
+    * @param value     the value for this component to be evaluated against
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      return (values);
+   }
+   
+   /**
+    * Evaluate against the component attributes. Return true to allow the inner
+    * components to render, false to hide them during rendering.
+    * 
+    * @return true to allow rendering of child components, false otherwise
+    */
+   public abstract boolean evaluate();
+   
+   
+   protected static Logger s_logger = Logger.getLogger(BaseEvaluator.class);
+   
+   /** the value to be evaluated against */
+   private Object value;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java b/source/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java
new file mode 100644
index 0000000000..f28e8835fb
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/evaluator/BooleanEvaluator.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.evaluator;
+
+/**
+ * @author kevinr
+ * 
+ * Evaluates to true if the value suppied is a boolean string of "true".
+ */
+public class BooleanEvaluator extends BaseEvaluator
+{
+   /**
+    * Evaluate against the component attributes. Return true to allow the inner
+    * components to render, false to hide them during rendering.
+    * 
+    * @return true to allow rendering of child components, false otherwise
+    */
+   public boolean evaluate()
+   {
+      boolean result = false;
+      
+      try
+      {
+         if (getValue() instanceof Boolean)
+         {
+            result = ((Boolean)getValue()).booleanValue();
+         }
+         else
+         {
+            result = Boolean.valueOf((String)getValue()).booleanValue();
+         }
+      }
+      catch (Exception err)
+      {
+         // return default value on error
+         s_logger.debug("Unable to evaluate value to boolean: " + getValue());
+      }
+      
+      return result;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java b/source/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java
new file mode 100644
index 0000000000..207e0d1ae9
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/evaluator/StringEqualsEvaluator.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.evaluator;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author kevinr
+ * 
+ * Evaluates to true if the value exactly matches the supplied string condition.
+ */
+public class StringEqualsEvaluator extends BaseEvaluator
+{
+   /**
+    * Evaluate against the component attributes. Return true to allow the inner
+    * components to render, false to hide them during rendering.
+    * 
+    * @return true to allow rendering of child components, false otherwise
+    */
+   public boolean evaluate()
+   {
+      boolean result = false;
+      
+      try
+      {
+         result = getCondition().equals((String)getValue());
+      }
+      catch (Exception err)
+      {
+         // return default value on error
+         s_logger.debug("Expected String value for evaluation: " + getValue());
+      }
+      
+      return result;
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.condition = (String)values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.condition;
+      return (values);
+   }
+   
+   /**
+    * Get the string condition to match value against
+    * 
+    * @return the string condition to match value against
+    */
+   public String getCondition()
+   {
+      ValueBinding vb = getValueBinding("condition");
+      if (vb != null)
+      {
+         this.condition = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.condition;
+   }
+   
+   /**
+    * Set the string condition to match value against
+    * 
+    * @param condition     string condition to match value against
+    */
+   public void setCondition(String condition)
+   {
+      this.condition = condition;
+   }
+   
+   
+   /** the string condition to match value against */
+   private String condition = null;
+}
diff --git a/source/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java b/source/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java
new file mode 100644
index 0000000000..24427c0922
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/component/evaluator/ValueSetEvaluator.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.component.evaluator;
+
+/**
+ * @author kevinr
+ * 
+ * Evaluates to true if the value supplied is not null.
+ */
+public class ValueSetEvaluator extends BaseEvaluator
+{
+   /**
+    * Evaluate against the component attributes. Return true to allow the inner
+    * components to render, false to hide them during rendering.
+    * 
+    * @return true to allow rendering of child components, false otherwise
+    */
+   public boolean evaluate()
+   {
+      return getValue() != null ? true : false;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java b/source/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java
new file mode 100644
index 0000000000..99e3f72176
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/converter/BooleanLabelConverter.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.converter;
+
+import java.util.ResourceBundle;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+
+import org.alfresco.web.app.Application;
+
+/**
+ * Converter class to convert a Boolean value (including null) into a human readable form.
+ * 
+ * @author Kevin Roast
+ */
+public class BooleanLabelConverter implements Converter
+{
+   /**
+    * <p>The standard converter id for this converter.</p>
+    */
+   public static final String CONVERTER_ID = "org.alfresco.faces.BooleanLabelConverter";
+   
+   private static final String MSG_YES = "yes";
+   private static final String MSG_NO  = "no";
+   
+   /**
+    * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+    */
+   public Object getAsObject(FacesContext context, UIComponent component, String value)
+         throws ConverterException
+   {
+      return Boolean.valueOf(value);
+   }
+
+   /**
+    * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    */
+   public String getAsString(FacesContext context, UIComponent component, Object value)
+         throws ConverterException
+   {
+      ResourceBundle bundle = Application.getBundle(context);
+      
+      String result = bundle.getString(MSG_NO);
+      
+      if (value instanceof Boolean)
+      {
+         result = ((Boolean)value).booleanValue() ? bundle.getString(MSG_YES) : bundle.getString(MSG_NO);
+      }
+      
+      return result;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java b/source/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java
new file mode 100644
index 0000000000..88e127cb5e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/converter/ByteSizeConverter.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.converter;
+
+import java.text.DecimalFormat;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+
+import org.alfresco.web.app.Application;
+
+/**
+ * Converter class to convert the size of an item in bytes into a readable KB/MB form.
+ * 
+ * @author Kevin Roast
+ */
+public class ByteSizeConverter implements Converter
+{
+   /**
+    * <p>The standard converter id for this converter.</p>
+    */
+   public static final String CONVERTER_ID = "org.alfresco.faces.ByteSizeConverter";
+
+   private static final String MSG_POSTFIX_KB = "kilobyte";
+   private static final String MSG_POSTFIX_MB = "megabyte";
+   private static final String MSG_POSTFIX_GB = "gigabyte";
+   
+   private static final String NUMBER_PATTERN = "###,###.##";
+   
+   /**
+    * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+    */
+   public Object getAsObject(FacesContext context, UIComponent component, String value)
+   {
+      return Long.parseLong(value);
+   }
+
+   /**
+    * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    */
+   public String getAsString(FacesContext context, UIComponent component, Object value)
+   {
+      long size;
+      if (value instanceof Long)
+      {
+         size = (Long)value;
+      }
+      else if (value instanceof String)
+      {
+         try
+         {
+            size = Long.parseLong((String)value);
+         }
+         catch (NumberFormatException ne)
+         {
+            return (String)value;
+         }
+      }
+      else
+      {
+         return "";
+      }
+      
+      // get formatter
+      // TODO: can we cache this instance...? DecimalFormat is not threadsafe! Need threadlocal instance.
+      DecimalFormat formatter = new DecimalFormat(NUMBER_PATTERN);
+      
+      StringBuilder buf = new StringBuilder();
+      
+      if (size < 999999)
+      {
+         double val = ((double)size) / 1024.0;
+         buf.append(formatter.format(val))
+            .append(' ')
+            .append(Application.getMessage(context, MSG_POSTFIX_KB));
+      }
+      else if (size < 999999999)
+      {
+         double val = ((double)size) / 1048576.0;
+         buf.append(formatter.format(val))
+            .append(' ')
+            .append(Application.getMessage(context, MSG_POSTFIX_MB));
+      }
+      else
+      {
+         double val = ((double)size) / 1073741824.0;
+         buf.append(formatter.format(val))
+            .append(' ')
+            .append(Application.getMessage(context, MSG_POSTFIX_GB));
+      }
+      
+      return buf.toString();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java b/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
new file mode 100644
index 0000000000..55d2207418
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/converter/XMLDateConverter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.converter;
+
+import java.util.Date;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.DateTimeConverter;
+
+import org.alfresco.util.ISO8601DateFormat;
+
+/**
+ * Converter class to convert an XML date representation into a Date
+ * 
+ * @author gavinc
+ */
+public class XMLDateConverter extends DateTimeConverter
+{
+   /**
+    * <p>The standard converter id for this converter.</p>
+    */
+   public static final String CONVERTER_ID = "org.alfresco.faces.XMLDataConverter";
+
+   /**
+    * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+    */
+   public Object getAsObject(FacesContext context, UIComponent component, String value)
+   {
+      return ISO8601DateFormat.parse(value);
+   }
+
+   /**
+    * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    */
+   public String getAsString(FacesContext context, UIComponent component, Object value)
+   {
+      String str = null;
+      
+      if (value instanceof String)
+      {
+         Date date = ISO8601DateFormat.parse((String)value);
+         str = super.getAsString(context, component, date);
+      }
+      else
+      {
+         str = super.getAsString(context, component, value);
+      }
+      
+      return str;
+   }
+   
+   
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
new file mode 100644
index 0000000000..53bd5c5a24
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIActionLink;
+import org.alfresco.web.ui.common.component.UIMenu;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author kevinr
+ */
+public class ActionLinkRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(ActionLinkRenderer.class);
+   
+   // ------------------------------------------------------------------------------
+   // Renderer implementation 
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = Utils.getActionHiddenFieldName(context, component);
+      String value = (String)requestMap.get(fieldId);
+      // we are clicked if the hidden field contained our client id
+      if (value != null && value.equals(component.getClientId(context)))
+      {
+         // get all the params for this actionlink, see if any values have been set
+         // on the request which match our params and set them into the component
+         UIActionLink link = (UIActionLink)component;
+         Map<String, String> destParams = link.getParameterMap();
+         destParams.clear();
+         Map<String, String> actionParams = getParameterMap(link);
+         if (actionParams != null)
+         {
+            for (String name : actionParams.keySet())
+            {
+               String paramValue = (String)requestMap.get(name);
+               destParams.put(name, paramValue);
+            }
+         }
+         
+         ActionEvent event = new ActionEvent(component);
+         component.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         Writer out = context.getResponseWriter();
+         
+         UIActionLink link = (UIActionLink)component;
+         
+         if (isInMenu(link) == true)
+         {
+            // render as menu item
+            out.write( renderMenuAction(context, link) );
+         }
+         else
+         {
+            // render as action link
+            out.write( renderActionLink(context, link) );
+         }
+      }
+   }
+   
+   /**
+    * Render ActionLink as plain link and image
+    * 
+    * @param context
+    * @param link
+    * 
+    * @return action link HTML
+    */
+   private String renderActionLink(FacesContext context, UIActionLink link)
+   {
+      Map attrs = link.getAttributes();
+      StringBuilder linkBuf = new StringBuilder(256);
+      
+      if (link.getHref() == null)
+      {
+         linkBuf.append("<a href='#' onclick=\"");
+         
+         // if we have an overriden onclick add that
+         if (link.getOnclick() != null)
+         {
+            linkBuf.append(link.getOnclick());
+         }
+         else
+         {
+            // generate JavaScript to set a hidden form field and submit
+            // a form which request attributes that we can decode
+            linkBuf.append(Utils.generateFormSubmit(context, link, Utils.getActionHiddenFieldName(context, link), link.getClientId(context), getParameterMap(link)));
+         }
+         
+         linkBuf.append('"');
+      }
+      else
+      {
+         String href = link.getHref();
+         if (href.startsWith("http") == false && href.startsWith("file") == false)
+         {
+            href = context.getExternalContext().getRequestContextPath() + href;
+         }
+         linkBuf.append("<a href=\"")
+                .append(href)
+                .append('"');
+         
+         // output href 'target' attribute if supplied
+         if (link.getTarget() != null)
+         {
+            linkBuf.append(" target=\"")
+                   .append(link.getTarget())
+                   .append("\"");
+         }
+      }
+      
+      if (attrs.get("style") != null)
+      {
+         linkBuf.append(" style=\"")
+                .append(attrs.get("style"))
+                .append('"');
+      }
+      if (attrs.get("styleClass") != null)
+      {
+         linkBuf.append(" class=")
+                .append(attrs.get("styleClass"));
+      }
+      if (attrs.get("tooltip") != null)
+      {
+         linkBuf.append(" title=\"")
+                .append(Utils.encode((String)attrs.get("tooltip")))
+                .append('"');
+      }
+      linkBuf.append('>');
+      
+      StringBuilder buf = new StringBuilder(350);
+      if (link.getImage() != null)
+      {
+         int padding = link.getPadding();
+         if (padding != 0)
+         {
+            // TODO: make this width value a property!
+            buf.append("<table cellspacing=0 cellpadding=0><tr><td width=16>");
+         }
+         
+         if (link.getShowLink() == false)
+         {
+            buf.append(linkBuf.toString());
+         }
+         
+         // TODO: allow configuring of alignment attribute
+         buf.append(Utils.buildImageTag(context, link.getImage(), (String)link.getValue(), "absmiddle"));
+         
+         if (link.getShowLink() == false)
+         {
+            buf.append("</a>");
+         }
+         else
+         {
+            if (padding != 0)
+            {
+               buf.append("</td><td style=\"padding:")
+                  .append(padding)
+                  .append("px\">");
+            }
+            else
+            {
+               // TODO: add horizontal spacing as component property
+               buf.append("<span style='padding-left:2px");
+               
+               // text next to an image may need alignment
+               if (attrs.get("verticalAlign") != null)
+               {
+                  buf.append(";vertical-align:")
+                     .append(attrs.get("verticalAlign"));
+               }
+               
+               buf.append("'>");
+            }
+            
+            buf.append(linkBuf.toString());
+            buf.append(Utils.encode(link.getValue().toString()));
+            buf.append("</a>");
+            
+            if (padding == 0)
+            {
+               buf.append("</span>");
+            }
+         }
+         
+         if (padding != 0)
+         {
+            buf.append("</td></tr></table>");
+         }
+      }
+      else
+      {
+         buf.append(linkBuf.toString());
+         buf.append(Utils.encode(link.getValue().toString()));
+         buf.append("</a>");
+      }
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Render ActionLink as menu image and item link
+    * 
+    * @param context
+    * @param link
+    * 
+    * @return action link HTML
+    */
+   private String renderMenuAction(FacesContext context, UIActionLink link)
+   {
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<tr><td>");
+      
+      // render image cell first for a menu
+      if (link.getImage() != null)
+      {
+         buf.append(Utils.buildImageTag(context, link.getImage(), (String)link.getValue()));
+      }
+      
+      buf.append("</td><td");
+      int padding = link.getPadding();
+      if (padding != 0)
+      {
+         buf.append(" style=\"padding:")
+            .append(padding)
+            .append("px\"");
+      }
+      buf.append(">");
+      
+      Map attrs = link.getAttributes();
+      
+      // render text link cell for the menu
+      if (attrs.get("href") == null)
+      {
+         buf.append("<a href='#' onclick=\"");
+         buf.append(Utils.generateFormSubmit(context, link, Utils.getActionHiddenFieldName(context, link), link.getClientId(context), getParameterMap(link)));
+         buf.append('"');
+      }
+      else
+      {
+         String href = (String)attrs.get("href");
+         if (href.startsWith("http") == false)
+         {
+            href = context.getExternalContext().getRequestContextPath() + href;
+         }
+         buf.append("<a href=\"")
+            .append(href)
+            .append('"');
+         
+         // output href 'target' attribute if supplied
+         if (link.getTarget() != null)
+         {
+            buf.append(" target=\"")
+               .append(link.getTarget())
+               .append("\"");
+         }
+      }
+      
+      if (attrs.get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(attrs.get("style"))
+            .append('"');
+      }
+      if (attrs.get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(attrs.get("styleClass"));
+      }
+      buf.append('>');
+      buf.append(Utils.encode(link.getValue().toString()));
+      buf.append("</a>");
+      
+      buf.append("</td></tr>");
+      
+      return buf.toString();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Return true if the action link is present within a UIMenu component container
+    * 
+    * @param link    The ActionLink to test
+    * 
+    * @return true if the action link is present within a UIMenu component
+    */
+   private static boolean isInMenu(UIActionLink link)
+   {
+      UIComponent parent = link.getParent();
+      while (parent != null)
+      {
+         if (parent instanceof UIMenu)
+         {
+            break;
+         }
+         parent = parent.getParent();
+      }
+      return (parent != null);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java
new file mode 100644
index 0000000000..e009bc995c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/BaseRenderer.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIParameter;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.render.Renderer;
+
+/**
+ * Base renderer class. Contains helper methods to assist most renderers. 
+ * 
+ * @author kevinr
+ */
+public abstract class BaseRenderer extends Renderer
+{
+   /**
+    * Helper to output an attribute to the output stream
+    * 
+    * @param out        ResponseWriter
+    * @param attr       attribute value object (cannot be null)
+    * @param mapping    mapping to output as e.g. style="..."
+    * 
+    * @throws IOException
+    */
+   protected static void outputAttribute(ResponseWriter out, Object attr, String mapping)
+      throws IOException
+   {
+      if (attr != null)
+      {
+         out.write(' ');
+         out.write(mapping);
+         out.write("=\"");
+         out.write(attr.toString());
+         out.write('"');
+      }
+   }
+   
+   /**
+    * Ensures that the given context and component are not null. This method
+    * should be called by all renderer methods that are given these parameters.
+    * 
+    * @param ctx Faces context
+    * @param component The component
+    */
+   protected static void assertParmeters(FacesContext ctx, UIComponent component)
+   {
+      if (ctx == null)
+      {
+         throw new IllegalStateException("context can not be null");
+      }
+      
+      if (component == null)
+      {
+         throw new IllegalStateException("component can not be null");
+      }
+   }
+   
+   /**
+    * Return the map of name/value pairs for any child UIParameter components.
+    * 
+    * @param component to find UIParameter child values for
+    * 
+    * @return a Map of name/value pairs or null if none found
+    */
+   protected static Map<String, String> getParameterMap(UIComponent component)
+   {
+      Map<String, String> params = null;
+      
+      if (component.getChildCount() != 0)
+      {
+         params = new HashMap<String, String>(3, 1.0f);
+         for (Iterator i=component.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIParameter)
+            {
+               UIParameter param = (UIParameter)child;
+               params.put(param.getName(), (String)param.getValue());
+            }
+         }
+      }
+      
+      return params;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java
new file mode 100644
index 0000000000..e43033232a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/BreadcrumbRenderer.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
+import org.alfresco.web.ui.common.component.UIBreadcrumb;
+
+/**
+ * Renderer class for the UIBreadcrumb component
+ * 
+ * @author Kevin Roast
+ */
+public class BreadcrumbRenderer extends BaseRenderer
+{
+   // ------------------------------------------------------------------------------
+   // Renderer implementation 
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName(context, component);
+      String value = (String)requestMap.get(fieldId);
+      if (value != null && value.length() != 0)
+      {
+         // create a breadcrumb specific action event if we were clicked
+         int selectedIndex = Integer.parseInt(value);
+         UIBreadcrumb.BreadcrumbEvent event = new UIBreadcrumb.BreadcrumbEvent(component, selectedIndex);
+         component.queueEvent(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         Writer out = context.getResponseWriter();
+         
+         UIBreadcrumb breadcrumb = (UIBreadcrumb)component;
+         // get the List of IBreadcrumbHandler elements from the component
+         List<IBreadcrumbHandler> elements = (List)breadcrumb.getValue();
+         
+         boolean first = true;
+         for (int index=0; index<elements.size(); index++)
+         {
+            IBreadcrumbHandler element = elements.get(index);
+            
+            // handle not optionally hiding the root part
+            if (index != 0 || breadcrumb.getShowRoot() == true)
+            {
+               out.write( renderBreadcrumb(context, breadcrumb, element.toString(), index, first) );
+               first = false;
+            }
+         }
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * Render a single breadcrumb element as a link on the page
+    * 
+    * @param context    FacesContext
+    * @param bc         The current UIBreadcrumb component
+    * @param element    Text for the breadcrumb element
+    * @param index      The index of the element into the original breadcrumb path
+    * @param first      True is this is the root element
+    * 
+    * @return HTML for this breadcrumb element
+    */
+   private String renderBreadcrumb(FacesContext context, UIBreadcrumb bc, String element, int index, boolean first)
+   {
+      // render breadcrumb link element
+      StringBuilder buf = new StringBuilder(200);
+      
+      // output separator
+      if (first == false)
+      {
+         buf.append(' ')
+            .append(bc.getSeparator())
+            .append(' ');
+      }
+      
+      // generate JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append("<a href='#' onclick=\"");
+      buf.append(Utils.generateFormSubmit(context, bc, getHiddenFieldName(context, bc), Integer.toString(index)));
+      buf.append('"');
+      
+      if (bc.getAttributes().get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(bc.getAttributes().get("style"))
+            .append('"');
+      }
+      if (bc.getAttributes().get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(bc.getAttributes().get("styleClass"));
+      }
+      if (bc.getAttributes().get("tooltip") != null)
+      {
+         buf.append(" title=\"")
+         .append(bc.getAttributes().get("tooltip"))
+         .append('"');
+      }
+      buf.append('>');
+      
+      // output path element text
+      // TODO: optionally crop text length with ellipses - use title attribute for all
+      buf.append(Utils.encode(element));
+      
+      // close tag
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Get the hidden field name for this breadcrumb.
+    * Assume there will not be many breadcrumbs on a page - therefore a hidden field
+    * for each is not a significant issue.
+    * 
+    * @return hidden field name
+    */
+   private static String getHiddenFieldName(FacesContext context, UIComponent component)
+   {
+      return component.getClientId(context);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
new file mode 100644
index 0000000000..aea459e060
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/DatePickerRenderer.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.text.DateFormatSymbols;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.component.ValueHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.convert.ConverterException;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.web.app.Application;
+
+/**
+ * @author kevinr
+ * 
+ * Example of a custom JSF renderer. This demonstrates how to encode/decode a set
+ * of input field params that we use to generate a Date object. This object is held
+ * in our component and the renderer will output it to the page.
+ */
+public class DatePickerRenderer extends BaseRenderer
+{
+   private static final String FIELD_YEAR = "_year";
+   private static final String FIELD_MONTH = "_month";
+   private static final String FIELD_DAY = "_day";
+   private static final String FIELD_HOUR = "_hour";
+   private static final String FIELD_MINUTE = "_minute";
+
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    * 
+    * The decode method takes the parameters from the external requests, finds the
+    * ones revelant to this component and decodes the results into an object known
+    * as the "submitted value".
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      try
+      {
+         // TODO: should check for disabled/readonly here - no need to decode
+         String clientId = component.getClientId(context);
+         Map params = context.getExternalContext().getRequestParameterMap();
+         String year = (String)params.get(clientId + FIELD_YEAR);
+         if (year != null)
+         {
+            // found data for our component
+            String month = (String)params.get(clientId + FIELD_MONTH);
+            String day = (String)params.get(clientId + FIELD_DAY);
+            String hour = (String)params.get(clientId + FIELD_HOUR);
+            String minute = (String)params.get(clientId + FIELD_MINUTE);
+            
+            // we encode the values needed for the component as we see fit
+            int[] parts = new int[5];
+            parts[0] = Integer.parseInt(year);
+            parts[1] = Integer.parseInt(month);
+            parts[2] = Integer.parseInt(day);
+            parts[3] = Integer.parseInt(hour);
+            parts[4] = Integer.parseInt(minute);
+            
+            // save the data in an object for our component as the "EditableValueHolder"
+            // all UI Input Components support this interface for the submitted value
+            ((EditableValueHolder)component).setSubmittedValue(parts);
+         }
+      }
+      catch (NumberFormatException nfe)
+      {
+         // just ignore the error and skip the update of the property
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#getConvertedValue(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    * 
+    * In the Process Validations phase, this method is called to convert the values
+    * to the datatype as required by the component.
+    * 
+    * It is possible at this point that a custom Converter instance will be used - this
+    * is why we have not yet converted the values to a data type.
+    */
+   public Object getConvertedValue(FacesContext context, UIComponent component, Object val) throws ConverterException
+   {
+      int[] parts = (int[])val;
+      Calendar date = new GregorianCalendar(parts[0], parts[1], parts[2], parts[3], parts[4]);
+      return date.getTime();
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    * 
+    * All rendering logic for this component is implemented here. A renderer for an
+    * input component must render the submitted value if it's set, and use the local
+    * value only if there is no submitted value.
+    */
+   public void encodeBegin(FacesContext context, UIComponent component)
+         throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         Date date = null;
+         
+         // this is part of the spec:
+         // first you attempt to build the date from the submitted value
+         int[] submittedValue = (int[])((EditableValueHolder)component).getSubmittedValue();
+         if (submittedValue != null)
+         {
+            date = (Date)getConvertedValue(context, component, submittedValue);
+         }
+         else
+         {
+            // second if no submitted value is found, default to the current value
+            Object value = ((ValueHolder)component).getValue();
+            // finally check for null value and create default if needed
+            date = value instanceof Date ? (Date)value : new Date();
+         }
+         
+         // get the attributes from the component we need for rendering
+         int nStartYear = 1990;
+         Integer startYear = (Integer)component.getAttributes().get("startYear");
+         if (startYear != null)
+         {
+            nStartYear = startYear.intValue();
+         }
+         
+         int nYearCount = 10;
+         Integer yearCount = (Integer)component.getAttributes().get("yearCount");
+         if (yearCount != null)
+         {
+            nYearCount = yearCount.intValue();
+         }
+         
+         // now we render the output for our component
+         // we create 3 drop-down menus for day, month and year and 
+         // two text fields for the hour and minute 
+         String clientId = component.getClientId(context);
+         ResponseWriter out = context.getResponseWriter();
+         
+         // note that we build a client id for our form elements that we are then
+         // able to decode() as above.
+         Calendar calendar = new GregorianCalendar();
+         calendar.setTime(date);
+         renderMenu(out, component, getDays(), calendar.get(Calendar.DAY_OF_MONTH), clientId + FIELD_DAY);
+         renderMenu(out, component, getMonths(), calendar.get(Calendar.MONTH), clientId + FIELD_MONTH);
+         renderMenu(out, component, getYears(nStartYear, nYearCount), calendar.get(Calendar.YEAR), clientId + FIELD_YEAR);
+         
+         // make sure we have a flag to determine whether to show the time
+         Boolean showTime = (Boolean)component.getAttributes().get("showTime");
+         if (showTime == null)
+         {
+            showTime = Boolean.FALSE;
+         }
+         
+         out.write("&nbsp;");
+         renderTimeElement(out, component, calendar.get(Calendar.HOUR_OF_DAY), clientId + FIELD_HOUR, showTime.booleanValue());
+         if (showTime.booleanValue())
+         {
+            out.write("&nbsp;:&nbsp;");
+         }
+         renderTimeElement(out, component, calendar.get(Calendar.MINUTE), clientId + FIELD_MINUTE, showTime.booleanValue());
+      }
+   }
+   
+   /**
+    * Render a drop-down menu to represent an element for the date picker.
+    * 
+    * @param out              Response Writer to output too
+    * @param component        The compatible component
+    * @param items            To display in the drop-down list
+    * @param selected         Which item index is selected
+    * @param clientId         Client Id to use
+    * 
+    * @throws IOException
+    */
+   private void renderMenu(ResponseWriter out, UIComponent component, List items,
+         int selected, String clientId)
+      throws IOException
+   {
+      out.write("<select");
+      outputAttribute(out, clientId, "name");
+      
+      if (component.getAttributes().get("styleClass") != null)
+      {
+         outputAttribute(out, component.getAttributes().get("styleClass"), "class");
+      }
+      if (component.getAttributes().get("style") != null)
+      {
+         outputAttribute(out, component.getAttributes().get("style"), "style");
+      }
+      if (component.getAttributes().get("disabled") != null)
+      {
+         outputAttribute(out, component.getAttributes().get("disabled"), "disabled");
+      }
+      out.write(">");
+      
+      for (Iterator i=items.iterator(); i.hasNext(); /**/)
+      {
+         SelectItem item = (SelectItem)i.next();
+         Integer value = (Integer)item.getValue();
+         out.write("<option");
+         outputAttribute(out, value, "value");
+         
+         // show selected value
+         if (value.intValue() == selected)
+         {
+            outputAttribute(out, "selected", "selected");
+         }
+         out.write(">");
+         out.write(item.getLabel());
+         out.write("</option>");
+      }
+      out.write("</select>");
+   }
+   
+   /**
+    * Renders either the hour or minute field
+    * 
+    * @param out The ResponseWriter
+    * @param currentValue The value of the hour or minute
+    * @param clientId The id to use for the field
+    */
+   private void renderTimeElement(ResponseWriter out, UIComponent component, 
+         int currentValue, String clientId, boolean showTime) throws IOException
+   {
+      out.write("<input");
+      outputAttribute(out, clientId, "name");
+      
+      if (showTime)
+      {
+         out.write(" type='text' size='1' maxlength='2'");
+         
+         if (component.getAttributes().get("disabled") != null)
+         {
+            outputAttribute(out, component.getAttributes().get("disabled"), "disabled");
+         }
+      }
+      else
+      {
+         out.write(" type='hidden'");
+      }
+      
+      // make sure there are always 2 digits
+      String strValue = Integer.toString(currentValue);
+      if (strValue.length() == 1)
+      {
+         strValue = "0" + strValue;
+      }
+      
+      outputAttribute(out, strValue, "value");
+      out.write("/>");
+   }
+   
+   private List getYears(int startYear, int yearCount)
+   {
+      List<SelectItem> years = new ArrayList<SelectItem>();
+      for (int i=startYear; i<startYear + yearCount; i++)
+      {
+         Integer year = Integer.valueOf(i);
+         years.add(new SelectItem(year, year.toString()));
+      }
+      return years;
+   }
+   
+   private List getMonths()
+   {
+      // get names of the months for default locale
+      Locale locale = Application.getLanguage(FacesContext.getCurrentInstance());
+      if (locale == null)
+      {
+         locale = locale.getDefault();
+      }
+      DateFormatSymbols dfs = new DateFormatSymbols(locale);
+      String[] names = dfs.getMonths();
+      List<SelectItem> months = new ArrayList<SelectItem>(12);
+      for (int i=0; i<12; i++)
+      {
+         Integer key = Integer.valueOf(i);
+         months.add(new SelectItem(key, names[i]));
+      }
+      return months;
+   }
+   
+   private List getDays()
+   {
+      List<SelectItem> days = new ArrayList<SelectItem>(31);
+      for (int i=1; i<32; i++)
+      {
+         Integer day = Integer.valueOf(i);
+         days.add(new SelectItem(day, day.toString()));
+      }
+      return days;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
new file mode 100644
index 0000000000..ee31e3e172
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.common.PanelGenerator;
+import org.alfresco.web.ui.common.Utils;
+
+/**
+ * Renderer that displays any errors that occurred in the previous lifecylce 
+ * processing within a gradient panel
+ * 
+ * @author gavinc
+ */
+public class ErrorsRenderer extends BaseRenderer
+{
+   private static final String DEFAULT_MESSAGE = "wizard_errors";
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      Iterator messages = context.getMessages();
+      if (messages.hasNext())
+      {
+         ResponseWriter out = context.getResponseWriter();
+         String contextPath = context.getExternalContext().getRequestContextPath();
+         String styleClass = (String)component.getAttributes().get("styleClass");
+         String message = (String)component.getAttributes().get("message");
+         
+         if (message == null)
+         {
+            // because we are using the standard messages component value binding
+            // would not be handled for the message attribute so do it here
+            ValueBinding vb = component.getValueBinding("message");
+            if (vb != null)
+            {
+               message = (String)vb.getValue(context);
+            }
+            
+            if (message == null)
+            {
+               message = Application.getMessage(context, DEFAULT_MESSAGE);
+            }
+         }
+         
+         PanelGenerator.generatePanelStart(out, contextPath, "yellowInner", "#ffffcc");
+         
+         out.write("\n<div");
+         if (styleClass != null)
+         {
+            outputAttribute(out, styleClass, "class");
+         }
+         out.write(">");
+         out.write("<img src='");
+         out.write(contextPath);
+         out.write("/images/icons/info_icon.gif' alt='Error' align='absmiddle'/>&nbsp;&nbsp;");
+         out.write(Utils.encode(message));
+         out.write("\n<ul style='margin:2px;'>");
+         
+         while (messages.hasNext())
+         {
+            FacesMessage fm = (FacesMessage)messages.next();
+            out.write("<li>");
+            out.write(Utils.encode(fm.getSummary()));
+            out.write("</li>\n");
+         }
+         
+         out.write("</ul></div>\n");
+         
+         PanelGenerator.generatePanelEnd(out, contextPath, "yellowInner");
+         
+         // TODO: Expose this as a configurable attribute i.e. padding at bottom
+         out.write("<div style='padding:2px;'></div>");
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return false;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
new file mode 100644
index 0000000000..1dabf51ed6
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIImagePicker;
+import org.alfresco.web.ui.common.component.UIListItem;
+import org.alfresco.web.ui.common.component.UIListItems;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Renderer for the image picker component that outputs the list of images
+ * as radio buttons
+ * 
+ * @author gavinc
+ */
+public class ImagePickerRadioRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(ImagePickerRadioRenderer.class);
+   
+   private int columns;
+   private int position;
+   private boolean open;
+   
+   // ------------------------------------------------------------------------------
+   // Renderer implemenation
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      if (Utils.isComponentDisabledOrReadOnly(component))
+      {
+         return;
+      }
+      
+      String clientId = component.getClientId(context);
+      Map paramsMap = context.getExternalContext().getRequestParameterMap();
+      
+      String submittedValue = (String)paramsMap.get(clientId);
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Submitted value = " + submittedValue);
+      
+      ((UIInput)component).setSubmittedValue(submittedValue);
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+
+      // setup counters
+      this.columns = 1;
+      this.position = 0;
+      this.open = false;
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      UIImagePicker imagePicker = (UIImagePicker)component;
+
+      Map attrs = imagePicker.getAttributes();
+      out.write("<table cellpadding='0'");
+      outputAttribute(out, attrs.get("spacing"), "cellspacing");
+      outputAttribute(out, attrs.get("styleClass"), "class");
+      outputAttribute(out, attrs.get("style"), "style");
+      out.write(">\n");
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIImagePicker imagePicker = (UIImagePicker)component;
+      Map attrs = imagePicker.getAttributes();
+      
+      Integer cols = (Integer)attrs.get("columns");
+      if (cols != null && cols instanceof Integer)
+      {
+         this.columns = cols.intValue();
+      }
+      
+      // retrieve the onclick handler, if there is one
+      String onclick = (String)attrs.get("onclick");
+         
+      ResponseWriter out = context.getResponseWriter();
+      
+      // get the child components
+      for (Iterator i = imagePicker.getChildren().iterator(); i.hasNext(); /**/)
+      {
+         UIComponent child = (UIComponent)i.next();
+         if (child instanceof UIListItems)
+         {
+            // get the value of the list items component and iterate
+            // through it's collection
+            Object listItems = ((UIListItems)child).getValue();
+            if (listItems instanceof Collection)
+            {
+               Iterator iter = ((Collection)listItems).iterator();
+               while (iter.hasNext())
+               {
+                  UIListItem item = (UIListItem)iter.next();
+                  renderItem(context, out, imagePicker, item, onclick);
+               }
+            }
+         }
+         else if (child instanceof UIListItem && child.isRendered() == true)
+         {
+            // found a valid UIListItem child to render
+            UIListItem item = (UIListItem)child;
+            renderItem(context, out, imagePicker, item, onclick);
+         }
+      }
+      
+      // if we are in the middle of a row, close it
+      if (open)
+      {
+         out.write("</tr>\n");
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      out.write("</table>");
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+   
+   /**
+    * Renders the given item as a radio button selection choice
+    * 
+    * @param context Faces context
+    * @param out ReponseWriter to write output to
+    * @param imagePicker The parent component
+    * @param item The item to render
+    * @param onclick The onClick JavaScript handler (may be null)
+    */
+   private void renderItem(FacesContext context, ResponseWriter out, 
+         UIImagePicker imagePicker, UIListItem item, String onclick)
+         throws IOException 
+   {
+      String tooltip = (String)item.getAttributes().get("tooltip");
+            
+      // if we are at the start of another row output "tr"
+      if ((this.position % this.columns) == 0)
+      {
+         // if we are at the end of a row, close it
+         if (this.open)
+         {
+            out.write("</tr>\n");
+            this.open = false;
+         }
+         
+         out.write("<tr>");
+         
+         // we have started the row
+         this.open = true;
+      }
+      
+      // output the next "cell" i.e. a radio button, the image and optional label 
+      out.write("<td>");
+     
+      out.write("<input type='radio' name='");
+      out.write(imagePicker.getClientId(context));
+      out.write("' id='");
+      out.write(imagePicker.getClientId(context));
+      out.write("' value='");
+      // TODO: need to take into account values that may need to be converted,
+      //       for now presume a string is OK
+      out.write(item.getValue().toString());
+      out.write("'");
+      
+      // determine whether this item should be selected
+      Object currentValue = imagePicker.getSubmittedValue();
+      if (currentValue == null)
+      {
+         currentValue = imagePicker.getValue();
+      }
+      
+      Object itemValue = item.getValue();
+      if (itemValue != null && itemValue.equals(currentValue))
+      {
+         out.write(" checked='true'");
+      }
+      
+      if (tooltip != null)
+      {
+         out.write(" title='");
+         out.write(Utils.encode(tooltip));
+         out.write("'");
+      }
+      
+      if (onclick != null)
+      {
+         out.write(" onclick='");
+         out.write(onclick);
+         out.write("'");
+      }
+      
+//            if (item.isDisabled())
+//            {
+//               out.write(" disabled='true'");
+//            }
+      
+      out.write(">");
+      out.write("</td><td align='center'>");
+  
+      // get the image and make sure there is one!
+      String image = (String)item.getAttributes().get("image");
+      if (image == null)
+      {
+         throw new IllegalStateException("All child items must specify an image");
+      }
+      
+      out.write(Utils.buildImageTag(context, image, tooltip));
+      
+      String label = (String)item.getAttributes().get("label");
+      if (label != null && label.length() > 0)
+      {
+         out.write("<br/>");
+         out.write(Utils.encode(label));
+      }
+      
+      out.write("</td>");
+      
+      // we've finished the item so move the position on
+      this.position++;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
new file mode 100644
index 0000000000..2a4e37ed43
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.UIListItem;
+import org.alfresco.web.ui.common.component.UIModeList;
+
+/**
+ * @author kevinr
+ */
+public class ModeListRenderer extends BaseRenderer
+{
+   // ------------------------------------------------------------------------------
+   // Renderer implemenation
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName(context, component);
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.startsWith(component.getClientId(context) + NamingContainer.SEPARATOR_CHAR))
+      {
+         // found a new selected value for this ModeList
+         // queue an event to represent the change
+         // TODO: NOTE: The value object is passed in as a String here - is this a problem?
+         //             As the 'value' field for a ModeListItem can contain Object...  
+         Object selectedValue = value.substring(component.getClientId(context).length() + 1);
+         UIModeList.ModeListItemSelectedEvent event = new UIModeList.ModeListItemSelectedEvent(component, selectedValue);
+         component.queueEvent(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIModeList list = (UIModeList)component;
+      
+      ResponseWriter out = context.getResponseWriter();
+
+      // start outer table container the list items
+      Map attrs = list.getAttributes();
+      out.write("<table cellspacing=1 cellpadding=0");
+      outputAttribute(out, attrs.get("styleClass"), "class");
+      outputAttribute(out, attrs.get("style"), "style");
+      outputAttribute(out, attrs.get("width"), "width");
+      out.write('>');
+      
+      // horizontal rendering outputs a single row with each item as a column cell
+      if (list.isHorizontal() == true)
+      {
+         out.write("<tr>");
+      }
+      
+      // output title row if present
+      if (list.getLabel() != null)
+      {
+         // each row is an inner table with a single row and 2 columns
+         // first column contains an icon if present, second column contains text
+         if (list.isHorizontal() == false)
+         {
+            out.write("<tr>");
+         }
+         
+         out.write("<td><table cellpadding=0 width=100%");
+         outputAttribute(out, attrs.get("itemSpacing"), "cellspacing");
+         out.write("><tr>");
+         
+         // output icon column
+         if (list.getIconColumnWidth() != 0)
+         {
+            out.write("<td");
+            outputAttribute(out, list.getIconColumnWidth(), "width");
+            out.write("></td>");
+         }
+         
+         // output title label
+         out.write("<td><span");
+         outputAttribute(out, attrs.get("labelStyle"), "style");
+         outputAttribute(out, attrs.get("labelStyleClass"), "class");
+         out.write('>');
+         out.write(Utils.encode(list.getLabel()));
+         out.write("</span></td></tr></table></td>");
+         
+         if (list.isHorizontal() == false)
+         {
+            out.write("</tr>");
+         }
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIModeList list = (UIModeList)component;
+      Map attrs = list.getAttributes();
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      String selectedImage = (String)attrs.get("selectedImage");
+      
+      // get the child components
+      for (Iterator i=list.getChildren().iterator(); i.hasNext(); /**/)
+      {
+         UIComponent child = (UIComponent)i.next();
+         if (child instanceof UIListItem && child.isRendered() == true)
+         {
+            // found a valid UIListItem child to render
+            UIListItem item = (UIListItem)child;
+            
+            // each row is an inner table with a single row and 2 columns
+            // first column contains an icon if present, second column contains text
+            if (list.isHorizontal() == false)
+            {
+               out.write("<tr>");
+            }
+            
+            out.write("<td><table cellpadding=0 width=100%");
+            outputAttribute(out, attrs.get("itemSpacing"), "cellspacing");
+            
+            // if selected value render different style for the item
+            boolean selected = item.getValue().equals(list.getValue());
+            if (selected == true)
+            {
+               outputAttribute(out, attrs.get("selectedStyleClass"), "class");
+               outputAttribute(out, attrs.get("selectedStyle"), "style");
+            }
+            else
+            {
+               outputAttribute(out, attrs.get("itemStyleClass"), "class");
+               outputAttribute(out, attrs.get("itemStyle"), "style");
+            }
+            out.write("><tr>");
+            
+            // output icon column
+            if (list.getIconColumnWidth() != 0)
+            {
+               out.write("<td");
+               outputAttribute(out, list.getIconColumnWidth(), "width");
+               out.write(">");
+               
+               // if the "selectedImage" property is set and this item is selected then show it
+               if (selected == true && selectedImage != null)
+               {
+                  out.write( Utils.buildImageTag(context, selectedImage, item.getTooltip()) );
+               }
+               else
+               {
+                  // else show the image set for the individual item 
+                  String image = (String)child.getAttributes().get("image"); 
+                  if (image != null)
+                  {
+                     out.write( Utils.buildImageTag(context, image, item.getTooltip()) );
+                  }
+               }
+               
+               out.write("</td>");
+            }
+            
+            // output item link
+            out.write("<td>");
+            if (!list.isDisabled() && !item.isDisabled())
+            {
+               out.write("<a href='#' onclick=\"");
+               // generate javascript to submit the value of the child component
+               String value = list.getClientId(context) + NamingContainer.SEPARATOR_CHAR + (String)child.getAttributes().get("value");
+               out.write(Utils.generateFormSubmit(context, list, getHiddenFieldName(context, list), value));
+               out.write('"');
+            }
+            else
+            {
+               out.write("<span");
+               outputAttribute(out, attrs.get("disabledStyleClass"), "class");
+               outputAttribute(out, attrs.get("disabledStyle"), "style");
+            }
+            
+            // render style for the item link
+            if (item.getValue().equals(list.getValue()))
+            {
+               outputAttribute(out, attrs.get("selectedLinkStyleClass"), "class");
+               outputAttribute(out, attrs.get("selectedLinkStyle"), "style");
+            }
+            else
+            {
+               outputAttribute(out, attrs.get("itemLinkStyleClass"), "class");
+               outputAttribute(out, attrs.get("itemLinkStyle"), "style");
+            }
+            
+            outputAttribute(out, child.getAttributes().get("tooltip"), "title");
+            out.write('>');
+            out.write(Utils.encode(item.getLabel()));
+            if (!list.isDisabled() && !item.isDisabled())
+            {
+               out.write("</a>");
+            }
+            else
+            {
+               out.write("</span>");
+            }
+            out.write("</td></tr></table></td>");
+            
+            if (list.isHorizontal() == false)
+            {
+               out.write("</tr>");
+            }
+         }
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // end outer table
+      if (((UIModeList)component).isHorizontal() == true)
+      {
+         out.write("</tr>");
+      }
+      out.write("</table>");
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+   
+   /**
+    * We use a hidden field name based on the parent form component Id and
+    * the string "modelist" to give a hidden field name that can be shared by all
+    * ModeList components within a single UIForm component.
+    * 
+    * @return hidden field name
+    */
+   private static String getHiddenFieldName(FacesContext context, UIComponent component)
+   {
+      UIForm form = Utils.getParentForm(context, component);
+      return form.getClientId(context) + NamingContainer.SEPARATOR_CHAR + "modelist";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java
new file mode 100644
index 0000000000..0fe0f787f3
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/data/IRichListRenderer.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer.data;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.web.ui.common.component.data.UIColumn;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+
+/**
+ * Contract for implementations capable of rendering the columns for a Rich List
+ * component.
+ * 
+ * @author kevinr
+ */
+public interface IRichListRenderer
+{
+   /**
+    * Callback executed by the RichList component to render any adornments before
+    * the main list rows are rendered. This is generally used to output header items.
+    * 
+    * @param context       FacesContext
+    * @param richList      The parent RichList component
+    * @param columns       Array of columns to be shown
+    * 
+    * @throws IOException
+    */
+   public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
+      throws IOException;
+   
+   /**
+    * Callback executed by the RichList component once per row of data to be rendered.
+    * The bean used as the current row data is provided, but generally rendering of the
+    * column data will be performed by recursively encoding Column child components. 
+    * 
+    * @param context       FacesContext
+    * @param richList      The parent RichList component
+    * @param columns       Array of columns to be shown
+    * @param row           The data bean for the current row
+    * 
+    * @throws IOException
+    */
+   public void renderListRow(FacesContext context, UIRichList richList, UIColumn[] columns, Object row)
+      throws IOException;
+   
+   /**
+    * Callback executed by the RichList component to render any adornments after
+    * the main list rows are rendered. This is generally used to output footer items.
+    * 
+    * @param context       FacesContext
+    * @param richList      The parent RichList component
+    * @param columns       Array of columns to be shown
+    * 
+    * @throws IOException
+    */
+   public void renderListAfter(FacesContext context, UIRichList richList, UIColumn[] columns)
+      throws IOException;
+   
+   /**
+    * Return the unique view mode identifier that this renderer is responsible for. 
+    * 
+    * @return Unique view mode identifier for this renderer e.g. "icons" or "details"
+    */
+   public String getViewModeID();
+}
diff --git a/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
new file mode 100644
index 0000000000..e60fc2ce94
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/renderer/data/RichListRenderer.java
@@ -0,0 +1,735 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.renderer.data;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.data.UIColumn;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author kevinr
+ */
+public class RichListRenderer extends BaseRenderer
+{
+   // ------------------------------------------------------------------------------
+   // Renderer implemenation 
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component)
+         throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         ResponseWriter out = context.getResponseWriter();
+         Map attrs = component.getAttributes();
+         out.write("<table cellspacing=0 cellpadding=0");
+         outputAttribute(out, attrs.get("styleClass"), "class");
+         outputAttribute(out, attrs.get("style"), "style");
+         outputAttribute(out, attrs.get("width"), "width");
+         out.write(">");
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component)
+         throws IOException
+   {
+      if (component.isRendered() == true)
+      {
+         // the RichList component we are working with
+         UIRichList richList = (UIRichList)component;
+         
+         // prepare the component current row against the current page settings
+         richList.bind();
+         
+         // collect child column components so they can be passed to the renderer
+         List<UIColumn> columnList = new ArrayList<UIColumn>(8);
+         for (Iterator i=richList.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIColumn)
+            {
+               columnList.add((UIColumn)child);
+            }
+         }
+         
+         UIColumn[] columns = new UIColumn[columnList.size()];
+         columnList.toArray(columns);
+         
+         // get the renderer instance
+         IRichListRenderer renderer = (IRichListRenderer)richList.getViewRenderer();
+         if (renderer == null)
+         {
+            throw new IllegalStateException("IRichListRenderer must be available in UIRichList!");
+         }
+         
+         // call render-before to output headers if required
+         ResponseWriter out = context.getResponseWriter();
+         out.write("<thead>");
+         renderer.renderListBefore(context, richList, columns);
+         out.write("</thead>");
+         out.write("<tbody>");
+         if (richList.isDataAvailable() == true)
+         {
+            while (richList.isDataAvailable() == true)
+            {
+               // render each row in turn
+               renderer.renderListRow(context, richList, columns, richList.nextRow());
+            }
+         }
+         else
+         {
+            // if no items present, render the facet with the "no items found" message
+            UIComponent emptyComponent = richList.getEmptyMessage();
+            if (emptyComponent != null)
+            {
+               emptyComponent.encodeBegin(context);
+               emptyComponent.encodeChildren(context);
+               emptyComponent.encodeEnd(context);
+            }
+         }
+         // call render-after to output footers if required
+         renderer.renderListAfter(context, richList, columns);
+         out.write("</tbody>");
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component)
+         throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         ResponseWriter out = context.getResponseWriter();
+         out.write("</table>");
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      // we are responsible for rendering our child components
+      // this renderer is a valid use of this mode - it can render the various
+      // column descriptors as a number of different list view types e.g.
+      // details, icons, list etc.
+      return true;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class to implement a Details view for the RichList component
+    * 
+    * @author kevinr
+    */
+   public static class DetailsViewRenderer implements IRichListRenderer
+   {
+      public static final String VIEWMODEID = "details";
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#getViewModeID()
+       */
+      public String getViewModeID()
+      {
+         return VIEWMODEID;
+      }
+
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListBefore(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // render column headers as labels
+         out.write("<tr");
+         outputAttribute(out, richList.getAttributes().get("headerStyleClass"), "class");
+         out.write('>');
+         for (int i=0; i<columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            if (column.isRendered() == true)
+            {
+               // render column header tag
+               out.write("<th");
+               outputAttribute(out, column.getAttributes().get("width"), "width");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               
+               // output the header facet if any
+               UIComponent header = column.getHeader();
+               if (header != null)
+               {
+                  header.encodeBegin(context);
+                  header.encodeChildren(context);
+                  header.encodeEnd(context);
+               }
+               
+               // we don't render child controls for the header row
+               out.write("</th>");
+            }
+         }
+         out.write("</tr>");
+         
+         this.rowIndex = 0;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListRow(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[], java.lang.Object)
+       */
+      public void renderListRow(FacesContext context, UIRichList richList, UIColumn[] columns, Object row)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // output row or alt style row if set
+         out.write("<tr");
+         String rowStyle = (String)richList.getAttributes().get("rowStyleClass");
+         String altStyle = (String)richList.getAttributes().get("altRowStyleClass");
+         if (altStyle != null && (this.rowIndex++ & 1) == 1)
+         {
+            rowStyle = altStyle;
+         }         
+         outputAttribute(out, rowStyle, "class");
+         out.write('>');
+         
+         // find the actions column if it exists
+         UIColumn actionsColumn = null;
+         for (int i=0; i<columns.length; i++)
+         {
+            if (columns[i].isRendered() == true && columns[i].getActions() == true)
+            {
+               actionsColumn = columns[i];
+               break;
+            }
+         }
+         
+         // output each column in turn and render all children
+         boolean renderedFirst = false;
+         for (int i=0; i<columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            if (column.isRendered() == true)
+            {
+               out.write("<td");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               
+               // for details view, we show the small column icon for the first column
+               if (renderedFirst == false)
+               {
+                  UIComponent smallIcon = column.getSmallIcon();
+                  if (smallIcon != null)
+                  {
+                     smallIcon.encodeBegin(context);
+                     smallIcon.encodeChildren(context);
+                     smallIcon.encodeEnd(context);
+                     out.write("&nbsp;");
+                  }
+                  renderedFirst = true;
+               }
+               
+               if (column.getChildCount() != 0)
+               {
+                  if (column == actionsColumn)
+                  {
+                     out.write("<nobr>");
+                  }
+                  
+                  // allow child controls inside the columns to render themselves
+                  Utils.encodeRecursive(context, column);
+                  
+                  if (column == actionsColumn)
+                  {
+                     out.write("</nobr>");
+                  }
+               }
+               
+               out.write("</td>");
+            }
+         }
+         out.write("</tr>");
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListAfter(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListAfter(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         out.write("<tr><td colspan=99 align=right>");
+         for (Iterator i=richList.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            // output all remaining child components that are not UIColumn
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIColumn == false)
+            {
+               Utils.encodeRecursive(context, child);
+            }
+         }
+         out.write("</td></tr>");
+      }
+      
+      private int rowIndex = 0;
+   }
+   
+   
+   /**
+    * Class to implement a List view for the RichList component
+    * 
+    * @author kevinr
+    */
+   public static class ListViewRenderer implements IRichListRenderer
+   {
+      // maximum displayable textual lines within a single item cell
+      private final static int MAX_DISPLAYABLE_LINES = 3;
+      
+      private final static String END_ROW_SEPARATOR = "</tr><tr><td colspan=10><div style='padding:3px'></div></td></tr>";
+      private final static String COLUMN_SPACER = "<td><div style='padding-left:8px'></div></td>";
+      
+      public static final String VIEWMODEID = "list";
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#getViewModeID()
+       */
+      public String getViewModeID()
+      {
+         return VIEWMODEID;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListBefore(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // render column headers as labels
+         // TODO: add "showHeaders" to RichList to allow hiding of header facets for some view modes
+         /*
+         out.write("<tr");
+         outputAttribute(out, richList.getAttributes().get("headerStyleClass"), "class");
+         out.write('>');
+         for (int i=0; i<columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            if (column.isRendered() == true)
+            {
+               out.write("<th");
+               outputAttribute(out, column.getAttributes().get("width"), "width");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               
+               // output the header facet if any
+               UIComponent header = column.getHeader();
+               if (header != null)
+               {
+                  header.encodeBegin(context);
+                  header.encodeChildren(context);
+                  header.encodeEnd(context);
+               }
+            }
+            
+            // we don't render child controls for the header row
+            out.write("</th>");
+         }
+         out.write("</tr>");
+         */
+         
+         this.rowIndex = 0;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListRow(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[], java.lang.Object)
+       */
+      public void renderListRow(FacesContext context, UIRichList richList, UIColumn[] columns, Object row) throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // start new row if we are on an even column in this view
+         // we show 2 columns, left to right
+         String rowStyle = (String)richList.getAttributes().get("rowStyleClass");
+         if ((this.rowIndex & 1) == 0)
+         {
+            out.write("<tr");
+            outputAttribute(out, rowStyle, "class");
+            out.write('>');
+         }
+         
+         // find the actions column if it exists
+         // and the primary column (which must exist)
+         UIColumn primaryColumn = null;
+         UIColumn actionsColumn = null;
+         for (int i=0; i<columns.length; i++)
+         {
+            if (columns[i].isRendered() == true)
+            {
+               if (columns[i].getPrimary() == true)
+               {
+                  primaryColumn = columns[i];
+               }
+               else if (columns[i].getActions() == true)
+               {
+                  actionsColumn = columns[i];
+               }
+            }
+         }
+         if (primaryColumn == null)
+         {
+            logger.warn("No primary column found for RichList definition: " + richList.getId());
+         }
+         
+         // get the icon from the primary column
+         out.write("<td width=50%><table cellspacing=0 cellpadding=2 border=0>");
+         if (primaryColumn != null)
+         {
+            UIColumn column = primaryColumn;
+            
+            if (column.isRendered() == true)
+            {
+               out.write("<tr><td rowspan=10");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               
+               // output the large icon for this column
+               UIComponent icon = column.getLargeIcon();
+               if (icon != null)
+               {
+                  icon.encodeBegin(context);
+                  icon.encodeChildren(context);
+                  icon.encodeEnd(context);
+               }
+               out.write("</td>");
+               
+               // start the next cell which contains the first column component
+               out.write("<td width=100%");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               if (column.getChildCount() != 0)
+               {
+                  // allow child controls inside the column to render themselves
+                  Utils.encodeRecursive(context, column);
+               }
+               out.write("</td>");
+               
+               // output actions column if any
+               if (actionsColumn != null)
+               {
+                  out.write("<td");
+                  outputAttribute(out, actionsColumn.getAttributes().get("style"), "style");
+                  outputAttribute(out, actionsColumn.getAttributes().get("styleClass"), "class");
+                  out.write("><nobr>");
+                  
+                  if (actionsColumn.getChildCount() != 0)
+                  {
+                     // allow child controls inside the columns to render themselves
+                     Utils.encodeRecursive(context, actionsColumn);
+                  }
+                  out.write("</nobr></td>");
+               }
+               
+               out.write("</tr>");
+            }
+         }
+         
+         // render remaining columns as lines of data up to a max display limit
+         for (int i = 0; i < columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            int count = 1;
+            if (column.isRendered() == true && count < MAX_DISPLAYABLE_LINES &&
+                column.getActions() == false && column.getPrimary() == false)
+            {
+               // output row or alt style row if set
+               out.write("<tr valign=top");
+               outputAttribute(out, rowStyle, "class");
+               out.write("><td colspan=2");     // render into above actions column
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               if (column.getChildCount() != 0)
+               {
+                  // allow child controls inside the columns to render themselves
+                  Utils.encodeRecursive(context, column);
+               }
+               // end this cell and end row
+               out.write("</td></tr>");
+               
+               count++;
+            }
+         }
+         
+         out.write("</table></td>");
+         
+         if ((this.rowIndex & 1) == 1)
+         {
+            // end row and output a blank padding row/div
+            out.write(END_ROW_SEPARATOR);
+         }
+         else
+         {
+            out.write(COLUMN_SPACER);
+         }
+         
+         this.rowIndex++;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListAfter(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListAfter(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // finish last row if required (we used an open-ended column rendering algorithm)
+         if ( ((this.rowIndex-1) & 1) != 1)
+         {
+            out.write(END_ROW_SEPARATOR);
+         }
+         
+         out.write("<tr><td colspan=99 align=right>");
+         for (Iterator i=richList.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            // output all remaining child components that are not UIColumn
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIColumn == false)
+            {
+               Utils.encodeRecursive(context, child);
+            }
+         }
+         out.write("</td></tr>");
+      }
+      
+      private int rowIndex = 0;
+   }
+   
+   
+   /**
+    * Class to implement an Icon view for the RichList component
+    * 
+    * @author kevinr
+    */
+   public static class IconViewRenderer implements IRichListRenderer
+   {
+      // number of vertical columns to render before starting new row
+      private final static int COLUMNS = 3;
+      
+      // calculation for percentage of table row per column
+      private final static String COLUMN_PERCENT = Integer.toString(100/COLUMNS) + "%";
+      
+      // maximum displayable textual lines within a single item cell
+      private final static int MAX_DISPLAYABLE_LINES = 3;
+      
+      private final static String END_ROW_SEPARATOR = "</tr><tr><td colspan=10><div style='padding:3px'></div></td></tr>";
+      
+      public static final String VIEWMODEID = "icons";
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#getViewModeID()
+       */
+      public String getViewModeID()
+      {
+         return VIEWMODEID;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListBefore(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListBefore(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         // no headers for this renderer
+         this.rowIndex = 0;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListRow(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[], java.lang.Object)
+       */
+      public void renderListRow(FacesContext context, UIRichList richList, UIColumn[] columns, Object row)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // start new row as per number of columns in this icon view
+         if (this.rowIndex % COLUMNS == 0)
+         {
+            out.write("<tr");
+            outputAttribute(out, richList.getAttributes().get("rowStyleClass"), "class");
+            out.write('>');
+         }
+         
+         // find primary column (which must exist)
+         UIColumn primaryColumn = null;
+         for (int i=0; i<columns.length; i++)
+         {
+            if (columns[i].isRendered() == true && columns[i].getPrimary() == true)
+            {
+               primaryColumn = columns[i];
+               break;
+            }
+         }
+         if (primaryColumn == null)
+         {
+            logger.warn("No primary column found for RichList definition: " + richList.getId());
+         }
+         
+         // output primary column as the icon label
+         out.write("<td width=");
+         out.write(COLUMN_PERCENT);
+         out.write("><table cellspacing=0 cellpadding=2 border=0>");
+         if (primaryColumn != null)
+         {
+            UIColumn column = primaryColumn;
+            
+            if (column.isRendered() == true)
+            {
+               out.write("<tr><td rowspan=10");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               
+               // output the large icon for this column
+               UIComponent largeIcon = column.getLargeIcon();
+               if (largeIcon != null)
+               {
+                  largeIcon.encodeBegin(context);
+                  largeIcon.encodeChildren(context);
+                  largeIcon.encodeEnd(context);
+               }
+               out.write("</td>");
+               
+               // start the next cell which contains the first column component
+               out.write("<td");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               if (column.getChildCount() != 0)
+               {
+                  // allow child controls inside the columns to render themselves
+                  Utils.encodeRecursive(context, column);
+               }
+               out.write("</td></tr>");
+            }
+         }
+         
+         // render remaining columns as lines of data up to a max display limit
+         for (int i=0; i<columns.length; i++)
+         {
+            UIColumn column = columns[i];
+            
+            int count = 1;
+            if (column.isRendered() == true && column.getPrimary() == false &&
+                (count < MAX_DISPLAYABLE_LINES || column.getActions() == true) )
+            {
+               out.write("<tr><td");
+               outputAttribute(out, column.getAttributes().get("style"), "style");
+               outputAttribute(out, column.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               if (column.getChildCount() != 0)
+               {
+                  // allow child controls inside the columns to render themselves
+                  Utils.encodeRecursive(context, column);
+               }
+               out.write("</td></tr>");
+               
+               count++;
+            }
+         }
+         
+         out.write("</table></td>");
+         
+         if (this.rowIndex % COLUMNS == COLUMNS-1)
+         {
+            // end row and output a blank padding row/div
+            out.write(END_ROW_SEPARATOR);
+         }
+         
+         this.rowIndex++;
+      }
+      
+      /**
+       * @see org.alfresco.web.ui.common.renderer.data.IRichListRenderer#renderListAfter(javax.faces.context.FacesContext, org.alfresco.web.ui.common.component.data.UIColumn[])
+       */
+      public void renderListAfter(FacesContext context, UIRichList richList, UIColumn[] columns)
+            throws IOException
+      {
+         ResponseWriter out = context.getResponseWriter();
+         
+         // finish last row if required (we used an open-ended column rendering algorithm)
+         if ((this.rowIndex-1) % COLUMNS != COLUMNS-1)
+         {
+            out.write(END_ROW_SEPARATOR);
+         }
+         
+         out.write("<tr><td colspan=99 align=right>");
+         for (Iterator i=richList.getChildren().iterator(); i.hasNext(); /**/)
+         {
+            // output all remaining child components that are not UIColumn
+            UIComponent child = (UIComponent)i.next();
+            if (child instanceof UIColumn == false)
+            {
+               Utils.encodeRecursive(context, child);
+            }
+         }
+         out.write("</td></tr>");
+      }
+      
+      private int rowIndex = 0;
+   }
+   
+   
+   private static Log logger = LogFactory.getLog(RichListRenderer.class);
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java b/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java
new file mode 100644
index 0000000000..979872f661
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class ActionLinkTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ActionLink";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.ActionLinkRenderer";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setStringProperty(component, "image", this.image);
+      setBooleanProperty(component, "showLink", this.showLink);
+      setStringProperty(component, "verticalAlign", this.verticalAlign);
+      setIntProperty(component, "padding", this.padding);
+      setStringProperty(component, "href", this.href);
+      setStringProperty(component, "value", this.value);
+      setStringProperty(component, "target", this.target);
+      setStringProperty(component, "onclick", this.onclick);
+      
+      // TODO: Add image width/height properties
+   }
+
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.value = null;
+      this.action = null;
+      this.actionListener = null;
+      this.image = null;
+      this.showLink = null;
+      this.verticalAlign = null;
+      this.padding = null;
+      this.href = null;
+      this.target = null;
+      this.onclick = null;
+   }
+   
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the image
+    *
+    * @param image     the image
+    */
+   public void setImage(String image)
+   {
+      this.image = image;
+   }
+
+   /**
+    * Set the showLink
+    *
+    * @param showLink     the showLink
+    */
+   public void setShowLink(String showLink)
+   {
+      this.showLink = showLink;
+   }
+   
+   /**
+    * Set the vertical alignment value
+    *
+    * @param verticalAlign     the vertical alignment value
+    */
+   public void setVerticalAlign(String verticalAlign)
+   {
+      this.verticalAlign = verticalAlign;
+   }
+   
+   /**
+    * Set the padding in pixels
+    *
+    * @param padding     the padding in pixels
+    */
+   public void setPadding(String padding)
+   {
+      this.padding = padding;
+   }
+   
+   /**
+    * Set the href to use instead of a JSF action
+    *
+    * @param href     the href
+    */
+   public void setHref(String href)
+   {
+      this.href = href;
+   }
+   
+   /**
+    * Set the target
+    *
+    * @param target     the target
+    */
+   public void setTarget(String target)
+   {
+      this.target = target;
+   }
+
+   /**
+    * Sets the onclick handler
+    * 
+    * @param onclick The onclick handler
+    */
+   public void setOnclick(String onclick)
+   {
+      this.onclick = onclick;
+   }
+
+   /** the target */
+   private String target;
+
+   /** the padding in pixels */
+   private String padding;
+
+   /** the vertical alignment value */
+   private String verticalAlign;
+   
+   /** the value (text to display) */
+   private String value;
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the image */
+   private String image;
+
+   /** the showLink boolean */
+   private String showLink;
+   
+   /** the href link */
+   private String href;
+   
+   /** the onclick handler */
+   private String onclick;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/BaseComponentTag.java b/source/java/org/alfresco/web/ui/common/tag/BaseComponentTag.java
new file mode 100644
index 0000000000..d813157123
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/BaseComponentTag.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.FacesException;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.webapp.UIComponentTag;
+
+import org.alfresco.web.ui.common.ConstantMethodBinding;
+
+/**
+ * @author Kevin Roast
+ */
+public abstract class BaseComponentTag extends UIComponentTag
+{
+   /**
+    * Helper to set an action property into a command component
+    * 
+    * @param command    Command component
+    * @param action     The action method binding or outcome to set
+    */
+   protected void setActionProperty(UICommand command, String action)
+   {
+      if (action != null)
+      {
+         if (isValueReference(action))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(action, null);
+            command.setAction(vb);
+         }
+         else
+         {
+            MethodBinding vb = new ConstantMethodBinding(action);
+            command.setAction(vb);
+         }
+      }
+   }
+   
+   /**
+    * Helper to set an action listener property into a command component
+    * 
+    * @param command          Command component
+    * @param actionListener   Action listener method binding
+    */
+   protected void setActionListenerProperty(UICommand command, String actionListener)
+   {
+      if (actionListener != null)
+      {
+         if (isValueReference(actionListener))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(actionListener, ACTION_CLASS_ARGS);
+            command.setActionListener(vb);
+         }
+         else
+         {
+            throw new FacesException("Action listener method binding incorrectly specified: " + actionListener);
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String property value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value
+    */
+   protected void setStringProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            component.getAttributes().put(name, value);
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String value property into the component.
+    * Assumes the that the property value can only be a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value binding
+    */
+   protected void setStringBindingProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            throw new IllegalArgumentException("Property: '" + name + "' must be a value binding expression.");
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a static String property into the component.
+    * Assumes the that the property value can only be a static string value.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string static value
+    */
+   protected void setStringStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         component.getAttributes().put(name, value);
+      }
+   }
+   
+   /**
+    * Helper method to set a String property as an Integer value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value (an Integer will be created)
+    */
+   protected void setIntProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            try
+            {
+               component.getAttributes().put(name, Integer.valueOf(value));
+            }
+            catch (NumberFormatException ne)
+            {
+               throw new RuntimeException("Was expecting Int value for property '" + name + "' but passed value: " + value); 
+            }
+         }
+      }
+   }
+   
+   protected void setIntStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         try
+         {
+            component.getAttributes().put(name, Integer.valueOf(value));
+         }
+         catch (NumberFormatException ne)
+         {
+            throw new RuntimeException("Was expecting Int value for property '" + name + "' but passed value: " + value); 
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String property as an Boolean value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value (a Boolean will be created)
+    */
+   protected void setBooleanProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            component.getAttributes().put(name, Boolean.valueOf(value));
+         }
+      }
+   }
+   
+   protected void setBooleanStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         component.getAttributes().put(name, Boolean.valueOf(value));
+      }
+   }
+   
+   protected final static Class ACTION_CLASS_ARGS[] = {javax.faces.event.ActionEvent.class};
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java b/source/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java
new file mode 100644
index 0000000000..eff6100656
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/BooleanLabelConverterTag.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.convert.Converter;
+import javax.faces.webapp.ConverterTag;
+import javax.servlet.jsp.JspException;
+
+import org.alfresco.web.ui.common.converter.BooleanLabelConverter;
+
+/**
+ * Allows the BooleanLabelConverter component to be used on JSP pages
+ * 
+ * @author gavinc
+ */
+public class BooleanLabelConverterTag extends ConverterTag
+{
+   /**
+    * Default Constructor
+    */
+   public BooleanLabelConverterTag()
+   {
+      setConverterId(BooleanLabelConverter.CONVERTER_ID);
+   }
+
+   /**
+    * @see javax.faces.webapp.ConverterTag#createConverter()
+    */
+   protected Converter createConverter() throws JspException
+   {
+      return (BooleanLabelConverter)super.createConverter();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java b/source/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java
new file mode 100644
index 0000000000..9159507e06
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/BreadcrumbTag.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class BreadcrumbTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Breadcrumb";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.BreadcrumbRenderer";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setStringProperty(component, "separator", this.separator);
+      setBooleanProperty(component, "showRoot", this.showRoot);
+      setBooleanProperty(component, "immediate", this.immediate);
+      setStringProperty(component, "value", this.value);
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.action = null;
+      this.actionListener = null;
+      this.separator = ">";
+      this.showRoot = "true";
+      this.immediate = null;
+      this.value = null;
+   }
+   
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the separator
+    *
+    * @param separator     the separator
+    */
+   public void setSeparator(String separator)
+   {
+      this.separator = separator;
+   }
+
+   /**
+    * Set the show root value
+    *
+    * @param showRoot     the showRoot
+    */
+   public void setShowRoot(String showRoot)
+   {
+      this.showRoot = showRoot;
+   }
+   
+   /**
+    * Set if the action event fired is immediate
+    *
+    * @param immediate     true if the action event fired is immediate
+    */
+   public void setImmediate(String immediate)
+   {
+      this.immediate = immediate;
+   }
+   
+   /**
+    * Set the value. The value for a breadcrumb is either a '/' separated String path
+    * or a List of IBreadcrumb handler instances.
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+
+   /** the value */
+   private String value;
+   
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the separator */
+   private String separator = ">";
+
+   /** the showRoot value */
+   private String showRoot = "true";
+   
+   /** true if the action event fired is immediate */
+   private String immediate;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java b/source/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java
new file mode 100644
index 0000000000..895f1cc21a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ByteSizeConverterTag.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.convert.Converter;
+import javax.faces.webapp.ConverterTag;
+import javax.servlet.jsp.JspException;
+
+import org.alfresco.web.ui.common.converter.ByteSizeConverter;
+
+/**
+ * @author Kevin Roast
+ */
+public class ByteSizeConverterTag extends ConverterTag
+{
+   /**
+    * Default Constructor
+    */
+   public ByteSizeConverterTag()
+   {
+      setConverterId(ByteSizeConverter.CONVERTER_ID);
+   }
+
+   /**
+    * @see javax.faces.webapp.ConverterTag#createConverter()
+    */
+   protected Converter createConverter() throws JspException
+   {
+      return (ByteSizeConverter)super.createConverter();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ErrorsTag.java b/source/java/org/alfresco/web/ui/common/tag/ErrorsTag.java
new file mode 100644
index 0000000000..f279cfc9d8
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ErrorsTag.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+public class ErrorsTag extends HtmlComponentTag
+{
+   private String message;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "javax.faces.Messages";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.Errors";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "message", this.message);
+   }
+
+   /**
+    * @param message Sets the message to display
+    */
+   public void setMessage(String message)
+   {
+      this.message = message;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java b/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
new file mode 100644
index 0000000000..24c3151c86
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/GenericPickerTag.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.FacesException;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.component.UIGenericPicker;
+
+/**
+ * @author Kevin Roast
+ */
+public class GenericPickerTag extends BaseComponentTag
+{
+   private final static Class QUERYCALLBACK_CLASS_ARGS[] = {int.class, String.class};
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.GenericPicker";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setBooleanProperty(component, "showFilter", this.showFilter);
+      setBooleanProperty(component, "showContains", this.showContains);
+      setBooleanProperty(component, "showAddButton", this.showAddButton);
+      setBooleanProperty(component, "filterRefresh", this.filterRefresh);
+      setStringProperty(component, "addButtonLabel", this.addButtonLabel);
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setIntProperty(component, "width", this.width);
+      setIntProperty(component, "height", this.height);
+      setStringBindingProperty(component, "filters", this.filters);
+      if (queryCallback != null)
+      {
+         if (isValueReference(queryCallback))
+         {
+            MethodBinding b = getFacesContext().getApplication().createMethodBinding(queryCallback, QUERYCALLBACK_CLASS_ARGS);
+            ((UIGenericPicker)component).setQueryCallback(b);
+         }
+         else
+         {
+            throw new FacesException("Query Callback method binding incorrectly specified: " + queryCallback);
+         }
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.showFilter = null;
+      this.showContains = null;
+      this.showAddButton = null;
+      this.addButtonLabel = null;
+      this.action = null;
+      this.actionListener = null;
+      this.width = null;
+      this.height = null;
+      this.queryCallback = null;
+      this.filters = null;
+      this.filterRefresh = null;
+   }
+   
+   /**
+    * Set the showFilter
+    *
+    * @param showFilter     the showFilter
+    */
+   public void setShowFilter(String showFilter)
+   {
+      this.showFilter = showFilter;
+   }
+
+   /**
+    * Set the showContains
+    *
+    * @param showContains     the showContains
+    */
+   public void setShowContains(String showContains)
+   {
+      this.showContains = showContains;
+   }
+
+   /**
+    * Set the showAddButton
+    *
+    * @param showAddButton     the showAddButton
+    */
+   public void setShowAddButton(String showAddButton)
+   {
+      this.showAddButton = showAddButton;
+   }
+
+   /**
+    * Set the addButtonLabel
+    *
+    * @param addButtonLabel     the addButtonLabel
+    */
+   public void setAddButtonLabel(String addButtonLabel)
+   {
+      this.addButtonLabel = addButtonLabel;
+   }
+
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the width
+    *
+    * @param width     the width
+    */
+   public void setWidth(String width)
+   {
+      this.width = width;
+   }
+
+   /**
+    * Set the height
+    *
+    * @param height     the height
+    */
+   public void setHeight(String height)
+   {
+      this.height = height;
+   }
+
+   /**
+    * Set the queryCallback
+    *
+    * @param queryCallback     the queryCallback
+    */
+   public void setQueryCallback(String queryCallback)
+   {
+      this.queryCallback = queryCallback;
+   }
+   
+   /**
+    * Set the filters
+    *
+    * @param filters     the filters
+    */
+   public void setFilters(String filters)
+   {
+      this.filters = filters;
+   }
+   
+   /**
+    * Set the filterRefresh
+    *
+    * @param filterRefresh     the filterRefresh
+    */
+   public void setFilterRefresh(String filterRefresh)
+   {
+      this.filterRefresh = filterRefresh;
+   }
+
+
+   /** the filterRefresh */
+   private String filterRefresh;
+   
+   /** the filters */
+   private String filters;
+      
+   /** the queryCallback */
+   private String queryCallback;
+
+   /** the showFilter */
+   private String showFilter;
+
+   /** the showContains */
+   private String showContains;
+
+   /** the showAddButton */
+   private String showAddButton;
+
+   /** the addButtonLabel */
+   private String addButtonLabel;
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the width */
+   private String width;
+
+   /** the height */
+   private String height;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java b/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
new file mode 100644
index 0000000000..8559b7bb80
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/HtmlComponentTag.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+
+/**
+ * Base class for tags that represent HTML components.
+ * 
+ * @author kevinr
+ */
+public abstract class HtmlComponentTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "style", this.style);
+      setStringProperty(component, "styleClass", this.styleClass);
+      setStringProperty(component, "tooltip", this.tooltip);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.style = null;
+      this.styleClass = null;
+      this.tooltip = null;
+   }
+
+   /**
+    * Set the style
+    *
+    * @param style     the style
+    */
+   public void setStyle(String style)
+   {
+      this.style = style;
+   }
+
+   /**
+    * Set the styleClass
+    *
+    * @param styleClass     the styleClass
+    */
+   public void setStyleClass(String styleClass)
+   {
+      this.styleClass = styleClass;
+   }
+
+   /**
+    * Set the tooltip
+    *
+    * @param tooltip     the tooltip
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+
+
+   /** the tooltip */
+   private String tooltip;
+
+   /** the style */
+   private String style;
+
+   /** the CSS style class */
+   private String styleClass;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java b/source/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java
new file mode 100644
index 0000000000..6ec6905749
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ImagePickerRadioTag.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * Tag to combine the image picker component and radio renderer 
+ * 
+ * @author gavinc
+ */
+public class ImagePickerRadioTag extends HtmlComponentTag
+{
+   /** the labelStyle */
+   private String labelStyle;
+
+   /** the labelStyleClass */
+   private String labelStyleClass;
+
+   /** the spacing */
+   private String spacing;
+
+   /** the columns */
+   private String columns;
+   
+   /** the label */
+   private String label;
+
+   /** the value */
+   private String value;
+   
+   /** the image */
+   private String image;
+   
+   /** the onclick handler */
+   private String onclick;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ImagePicker";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.Radio";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "labelStyle", this.labelStyle);
+      setStringProperty(component, "labelStyleClass", this.labelStyleClass);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "value", this.value);
+      setStringProperty(component, "image", this.image);
+      setStringProperty(component, "onclick", this.onclick);
+      setIntProperty(component, "spacing", this.spacing);
+      setIntProperty(component, "columns", this.columns);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.labelStyle = null;
+      this.labelStyleClass = null;
+      this.spacing = null;
+      this.label = null;
+      this.value = null;
+      this.image = null;
+      this.columns = null;
+      this.onclick = null;
+   }   
+
+   /**
+    * @return Returns the image.
+    */
+   public String getImage()
+   {
+      return image;
+   }
+
+   /**
+    * @param image The image to set.
+    */
+   public void setImage(String image)
+   {
+      this.image = image;
+   }
+
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      return label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the labelStyle.
+    */
+   public String getLabelStyle()
+   {
+      return labelStyle;
+   }
+
+   /**
+    * @param labelStyle The labelStyle to set.
+    */
+   public void setLabelStyle(String labelStyle)
+   {
+      this.labelStyle = labelStyle;
+   }
+
+   /**
+    * @return Returns the labelStyleClass.
+    */
+   public String getLabelStyleClass()
+   {
+      return labelStyleClass;
+   }
+
+   /**
+    * @param labelStyleClass The labelStyleClass to set.
+    */
+   public void setLabelStyleClass(String labelStyleClass)
+   {
+      this.labelStyleClass = labelStyleClass;
+   }
+
+   /**
+    * @return Returns the spacing.
+    */
+   public String getSpacing()
+   {
+      return spacing;
+   }
+
+   /**
+    * @param spacing The spacing to set.
+    */
+   public void setSpacing(String spacing)
+   {
+      this.spacing = spacing;
+   }
+
+   /**
+    * @return Returns the value.
+    */
+   public String getValue()
+   {
+      return value;
+   }
+
+   /**
+    * @param value The value to set.
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * @return Returns the columns.
+    */
+   public String getColumns()
+   {
+      return columns;
+   }
+   
+   /**
+    * @param columns The columns to set.
+    */
+   public void setColumns(String columns)
+   {
+      this.columns = columns;
+   }
+
+   /**
+    * @return Returns the onclick.
+    */
+   public String getOnclick()
+   {
+      return onclick;
+   }
+
+   /**
+    * @param onclick The onclick to set.
+    */
+   public void setOnclick(String onclick)
+   {
+      this.onclick = onclick;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java b/source/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
new file mode 100644
index 0000000000..60b278a157
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/InputDatePickerTag.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ * 
+ * Tag handler for an Input UI Component specific for Date input.
+ * 
+ * This tag collects the user params needed to specify an Input component to allow
+ * the user to enter a date. It specifies the renderer as below to be our Date
+ * specific renderer. This renderer is configured in the faces-config.xml.  
+ */
+public class InputDatePickerTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      // we are require an Input component to manage our state
+      // this is just a convention name Id - not an actual class
+      return "javax.faces.Input";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // the renderer type is a convention name Id - not an actual class
+      // see the <render-kit> in faces-config.xml
+      return "org.alfresco.faces.DatePickerRenderer";
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.startYear = "1990";
+      this.yearCount = "10";
+      this.value = null;
+      this.showTime = null;
+      this.disabled = null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      // set the properties of tag into the component
+      setIntProperty(component, "startYear", this.startYear);
+      setIntProperty(component, "yearCount", this.yearCount);
+      setStringProperty(component, "value", this.value);
+      setBooleanProperty(component, "showTime", this.showTime);
+      setBooleanProperty(component, "disabled", this.disabled);
+   }
+   
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Set the startYear
+    *
+    * @param startYear     the startYear
+    */
+   public void setStartYear(String startYear)
+   {
+      this.startYear = startYear;
+   }
+
+   /**
+    * Set the yearCount
+    *
+    * @param yearCount     the yearCount
+    */
+   public void setYearCount(String yearCount)
+   {
+      this.yearCount = yearCount;
+   }
+   
+   /**
+    * Determines whether the time is rendered
+    * 
+    * @param showTime true to allow the time to be edited
+    */
+   public void setShowTime(String showTime)
+   {
+      this.showTime = showTime;
+   }
+   
+   /**
+    * Sets whether the component should be rendered in a disabled state
+    * 
+    * @param disabled true to render the component in a disabled state
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   private String startYear = "1990";
+   private String yearCount = "10";
+   private String value = null;
+   private String showTime = null;
+   private String disabled = null;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java b/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java
new file mode 100644
index 0000000000..fa377f4f50
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ListItemTag.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class ListItemTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ListItem";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // this component is rendered by its parent container
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "tooltip", this.tooltip);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "image", this.image);
+      setStringProperty(component, "value", this.value);
+      setBooleanProperty(component, "disabled", this.disabled);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.tooltip = null;
+      this.label = null;
+      this.image = null;
+      this.value = null;
+      this.disabled = null;
+   }
+   
+   /**
+    * Set the tooltip
+    *
+    * @param tooltip     the tooltip
+    */
+   public void setTooltip(String tooltip)
+   {
+      this.tooltip = tooltip;
+   }
+
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * Set the image
+    *
+    * @param image     the image
+    */
+   public void setImage(String image)
+   {
+      this.image = image;
+   }
+
+   /**
+    * Set the value to be selected initially 
+    *
+    * @param value     the value to be selected initially
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the disabled flag
+    * 
+    * @param disabled true to set this item as disabled
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+
+   /** the tooltip */
+   private String tooltip;
+
+   /** the label */
+   private String label;
+
+   /** the image */
+   private String image;
+
+   /** the value to be selected initially */
+   private String value;
+   
+   /** the disabled flag */
+   private String disabled;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java b/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
new file mode 100644
index 0000000000..a58ebc9871
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ListItemsTag.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * Tag used to place the ListItems component on a JSP page
+ * 
+ * @author gavinc
+ */
+public class ListItemsTag extends BaseComponentTag
+{
+   private String value;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ListItems";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // this component is rendered by its parent container
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringBindingProperty(component, "value", this.value);
+   }
+
+   /**
+    * @param value Sets the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.value = null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/MenuTag.java b/source/java/org/alfresco/web/ui/common/tag/MenuTag.java
new file mode 100644
index 0000000000..babfdfac1a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/MenuTag.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class MenuTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Menu";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // the component is self renderering
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "image", this.image);
+      setStringProperty(component, "menuStyle", this.menuStyle);
+      setStringProperty(component, "menuStyleClass", this.menuStyleClass);
+      setIntProperty(component, "itemSpacing", this.itemSpacing);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.label = null;
+      this.image = null;
+      this.menuStyle = null;
+      this.menuStyleClass = null;
+      this.itemSpacing = null;
+   }
+   
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+   
+   /**
+    * Set the image
+    *
+    * @param image     the image
+    */
+   public void setImage(String image)
+   {
+      this.image = image;
+   }
+   
+   /**
+    * Set the menuStyle
+    *
+    * @param menuStyle     the menuStyle
+    */
+   public void setMenuStyle(String menuStyle)
+   {
+      this.menuStyle = menuStyle;
+   }
+
+   /**
+    * Set the menuStyleClass
+    *
+    * @param menuStyleClass     the menuStyleClass
+    */
+   public void setMenuStyleClass(String menuStyleClass)
+   {
+      this.menuStyleClass = menuStyleClass;
+   }
+
+   /**
+    * Set the itemSpacing
+    *
+    * @param itemSpacing     the itemSpacing
+    */
+   public void setItemSpacing(String itemSpacing)
+   {
+      this.itemSpacing = itemSpacing;
+   }
+
+
+   /** the menuStyle */
+   private String menuStyle;
+
+   /** the menuStyleClass */
+   private String menuStyleClass;
+
+   /** the itemSpacing */
+   private String itemSpacing;
+
+   /** the image */
+   private String image;
+
+   /** the label */
+   private String label;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java b/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java
new file mode 100644
index 0000000000..977f52ea6c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class ModeListTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ModeList";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.ModeListRenderer";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setStringProperty(component, "labelStyle", this.labelStyle);
+      setStringProperty(component, "labelStyleClass", this.labelStyleClass);
+      setStringProperty(component, "itemStyle", this.itemStyle);
+      setStringProperty(component, "itemStyleClass", this.itemStyleClass);
+      setStringProperty(component, "disabledStyle", this.disabledStyle);
+      setStringProperty(component, "disabledStyleClass", this.disabledStyleClass);
+      setStringProperty(component, "itemLinkStyle", this.itemLinkStyle);
+      setStringProperty(component, "itemLinkStyleClass", this.itemLinkStyleClass);
+      setStringProperty(component, "selectedStyle", this.selectedStyle);
+      setStringProperty(component, "selectedStyleClass", this.selectedStyleClass);
+      setStringProperty(component, "selectedLinkStyle", this.selectedLinkStyle);
+      setStringProperty(component, "selectedLinkStyleClass", this.selectedLinkStyleClass);
+      setStringProperty(component, "selectedImage", this.selectedImage);
+      setIntProperty(component, "itemSpacing", this.itemSpacing);
+      setIntProperty(component, "iconColumnWidth", this.iconColumnWidth);
+      setIntProperty(component, "width", this.width);
+      setBooleanProperty(component, "horizontal", this.horizontal);
+      setBooleanProperty(component, "disabled", this.disabled);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.labelStyle = null;
+      this.labelStyleClass = null;
+      this.itemStyle = null;
+      this.itemStyleClass = null;
+      this.itemLinkStyle = null;
+      this.itemLinkStyleClass = null;
+      this.disabledStyle = null;
+      this.disabledStyleClass = null;
+      this.selectedStyle = null;
+      this.selectedStyleClass = null;
+      this.selectedLinkStyle = null;
+      this.selectedLinkStyleClass = null;
+      this.selectedImage = null;
+      this.itemSpacing = null;
+      this.iconColumnWidth = null;
+      this.horizontal = null;
+      this.width = null;
+      this.label = null;
+      this.action = null;
+      this.actionListener = null;
+      this.value = null;
+      this.disabled = null;
+   }
+
+   /**
+    * Set the itemSpacing
+    *
+    * @param itemSpacing     the itemSpacing
+    */
+   public void setItemSpacing(String itemSpacing)
+   {
+      this.itemSpacing = itemSpacing;
+   }
+
+   /**
+    * Set the iconColumnWidth
+    *
+    * @param iconColumnWidth     the iconColumnWidth
+    */
+   public void setIconColumnWidth(String iconColumnWidth)
+   {
+      this.iconColumnWidth = iconColumnWidth;
+   }
+
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the width
+    *
+    * @param width     the width
+    */
+   public void setWidth(String width)
+   {
+      this.width = width;
+   }
+   
+   /**
+    * Set if this component is rendered horizontally
+    *
+    * @param horizontal     true if rendered horizontally, false to render vertically
+    */
+   public void setHorizontal(String horizontal)
+   {
+      this.horizontal = horizontal;
+   }
+   
+   /**
+    * Set the labelStyle
+    *
+    * @param labelStyle     the labelStyle
+    */
+   public void setLabelStyle(String labelStyle)
+   {
+      this.labelStyle = labelStyle;
+   }
+
+   /**
+    * Set the labelStyleClass
+    *
+    * @param labelStyleClass     the labelStyleClass
+    */
+   public void setLabelStyleClass(String labelStyleClass)
+   {
+      this.labelStyleClass = labelStyleClass;
+   }
+
+   /**
+    * Set the itemStyle
+    *
+    * @param itemStyle     the itemStyle
+    */
+   public void setItemStyle(String itemStyle)
+   {
+      this.itemStyle = itemStyle;
+   }
+
+   /**
+    * Set the itemStyleClass
+    *
+    * @param itemStyleClass     the itemStyleClass
+    */
+   public void setItemStyleClass(String itemStyleClass)
+   {
+      this.itemStyleClass = itemStyleClass;
+   }
+
+   /**
+    * Set the itemLinkStyle
+    *
+    * @param itemLinkStyle     the itemLinkStyle
+    */
+   public void setItemLinkStyle(String itemLinkStyle)
+   {
+      this.itemLinkStyle = itemLinkStyle;
+   }
+
+   /**
+    * Set the itemLinkStyleClass
+    *
+    * @param itemLinkStyleClass     the itemLinkStyleClass
+    */
+   public void setItemLinkStyleClass(String itemLinkStyleClass)
+   {
+      this.itemLinkStyleClass = itemLinkStyleClass;
+   }
+
+   /**
+    * Set the selectedStyle
+    *
+    * @param selectedStyle     the selectedStyle
+    */
+   public void setSelectedStyle(String selectedStyle)
+   {
+      this.selectedStyle = selectedStyle;
+   }
+
+   /**
+    * Set the selectedStyleClass
+    *
+    * @param selectedStyleClass     the selectedStyleClass
+    */
+   public void setSelectedStyleClass(String selectedStyleClass)
+   {
+      this.selectedStyleClass = selectedStyleClass;
+   }
+
+   /**
+    * Set the selectedLinkStyle
+    *
+    * @param selectedLinkStyle     the selectedLinkStyle
+    */
+   public void setSelectedLinkStyle(String selectedLinkStyle)
+   {
+      this.selectedLinkStyle = selectedLinkStyle;
+   }
+
+   /**
+    * Set the selectedLinkStyleClass
+    *
+    * @param selectedLinkStyleClass     the selectedLinkStyleClass
+    */
+   public void setSelectedLinkStyleClass(String selectedLinkStyleClass)
+   {
+      this.selectedLinkStyleClass = selectedLinkStyleClass;
+   }
+   
+   /**
+    * Set the image to show instead of the ListItem icon when the item is selected
+    * 
+    * @param selectedImage     the selected image
+    */
+   public void setSelectedImage(String selectedImage)
+   {
+      this.selectedImage = selectedImage;
+   }
+
+   /**
+    * Set the disabled flag
+    * 
+    * @param disabled true to disable all children
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   /**
+    * Set the disabledStyle
+    *
+    * @param disabledStyle     the disabledStyle
+    */
+   public void setDisabledStyle(String disabledStyle)
+   {
+      this.disabledStyle = disabledStyle;
+   }
+
+   /**
+    * Set the disabledStyleClass
+    *
+    * @param disabledStyleClass     the disabledStyleClass
+    */
+   public void setDisabledStyleClass(String disabledStyleClass)
+   {
+      this.disabledStyleClass = disabledStyleClass;
+   }
+
+
+   /** the disabledStyle */
+   private String disabledStyle;
+
+   /** the disabledStyleClass */
+   private String disabledStyleClass;
+
+   /** the selectedImage */
+   private String selectedImage;
+
+   /** the labelStyle */
+   private String labelStyle;
+
+   /** the labelStyleClass */
+   private String labelStyleClass;
+
+   /** the itemStyle */
+   private String itemStyle;
+
+   /** the itemStyleClass */
+   private String itemStyleClass;
+
+   /** the itemLinkStyle */
+   private String itemLinkStyle;
+
+   /** the itemLinkStyleClass */
+   private String itemLinkStyleClass;
+
+   /** the selectedStyle */
+   private String selectedStyle;
+
+   /** the selectedStyleClass */
+   private String selectedStyleClass;
+
+   /** the selectedLinkStyle */
+   private String selectedLinkStyle;
+
+   /** the selectedLinkStyleClass */
+   private String selectedLinkStyleClass;
+
+   /** true if rendered horizontally, false to render vertically */
+   private String horizontal;
+
+   /** the width */
+   private String width;
+
+   /** the itemSpacing */
+   private String itemSpacing;
+
+   /** the iconColumnWidth */
+   private String iconColumnWidth;
+
+   /** the label */
+   private String label;
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the value */
+   private String value;
+   
+   /** the disabled flag */
+   private String disabled;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/OutputTextTag.java b/source/java/org/alfresco/web/ui/common/tag/OutputTextTag.java
new file mode 100644
index 0000000000..ad217b6342
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/OutputTextTag.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * Tag to place the UIOutputText component on the page
+ * 
+ * @author gavinc
+ */
+public class OutputTextTag extends HtmlComponentTag
+{
+   private String value;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.OutputText";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // the component is self renderering
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.value = null;
+   }
+   
+   /**
+    * Set the value
+    *
+    * @param value  The text
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/PanelTag.java b/source/java/org/alfresco/web/ui/common/tag/PanelTag.java
new file mode 100644
index 0000000000..a7504dd8a2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/PanelTag.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.FacesException;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+import javax.servlet.jsp.JspException;
+
+import org.alfresco.web.ui.common.component.UIPanel;
+
+/**
+ * @author kevinr
+ */
+public class PanelTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Panel";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // the component is self renderering
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "border", this.border);
+      setBooleanProperty(component, "progressive", this.progressive);
+      setStringProperty(component, "bgcolor", this.bgcolor);
+      setStringProperty(component, "titleBorder", this.titleBorder);
+      setStringProperty(component, "titleBgcolor", this.titleBgcolor);
+      setBooleanProperty(component, "expanded", this.expanded);
+      setStringProperty(component, "facetsId", this.facetsId);
+      if (expandedActionListener != null)
+      {
+         if (isValueReference(expandedActionListener))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(expandedActionListener, ACTION_CLASS_ARGS);
+            ((UIPanel)component).setExpandedActionListener(vb);
+         }
+         else
+         {
+            throw new FacesException("Expanded Action listener method binding incorrectly specified: " + expandedActionListener);
+         }
+      }
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.label = null;
+      this.border = null;
+      this.progressive = null;
+      this.bgcolor = null;
+      this.expanded = null;
+      this.expandedActionListener = null;
+      this.facetsId = null;
+   }
+   
+   /**
+    * Override this to allow the panel component to control whether child components
+    * are rendered by the JSP tag framework. This is a nasty solution as it requires
+    * a reference to the UIPanel instance and also specific knowledge of the component
+    * type that is created by the framework for this tag.
+    * 
+    * The reason for this solution is to allow any child content (including HTML tags)
+    * to be displayed inside the UIPanel component without having to resort to the
+    * awful JSF Component getRendersChildren() mechanism - as this would force the use
+    * of the verbatim tags for ALL non-JSF child content!
+    */
+   protected int getDoStartValue() throws JspException
+   {
+      UIComponent component = getComponentInstance();
+      if (component instanceof UIPanel)
+      {
+         if (((UIPanel)component).isExpanded() == true && component.isRendered() == true)
+         {
+            return EVAL_BODY_INCLUDE;
+         }
+         else
+         {
+            return SKIP_BODY;
+         }
+      }
+      return EVAL_BODY_INCLUDE;
+   }
+
+   /**
+    * Set the border
+    *
+    * @param border     the border
+    */
+   public void setBorder(String border)
+   {
+      this.border = border;
+   }
+
+   /**
+    * Set the progressive
+    *
+    * @param progressive     the progressive
+    */
+   public void setProgressive(String progressive)
+   {
+      this.progressive = progressive;
+   }
+
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * Set the bgcolor
+    *
+    * @param bgcolor     the bgcolor
+    */
+   public void setBgcolor(String bgcolor)
+   {
+      this.bgcolor = bgcolor;
+   }
+   
+   /**
+    * @param titleBgcolor The title area background color
+    */
+   public void setTitleBgcolor(String titleBgcolor)
+   {
+      this.titleBgcolor = titleBgcolor;
+   }
+
+   /**
+    * @param titleBorder The title area border style
+    */
+   public void setTitleBorder(String titleBorder)
+   {
+      this.titleBorder = titleBorder;
+   }
+
+   /**
+    * Set whether the panel is expanded, default is true.
+    *
+    * @param expanded     the expanded flag
+    */
+   public void setExpanded(String expanded)
+   {
+      this.expanded = expanded;
+   }
+
+   /**
+    * Set the expandedActionListener
+    *
+    * @param expandedActionListener     the expandedActionListener
+    */
+   public void setExpandedActionListener(String expandedActionListener)
+   {
+      this.expandedActionListener = expandedActionListener;
+   }
+
+   /**
+    * Set the facetsId
+    *
+    * @param facets     the facetsId
+    */
+   public void setFacetsId(String facetsId)
+   {
+      this.facetsId = facetsId;
+   }
+
+
+   /** the facets component Id */
+   private String facetsId;
+
+   /** the expandedActionListener */
+   private String expandedActionListener;
+   
+   /** the expanded flag */
+   private String expanded;
+
+   /** the border */
+   private String border;
+
+   /** the progressive */
+   private String progressive;
+
+   /** the label */
+   private String label;
+
+   /** the bgcolor */
+   private String bgcolor;
+
+   /** the title border style */
+   private String titleBorder;
+   
+   /** the title bgcolor */
+   private String titleBgcolor;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java b/source/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java
new file mode 100644
index 0000000000..62a8bc015d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/StatusMessageTag.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Kevin Roast
+ */
+public class StatusMessageTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.StatusMessage";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "border", this.border);
+      setStringProperty(component, "bgcolor", this.bgcolor);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.border = null;
+      this.bgcolor = null;
+   }
+   
+   /**
+    * Set the border
+    *
+    * @param border     the border
+    */
+   public void setBorder(String border)
+   {
+      this.border = border;
+   }
+
+   /**
+    * Set the bgcolor
+    *
+    * @param bgcolor     the bgcolor
+    */
+   public void setBgcolor(String bgcolor)
+   {
+      this.bgcolor = bgcolor;
+   }
+
+
+   /** the border */
+   private String border;
+
+   /** the bgcolor */
+   private String bgcolor;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java b/source/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java
new file mode 100644
index 0000000000..3101cad901
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/XMLDateConverterTag.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.servlet.jsp.PageContext;
+
+import org.alfresco.web.ui.common.converter.XMLDateConverter;
+import org.apache.myfaces.taglib.core.ConvertDateTimeTag;
+
+/**
+ * Tag definition to use the XMLDateConverter on a page 
+ *  
+ * @author gavinc
+ */
+public class XMLDateConverterTag extends ConvertDateTimeTag
+{
+   public void setPageContext(PageContext context) 
+   {
+      super.setPageContext(context);
+      setConverterId(XMLDateConverter.CONVERTER_ID);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java b/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
new file mode 100644
index 0000000000..87149f9f34
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/data/ColumnTag.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.data;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+
+/**
+ * @author kevinr
+ */
+public class ColumnTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.RichListColumn";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // the component is renderer by the parent
+      return null;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.primary = null;
+      this.actions = null;
+      this.width = null;
+      this.style = null;
+      this.styleClass = null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setBooleanProperty(component, "primary", this.primary);
+      setBooleanProperty(component, "actions", this.actions);
+      setStringProperty(component, "width", this.width);
+      setStringProperty(component, "style", this.style);
+      setStringProperty(component, "styleClass", this.styleClass);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Tag properties
+
+   /**
+    * Set if this is the primary column
+    *
+    * @param primary     the primary if "true", otherwise false
+    */
+   public void setPrimary(String primary)
+   {
+      this.primary = primary;
+   }
+   
+   /**
+    * Set the width
+    *
+    * @param width     the width
+    */
+   public void setWidth(String width)
+   {
+      this.width = width;
+   }
+   
+   /**
+    * Set the style
+    *
+    * @param style     the style
+    */
+   public void setStyle(String style)
+   {
+      this.style = style;
+   }
+
+   /**
+    * Set the styleClass
+    *
+    * @param styleClass     the styleClass
+    */
+   public void setStyleClass(String styleClass)
+   {
+      this.styleClass = styleClass;
+   }
+   
+   /**
+    * Set if this is the actions column
+    *
+    * @param actions     the actions if "true", otherwise false
+    */
+   public void setActions(String actions)
+   {
+      this.actions = actions;
+   }
+
+
+   /** the actions */
+   private String actions;
+   
+   /** the style */
+   private String style;
+
+   /** the styleClass */
+   private String styleClass;
+
+   /** the width */
+   private String width;
+
+   /** the primary */
+   private String primary;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java b/source/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java
new file mode 100644
index 0000000000..e907fc388f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/data/DataPagerTag.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.data;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+
+/**
+ * @author kevinr
+ */
+public class DataPagerTag extends HtmlComponentTag
+{
+   // ------------------------------------------------------------------------------
+   // Component methods 
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.DataPager";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // UIDataPager is self rendering
+      return null;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java b/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
new file mode 100644
index 0000000000..ea9c2f1b7c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/data/RichListTag.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.data;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+
+/**
+ * @author kevinr
+ */
+public class RichListTag extends BaseComponentTag
+{
+   // ------------------------------------------------------------------------------
+   // Component methods 
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.RichList";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.RichListRenderer";
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.value = null;
+      this.var = null;
+      this.initialSortColumn = null;
+      this.initialSortDescending = null;
+      this.listConfig = null;
+      this.viewMode = null;      
+      this.style = null;
+      this.styleClass = null;
+      this.rowStyleClass = null;
+      this.altRowStyleClass = null;
+      this.headerStyleClass = null;
+      this.width = null;
+      this.pageSize = null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringBindingProperty(component, "value", this.value);
+      setStringStaticProperty(component, "var", this.var);
+      setStringProperty(component, "initialSortColumn", this.initialSortColumn);
+      setBooleanProperty(component, "initialSortDescending", this.initialSortDescending);
+      setStringProperty(component, "listConfig", this.listConfig);
+      setStringProperty(component, "viewMode", this.viewMode);
+      setStringProperty(component, "style", this.style);
+      setStringProperty(component, "styleClass", this.styleClass);
+      setStringProperty(component, "rowStyleClass", this.rowStyleClass);
+      setStringProperty(component, "altRowStyleClass", this.altRowStyleClass);
+      setStringProperty(component, "headerStyleClass", this.headerStyleClass);
+      setStringProperty(component, "width", this.width);
+      setIntProperty(component, "pageSize", this.pageSize);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean implementation 
+   
+   /**
+    * Set the viewMode
+    *
+    * @param viewMode     the viewMode
+    */
+   public void setViewMode(String viewMode)
+   {
+      this.viewMode = viewMode;
+   }
+   
+   /**
+    * Set the pageSize
+    *
+    * @param pageSize     the pageSize
+    */
+   public void setPageSize(String pageSize)
+   {
+      this.pageSize = pageSize;
+   }
+   
+   /**
+    * Set the initialSortColumn
+    *
+    * @param initialSortColumn     the initialSortColumn
+    */
+   public void setInitialSortColumn(String initialSortColumn)
+   {
+      this.initialSortColumn = initialSortColumn;
+   }
+   
+   /**
+    * Set the initialSortDescending
+    *
+    * @param initialSortDescending     the initialSortDescending
+    */
+   public void setInitialSortDescending(String initialSortDescending)
+   {
+      this.initialSortDescending = initialSortDescending;
+   }
+   
+   /**
+    * Set the listConfig
+    *
+    * @param listConfig     the listConfig
+    */
+   public void setListConfig(String listConfig)
+   {
+      this.listConfig = listConfig;
+   }
+
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Set the var
+    *
+    * @param var     the var
+    */
+   public void setVar(String var)
+   {
+      this.var = var;
+   }
+   
+   /**
+    * Set the style
+    *
+    * @param style     the style
+    */
+   public void setStyle(String style)
+   {
+      this.style = style;
+   }
+
+   /**
+    * Set the styleClass
+    *
+    * @param styleClass     the styleClass
+    */
+   public void setStyleClass(String styleClass)
+   {
+      this.styleClass = styleClass;
+   }
+   
+   /**
+    * Set the the row CSS Class
+    *
+    * @param rowStyleClass     the the row CSS Class
+    */
+   public void setRowStyleClass(String rowStyleClass)
+   {
+      this.rowStyleClass = rowStyleClass;
+   }
+
+   /**
+    * Set the alternate row CSS Class
+    *
+    * @param altRowStyleClass     the alternate row CSS Class
+    */
+   public void setAltRowStyleClass(String altRowStyleClass)
+   {
+      this.altRowStyleClass = altRowStyleClass;
+   }
+   
+   /**
+    * Set the width
+    *
+    * @param width     the width
+    */
+   public void setWidth(String width)
+   {
+      this.width = width;
+   }
+   
+   /**
+    * Set the header row CSS Class
+    *
+    * @param headerStyleClass     the header row CSS Class
+    */
+   public void setHeaderStyleClass(String headerStyleClass)
+   {
+      this.headerStyleClass = headerStyleClass;
+   }
+
+
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** the header row CSS Class */
+   private String headerStyleClass;
+   
+   /** the row CSS Class */
+   private String rowStyleClass;
+
+   /** the alternate row CSS Class */
+   private String altRowStyleClass;
+   
+   /** the style */
+   private String style;
+
+   /** the styleClass */
+   private String styleClass;
+   
+   /** the width */
+   private String width;
+
+   /** the value */
+   private String value;
+
+   /** the var */
+   private String var;
+
+   /** the viewMode */
+   private String viewMode;
+
+   /** the pageSize */
+   private String pageSize;
+
+   /** the initialSortColumn */
+   private String initialSortColumn;
+
+   /** the initialSortDescending */
+   private String initialSortDescending;
+
+   /** the listConfig */
+   private String listConfig;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java b/source/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java
new file mode 100644
index 0000000000..99c8cb10df
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/data/SortLinkTag.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.data;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author kevinr
+ */
+public class SortLinkTag extends HtmlComponentTag
+{
+   // ------------------------------------------------------------------------------
+   // Component methods 
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.SortLink";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.mode = null;
+      this.value = null;
+      this.label = null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "value", this.value);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "mode", this.mode);
+   }
+   
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Set the sorting mode (see IDataContainer constants)
+    *
+    * @param mode     the sort mode
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+
+   /** the label */
+   private String label;
+
+   /** the value */
+   private String value;
+
+   /** the sorting mode */
+   private String mode;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java
new file mode 100644
index 0000000000..81595254c2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/BaseDebugTag.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * Base class for all debug tags.
+ * 
+ * @author gavinc
+ */
+public abstract class BaseDebugTag extends HtmlComponentTag
+{
+   private String title;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "title", this.title);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.title = null;
+   }
+   
+   /**
+    * Sets the title
+    * 
+    * @param title The title
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java
new file mode 100644
index 0000000000..6cd781c0e2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/HttpApplicationStateTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the HTTP session state component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class HttpApplicationStateTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.HttpApplicationState";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java
new file mode 100644
index 0000000000..b7b032cb93
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestHeadersTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the HTTP headers component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class HttpRequestHeadersTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.HttpRequestHeaders";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java
new file mode 100644
index 0000000000..4715909748
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestParamsTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the HTTP request params component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class HttpRequestParamsTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.HttpRequestParams";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java
new file mode 100644
index 0000000000..54f711b288
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/HttpRequestStateTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the HTTP request state component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class HttpRequestStateTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.HttpRequestState";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java
new file mode 100644
index 0000000000..25883fca21
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/HttpSessionStateTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the HTTP session state component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class HttpSessionStateTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.HttpSessionState";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java b/source/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java
new file mode 100644
index 0000000000..56057ebbf2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/debug/SystemPropertiesTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.debug;
+
+
+/**
+ * Tag implementation used to place the system properties component
+ * on a page.
+ * 
+ * @author gavinc
+ */
+public class SystemPropertiesTag extends BaseDebugTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.debug.SystemProperties";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
new file mode 100644
index 0000000000..96879693cb
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionTag.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.description;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Tag class to allow the description component to be used on a JSP page
+ * 
+ * @author gavinc
+ */
+public class DescriptionTag extends BaseComponentTag
+{
+   private String controlValue;
+   private String text;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Description";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "controlValue", this.controlValue);
+      setStringProperty(component, "text", this.text);
+   }
+
+   /**
+    * @param controlValue The value of the control this description is for
+    */
+   public void setControlValue(String controlValue)
+   {
+      this.controlValue = controlValue;
+   }
+
+   /**
+    * @param text Sets the description text
+    */
+   public void setText(String text)
+   {
+      this.text = text;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.controlValue = null;
+      this.text = null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
new file mode 100644
index 0000000000..3d27e5e462
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DescriptionsTag.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.description;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Tag class to allow the descriptions component to be used on a JSP page
+ * 
+ * @author gavinc
+ */
+public class DescriptionsTag extends BaseComponentTag
+{
+   private String value;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Descriptions";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringBindingProperty(component, "value", this.value);
+   }
+
+   /**
+    * @param value Sets the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.value = null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java b/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
new file mode 100644
index 0000000000..2bd5102e0f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/description/DynamicDescriptionTag.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.description;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Tag class to allow the dynamic description component to be used on a JSP page
+ * 
+ * @author gavinc
+ */
+public class DynamicDescriptionTag extends BaseComponentTag
+{
+   private String selected;
+   private String functionName;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.DynamicDescription";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "selected", this.selected);
+      setStringStaticProperty(component, "functionName", this.functionName);
+   }
+
+   /**
+    * @param selected Sets the selected description id
+    */
+   public void setSelected(String selected)
+   {
+      this.selected = selected;
+   }
+   
+   /**
+    * @param functionName Sets the JavaScript function name
+    */
+   public void setFunctionName(String functionName)
+   {
+      this.functionName = functionName;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.selected = null;
+      this.functionName = null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java b/source/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java
new file mode 100644
index 0000000000..63d001d58d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/evaluator/BooleanEvaluatorTag.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.evaluator;
+
+/**
+ * @author kevinr
+ */
+public class BooleanEvaluatorTag extends GenericEvaluatorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.BooleanEvaluator";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java b/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
new file mode 100644
index 0000000000..9e6e67c748
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/evaluator/GenericEvaluatorTag.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.evaluator;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * @author kevinr
+ */
+public abstract class GenericEvaluatorTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public final String getRendererType()
+   {
+      // evaluator components do not use renderers 
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.value = null;
+   }
+   
+   /**
+    * Set the value to evaluate against
+    *
+    * @param value     the value to evaluate against
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /** the value to evaluate against */
+   private String value;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java b/source/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java
new file mode 100644
index 0000000000..4ea81af752
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/evaluator/StringEqualsEvaluatorTag.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.evaluator;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author kevinr
+ */
+public class StringEqualsEvaluatorTag extends GenericEvaluatorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.StringEqualsEvaluator";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "condition", this.condition);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.condition = null;
+   }
+   
+   /**
+    * Set the condition string to test value against
+    *
+    * @param condition     the condition string to test value against
+    */
+   public void setCondition(String condition)
+   {
+      this.condition = condition;
+   }
+
+
+   /** the condition string to test value against */
+   private String condition;
+}
diff --git a/source/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java b/source/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java
new file mode 100644
index 0000000000..ea7497cf37
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/common/tag/evaluator/ValueSetEvaluatorTag.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.common.tag.evaluator;
+
+/**
+ * @author kevinr
+ */
+public class ValueSetEvaluatorTag extends GenericEvaluatorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ValueSetEvaluator";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/RepoConstants.java b/source/java/org/alfresco/web/ui/repo/RepoConstants.java
new file mode 100644
index 0000000000..159e886597
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/RepoConstants.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo;
+
+/**
+ * @author Kevin Roast
+ */
+public final class RepoConstants
+{
+   public static final String ALFRESCO_FACES_SPACE_SELECTOR       = "org.alfresco.faces.SpaceSelector";
+   public static final String ALFRESCO_FACES_DATE_PICKER_RENDERER = "org.alfresco.faces.DatePickerRenderer";
+   public static final String ALFRESCO_FACES_CATEGORY_SELECTOR    = "org.alfresco.faces.CategorySelector";
+   public static final String ALFRESCO_FACES_XMLDATA_CONVERTER    = "org.alfresco.faces.XMLDataConverter";
+
+   /**
+    * Private constructor
+    */
+   private RepoConstants()
+   {
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/WebResources.java b/source/java/org/alfresco/web/ui/repo/WebResources.java
new file mode 100644
index 0000000000..322783c08e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/WebResources.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo;
+
+/**
+ * Class containing well known web resource paths for images etc.
+ * 
+ * @author Kevin Roast
+ */
+public class WebResources extends org.alfresco.web.ui.common.WebResources
+{
+   // Image paths
+   public static final String IMAGE_SPACE       = "/images/icons/space_small.gif";
+   public static final String IMAGE_CATEGORY    = "/images/icons/category_small.gif";
+   public static final String IMAGE_REMOVE      = "/images/icons/delete.gif";
+   public static final String IMAGE_COPY        = "/images/icons/copy.gif";
+   public static final String IMAGE_CUT         = "/images/icons/cut.gif";
+   public static final String IMAGE_PASTE       = "/images/icons/paste.gif";
+   public static final String IMAGE_LOCK        = "/images/icons/locked.gif";
+   public static final String IMAGE_LOCK_OWNER  = "/images/icons/locked_owner.gif";
+   public static final String IMAGE_PERSON      = "/images/icons/person.gif";
+   public static final String IMAGE_GROUP       = "/images/icons/group.gif";
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
new file mode 100644
index 0000000000..1c64e05a7c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java
@@ -0,0 +1,800 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+
+/**
+ * Abstract component to allow the selection of a hierarchical item
+ * 
+ * @author gavinc
+ */
+public abstract class AbstractItemSelector extends UIInput
+{
+   private static final String MSG_GO_UP = "go_up";
+   private static final String MSG_OK = "ok";
+   private static final String MSG_CANCEL = "cancel";
+
+   private final static String OK_BUTTON = "_ok";
+   protected final static String OPTION = "_option";
+   
+   protected final static int MODE_BEFORE_SELECTION = 0;
+   protected final static int MODE_INITIAL_SELECTION = 1;
+   protected final static int MODE_DRILLDOWN_SELECTION = 2;
+   protected final static int MODE_CONFIRM_SELECTION = 3;
+   protected final static int MODE_CANCEL_SELECTION = 4;
+   
+   /** label to be displayed before a space is selected */
+   protected String label = null;
+   
+   /** cellspacing between options */
+   protected Integer spacing = null;
+   
+   /** what mode the component is in */
+   protected int mode = MODE_BEFORE_SELECTION;
+   
+   /** currently browsing node id */
+   protected String navigationId = null;
+   
+   /** id of the initially selected item, if value is not set */
+   protected String initialSelectionId = null;
+   
+   /** Flag to show whether the component is disabled */
+   protected Boolean disabled;
+   
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * Default constructor
+    */
+   public AbstractItemSelector()
+   {
+      // set the default renderer
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public abstract String getFamily();
+   
+   /**
+    * Retrieves the default label to show if none has been defined and nothing has been selected
+    * 
+    * @return Default label
+    */
+   public abstract String getDefaultLabel();
+   
+   /**
+    * Retrieves the id of the parent node of the current navigation node
+    * 
+    * @param context The Faces context
+    * @return Id of the parent node or null if the parent is the root
+    */
+   public abstract String getParentNodeId(FacesContext context);
+   
+   /**
+    * Returns a collection of child associations for the current navigation node 
+    * 
+    * @param context The Faces context
+    * @return The children
+    */
+   public abstract Collection<ChildAssociationRef> getChildrenForNode(FacesContext context);
+   
+   /**
+    * Returns a collection of child associations of the root
+    * 
+    * @param context The Faces context
+    * @return The root options
+    */
+   public abstract Collection<ChildAssociationRef> getRootChildren(FacesContext context);
+   
+   /**
+    * @return The icon image to display next to the item links, or null for no icon 
+    */
+   public abstract String getItemIcon();
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.label = (String)values[1];
+      this.spacing = (Integer)values[2];
+      this.mode = ((Integer)values[3]).intValue();
+      this.navigationId = (String)values[4];
+      this.initialSelectionId = (String)values[5];
+      this.disabled = (Boolean)values[6];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[7];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.label;
+      values[2] = this.spacing;
+      values[3] = this.mode;
+      values[4] = this.navigationId;
+      values[5] = this.initialSelectionId;
+      values[6] = this.disabled;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      int mode = this.mode;
+      if (value != null && value.length() != 0)
+      {
+         // break up the submitted value into it's parts
+         
+         // first part is the mode the component is in
+         // followed by the id of the selection if we are drilling down
+         String id = null;
+         int sepIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         if (sepIndex != -1)
+         {
+            mode = Integer.parseInt(value.substring(0, sepIndex));
+            if (value.length() > sepIndex + 1)
+            {
+               id = value.substring(sepIndex + 1);
+            }
+         }
+         else
+         {
+            mode = Integer.parseInt(value);
+         }
+         
+         // raise an event so we can pick the changed values up later
+         ItemSelectorEvent event = new ItemSelectorEvent(this, mode, id); 
+         this.queueEvent(event);
+      }
+      
+      if (mode == MODE_CONFIRM_SELECTION)
+      {
+         // only bother to check the selection if the mode is set to MODE_AFTER_SELECTION
+         // see if a selection has been submitted
+         String selection = (String)requestMap.get(getClientId(context) + OPTION);
+         if (selection != null && selection.length() != 0)
+         {
+            ((EditableValueHolder)this).setSubmittedValue(new NodeRef(Repository.getStoreRef(), selection));
+         }
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIInput#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ItemSelectorEvent)
+      {
+         ItemSelectorEvent spaceEvent = (ItemSelectorEvent)event;
+         this.mode = spaceEvent.Mode;
+         this.navigationId = spaceEvent.Id;
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      if (isDisabled())
+      {
+         // render a read-only view of the selected category (if any)
+         ResponseWriter out = context.getResponseWriter();
+
+         // see if there is a current value for the category
+         NodeRef nodeRef = (NodeRef)getSubmittedValue();
+         if (nodeRef == null)
+         {
+            Object val = getValue();
+            if (val instanceof NodeRef) 
+            {
+               nodeRef = (NodeRef)val;
+            }
+            else if (val instanceof String && ((String)val).length() != 0)
+            {
+               nodeRef = new NodeRef((String)val);
+            }
+         }
+         
+         // if there is a value show it's name
+         if (nodeRef != null)
+         {
+            NodeService service = Repository.getServiceRegistry(context).getNodeService();
+            out.write(Repository.getNameForNode(service, nodeRef));
+         }
+      }
+      else
+      {
+         // render an editable control for selecting categories
+         String clientId = getClientId(context);
+         
+         StringBuilder buf = new StringBuilder(512);
+         Map attrs = this.getAttributes();
+         boolean showValueInHiddenField = false;
+         NodeRef value = null;
+         
+         String image = null;
+         if (getItemIcon() != null)
+         {
+            image = "<span style='padding-right:4px'>" + Utils.buildImageTag(context, getItemIcon(), null, "absmiddle") + "</span>";
+         }
+         
+         switch (this.mode)
+         {
+            case MODE_BEFORE_SELECTION:
+            case MODE_CONFIRM_SELECTION:
+            case MODE_CANCEL_SELECTION:
+            {
+               UserTransaction tx = null;
+               try
+               {
+                  tx = Repository.getUserTransaction(context, true);
+                  tx.begin();
+                  
+                  NodeRef submittedValue = (NodeRef)getSubmittedValue();
+                  if (submittedValue != null)
+                  {
+                     value = submittedValue;
+                  }
+                  else
+                  {
+                     Object val = getValue();
+                     if (val instanceof NodeRef) 
+                     {
+                        value = (NodeRef)val;
+                     }
+                     else if (val instanceof String && ((String)val).length() != 0)
+                     {
+                        value = new NodeRef((String)val);
+                     }
+                  }
+                  
+                  // show just the initial or current selection link
+                  String label;
+                  if (value == null)
+                  {
+                     label = getLabel();
+                     
+                     // if the label is still null get the default from the message bundle
+                     if (label == null)
+                     {
+                        label = getDefaultLabel();
+                     }
+                  }
+                  else
+                  {
+                     label = Repository.getNameForNode(getNodeService(context), value);
+                     showValueInHiddenField = true;
+                  }
+                  
+                  // output surrounding span for style purposes
+                  buf.append("<span");
+                  if (attrs.get("style") != null)
+                  {
+                     buf.append(" style=\"")
+                        .append(attrs.get("style"))
+                        .append('"');
+                  }
+                  if (attrs.get("styleClass") != null)
+                  {
+                     buf.append(" class=")
+                        .append(attrs.get("styleClass"));
+                  }
+                  buf.append(">");
+                  
+                  // rendering as initial selection mode means the sibilings of the selected
+                  // item are shown instead of the children on first click in.
+                  int theMode = MODE_INITIAL_SELECTION;
+                  
+                  // if we have an initial selection and no value set the initial one up
+                  if (value == null && this.getInitialSelection() != null)
+                  {
+                     value = new NodeRef(Repository.getStoreRef(), this.getInitialSelection());
+                  }
+                  
+                  // field value is whether we are picking and the current or parent Id value
+                  String fieldValue;
+                  if (value != null)
+                  {
+                     fieldValue = encodeFieldValues(theMode, value.getId());
+                  }
+                  else
+                  {
+                     fieldValue = encodeFieldValues(theMode, null);
+                  }
+                  buf.append("<a href='#' onclick=\"");
+                  buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), fieldValue));
+                  buf.append('"');
+                  if (attrs.get("nodeStyle") != null)
+                  {
+                     buf.append(" style=\"")
+                        .append(attrs.get("nodeStyle"))
+                        .append('"');
+                  }
+                  if (attrs.get("nodeStyleClass") != null)
+                  {
+                     buf.append(" class=")
+                        .append(attrs.get("nodeStyleClass"));
+                  }
+                  buf.append(">")
+                     .append(label)
+                     .append("</a></span>");
+                  
+                  tx.commit();
+               }
+               catch (Throwable err)
+               {
+                  try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+                  Utils.addErrorMessage(err.getMessage(), err);
+               }
+               
+               break;
+            }
+            
+            case MODE_DRILLDOWN_SELECTION:
+            case MODE_INITIAL_SELECTION:
+            {
+               // show the picker list
+               // get the children of the node ref to show
+               NodeService service = getNodeService(context);
+               UserTransaction tx = null;
+               try
+               {
+                  tx = Repository.getUserTransaction(context, true);
+                  tx.begin();
+                  
+                  buf.append("<table border=0 cellspacing=1 cellpadding=1");
+                  if (attrs.get("style") != null)
+                  {
+                     buf.append(" style=\"")
+                        .append(attrs.get("style"))
+                        .append('"');
+                  }
+                  if (attrs.get("styleClass") != null)
+                  {
+                     buf.append(" class=")
+                        .append(attrs.get("styleClass"));
+                  }
+                  buf.append(">");
+                  
+                  // if we are setting up the initial selection we need to get the
+                  // parent id of the initial selection so the user can actually see
+                  // the item when the list is rendered
+                  if (this.mode == MODE_INITIAL_SELECTION)
+                  {
+                     this.navigationId = getParentNodeId(context);
+                  }
+                  
+                  // render "Go Up" link
+                  if (this.navigationId != null)
+                  {
+                     // get the id of the parent node of the current navigation node,
+                     // null indicates we are at the root level
+                     String id = getParentNodeId(context);
+                     
+                     buf.append("<tr><td></td><td>");
+                     
+                     String upImage = Utils.buildImageTag(context, WebResources.IMAGE_GO_UP, null, "absmiddle");
+                     
+                     // render a link to the parent node
+                     renderNodeLink(context, id, Application.getMessage(context, MSG_GO_UP), upImage, buf);
+                     buf.append("</td></tr>");
+                  }
+                  
+                  String okButtonId = clientId + OK_BUTTON;
+                  boolean okButtonEnabled = false;
+                  
+                  // display the children of the specified navigation node ID
+                  if (this.navigationId != null)
+                  {
+                     // get a list of children for the current navigation node
+                     Collection<ChildAssociationRef> childRefs = getChildrenForNode(context);
+                     for (ChildAssociationRef childRef : childRefs)
+                     {
+                        // render each child found
+                        String childId = childRef.getChildRef().getId();
+                        buf.append("<tr><td><input type='radio' name='")
+                           .append(clientId).append(OPTION).append("' value='")
+                           .append(childId).append("'");
+                        if (childId.equals(this.initialSelectionId))
+                        {
+                           buf.append(" checked");
+                           
+                           // if any radio buttons are checked, the OK button must start enabled
+                           okButtonEnabled = true;
+                           
+                           // now remove the initial selection as we only need it the first time
+                           this.initialSelectionId = null;
+                        }
+                        buf.append(" onclick=\"javascript:document.getElementById('")
+                           .append(okButtonId)
+                           .append("').disabled=false;\"");
+                        buf.append("/></td><td>");
+                        
+                        // get the name for the child and output as link
+                        NodeRef childNodeRef = new NodeRef(Repository.getStoreRef(), childId);
+                        String name = Repository.getNameForNode(service, childNodeRef);
+                        renderNodeLink(context, childId, name, image, buf);
+                        buf.append("</td></tr>");
+                     }
+                  }
+                  else
+                  {
+                     // no node set - special case so show the root items
+                     Collection<ChildAssociationRef> childRefs = getRootChildren(context);
+                     for (ChildAssociationRef childRef : childRefs)
+                     {
+                        // render each root category found
+                        String childId = childRef.getChildRef().getId();
+                        buf.append("<tr><td><input type='radio' name='")
+                           .append(clientId).append(OPTION).append("' value='")
+                           .append(childId).append("'");
+                        if (childId.equals(this.initialSelectionId))
+                        {
+                           buf.append(" checked");
+                           
+                           // if any radio buttons are checked, the OK button must start enabled
+                           okButtonEnabled = true;
+                           
+                           // now remove the initial selection as we only need it the first time
+                           this.initialSelectionId = null;
+                        }
+                        buf.append(" onclick=\"javascript:document.getElementById('")
+                           .append(okButtonId)
+                           .append("').disabled=false;\"");
+                        buf.append("/></td><td>");
+                        
+                        // get the name for the child (rather than association name)
+                        NodeRef childNodeRef = new NodeRef(Repository.getStoreRef(), childId);
+                        String name = Repository.getNameForNode(service, childNodeRef);
+                        renderNodeLink(context, childId, name, image, buf);
+                        buf.append("</td></tr>");
+                     }
+                  }
+                  
+                  // render OK button
+                  String fieldValue = encodeFieldValues(MODE_CONFIRM_SELECTION, null);
+                  buf.append("<tr style='padding-top:4px'><td></td><td align=center>")
+                     .append("<input type='button' ")
+                     .append(okButtonEnabled == false ? "disabled" : "") 
+                     .append(" onclick=\"")
+                     .append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), fieldValue))
+                     .append("\" value='")
+                     .append(Application.getMessage(context, MSG_OK))
+                     .append("' id='")
+                     .append(okButtonId)
+                     .append("'>&nbsp;");
+                  
+                  // render Cancel button
+                  fieldValue = encodeFieldValues(MODE_CANCEL_SELECTION, null);
+                  buf.append("<input type='button' onclick=\"")
+                     .append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), fieldValue))
+                     .append("\" value='")
+                     .append(Application.getMessage(context, MSG_CANCEL))
+                     .append("'></td></tr>");
+                  
+                  buf.append("</table>");
+                  
+                  tx.commit();
+               }
+               catch (Throwable err)
+               {
+                  try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+                  throw new RuntimeException(err);
+               }
+               
+               break;
+            }
+         }
+         
+         // output a hidden field containing the currently selected NodeRef so that JavaScript
+         // can be used to check the state of the component
+         buf.append("<input type='hidden' name='");
+         buf.append(clientId);
+         buf.append("_selected' id='");
+         buf.append(clientId);
+         buf.append("_selected' value='");
+         if (showValueInHiddenField)
+         {
+            buf.append(value);
+         }
+         buf.append("'/>");
+         
+         context.getResponseWriter().write(buf.toString());
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.label;
+   }
+   
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * @return Returns the cell spacing value between space options. Default is 2.
+    */
+   public Integer getSpacing()
+   {
+      ValueBinding vb = getValueBinding("spacing");
+      if (vb != null)
+      {
+         this.spacing = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      if (this.spacing != null)
+      {
+         return this.spacing.intValue();
+      }
+      else
+      {
+         // return default
+         return 2;
+      }
+   }
+   
+   /**
+    * @param spacing The spacing to set.
+    */
+   public void setSpacing(Integer spacing)
+   {
+      this.spacing = spacing;
+   }
+   
+   /**
+    * @return Returns the initial selecttion.
+    */
+   public String getInitialSelection()
+   {
+      ValueBinding vb = getValueBinding("initialSelection");
+      if (vb != null)
+      {
+         this.initialSelectionId = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.initialSelectionId;
+   }
+   
+   /**
+    * @param initialSelection The initial selection to set.
+    */
+   public void setInitialSelection(String initialSelection)
+   {
+      this.initialSelectionId = initialSelection;
+   }
+   
+   /**
+    * Determines whether the component should be rendered in a disabled state
+    * 
+    * @return Returns whether the component is disabled
+    */
+   public boolean isDisabled()
+   {
+      if (this.disabled == null)
+      {
+         ValueBinding vb = getValueBinding("disabled");
+         if (vb != null)
+         {
+            this.disabled = (Boolean)vb.getValue(getFacesContext());
+         }
+      }
+      
+      if (this.disabled == null)
+      {
+         this.disabled = Boolean.FALSE;
+      }
+      
+      return this.disabled;
+   }
+
+   /**
+    * Determines whether the component should be rendered in a disabled state
+    * 
+    * @param disabled true to disable the component
+    */
+   public void setDisabled(boolean disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Protected helpers
+   
+   /**
+    * We use a unique hidden field name based on our client Id.
+    * This is on the assumption that there won't be many selectors on screen at once!
+    * Also means we have less values to decode on submit.
+    * 
+    * @return hidden field name
+    */
+   protected String getHiddenFieldName()
+   {
+      return this.getClientId(getFacesContext());
+   }
+   
+   protected String encodeFieldValues(int mode, String id)
+   {
+      if (id != null)
+      {
+         return Integer.toString(mode) + NamingContainer.SEPARATOR_CHAR + id;
+      }
+      else
+      {
+         return Integer.toString(mode);
+      }
+   }
+   
+   /**
+    * Render a node descendant as a clickable link
+    * 
+    * @param context    FacesContext
+    * @param childRef   The ChildAssocRef of the child to render an HTML link for
+    *  
+    * @return HTML for a descendant link
+    */
+   protected String renderNodeLink(FacesContext context, String id, String name, String prefix, StringBuilder buf)
+   {
+      buf.append("<a href='#' onclick=\"");
+      String fieldValue = encodeFieldValues(MODE_DRILLDOWN_SELECTION, id);
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), fieldValue));
+      buf.append('"');
+      Map attrs = this.getAttributes();
+      if (attrs.get("nodeStyle") != null)
+      {
+         buf.append(" style=\"")
+            .append(attrs.get("nodeStyle"))
+            .append('"');
+      }
+      if (attrs.get("nodeStyleClass") != null)
+      {
+         buf.append(" class=")
+            .append(attrs.get("nodeStyleClass"));
+      }
+      buf.append('>');
+      
+      if (prefix != null)
+      {
+         buf.append(prefix);
+      }
+      buf.append(Utils.encode(name));
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Node Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Node Service bean instance or throws exception if not found
+    */
+   protected static NodeService getNodeService(FacesContext context)
+   {
+      NodeService service = Repository.getServiceRegistry(context).getNodeService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain NodeService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Dictionary Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Dictionary Service bean instance or throws exception if not found
+    */
+   protected static DictionaryService getDictionaryService(FacesContext context)
+   {
+      DictionaryService service = Repository.getServiceRegistry(context).getDictionaryService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain DictionaryService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   /**
+    * Class representing the clicking of a breadcrumb element.
+    */
+   public static class ItemSelectorEvent extends ActionEvent
+   {
+      public ItemSelectorEvent(UIComponent component, int mode, String id)
+      {
+         super(component);
+         Mode = mode;
+         Id = id;
+      }
+      
+      public int Mode;
+      private String Id;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java b/source/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java
new file mode 100644
index 0000000000..0ca8c142b1
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/IRepoBreadcrumbHandler.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
+
+/**
+ * @author Kevin Roast
+ */
+public interface IRepoBreadcrumbHandler extends IBreadcrumbHandler
+{
+   /**
+    * Return a NodeRef relevant to this breadcrumb element, if any 
+    * 
+    * @return a NodeRef if relevant to the breadcrumb element, null otherwise
+    */
+   public NodeRef getNodeRef();
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java b/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java
new file mode 100644
index 0000000000..e50486a2f4
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.util.Collection;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.CategoryService;
+import org.alfresco.service.cmr.search.CategoryService.Depth;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * Component to allow the selection of a category
+ * 
+ * @author gavinc
+ */
+public class UICategorySelector extends AbstractItemSelector
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.CategorySelector";
+   }
+   
+   /**
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getDefaultLabel()
+    */
+   public String getDefaultLabel()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), "select_category_prompt");
+   }
+
+   /**
+    * Use Spring JSF integration to return the category service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return category service bean instance or throws runtime exception if not found
+    */
+   private static CategoryService getCategoryService(FacesContext context)
+   {
+      CategoryService service = Repository.getServiceRegistry(context).getCategoryService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain CategoryService bean reference.");
+      }
+      
+      return service;
+   }
+
+   /**
+    * Returns the parent id of the current category, or null if the parent has the category root type
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getParentNodeId(javax.faces.context.FacesContext)
+    */
+   public String getParentNodeId(FacesContext context)
+   {
+      String id = null;
+      
+      if (this.navigationId != null)
+      {
+         ChildAssociationRef parentRef = getNodeService(context).getPrimaryParent(
+               new NodeRef(Repository.getStoreRef(), this.navigationId));
+         Node parentNode = new Node(parentRef.getParentRef());
+         
+         DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
+         
+         if (dd.isSubClass(parentNode.getType(), ContentModel.TYPE_CATEGORYROOT) == false)
+         {
+            id = parentRef.getParentRef().getId();
+         }
+      }
+      
+      return id;
+   }
+
+   /**
+    * Returns the child categories of the current navigation node
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getChildrenForNode(javax.faces.context.FacesContext)
+    */
+   public Collection<ChildAssociationRef> getChildrenForNode(FacesContext context)
+   {
+      NodeRef nodeRef = new NodeRef(Repository.getStoreRef(), this.navigationId);
+      
+      Collection<ChildAssociationRef> childRefs = getCategoryService(context).getChildren(nodeRef, 
+            CategoryService.Mode.SUB_CATEGORIES, CategoryService.Depth.IMMEDIATE);
+      
+      return childRefs;
+   }
+
+   /**
+    * Returns the root categories
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getRootChildren(javax.faces.context.FacesContext)
+    */
+   public Collection<ChildAssociationRef> getRootChildren(FacesContext context)
+   {
+      return getCategoryService(context).getCategories(Repository.getStoreRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE, Depth.IMMEDIATE);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getItemIcon()
+    */
+   public String getItemIcon()
+   {
+      return WebResources.IMAGE_CATEGORY;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java b/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java
new file mode 100644
index 0000000000..53b8102c1b
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UILockIcon.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UILockIcon extends SelfRenderingComponent
+{
+   private static final String MSG_LOCKED_YOU  = "locked_you";
+   private static final String MSG_LOCKED_USER = "locked_user";
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.LockIcon";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.lockImage = (String)values[1];
+      this.lockOwnerImage = (String)values[2];
+      this.align = (String)values[3];
+      this.width = ((Integer)values[4]).intValue();
+      this.height = ((Integer)values[5]).intValue();
+      this.value = values[6];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[7];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.lockImage;
+      values[2] = this.lockOwnerImage;
+      values[3] = this.align;
+      values[4] = this.width;
+      values[5] = this.height;
+      values[6] = this.value;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // get the value and see if the image is locked
+      NodeService nodeService = getNodeService(context);
+      boolean locked = false;
+      boolean lockedOwner = false;
+      
+      Object val = getValue();
+      NodeRef ref = null;
+      if (val instanceof NodeRef)
+      {
+         ref = (NodeRef)val;
+         if (nodeService.exists(ref) && nodeService.hasAspect(ref, ContentModel.ASPECT_LOCKABLE) == true)
+         {
+            LockStatus lockStatus = getLockService(context).getLockStatus(ref);
+            locked = (lockStatus == LockStatus.LOCKED || lockStatus == LockStatus.LOCK_OWNER);
+            lockedOwner = (lockStatus == LockStatus.LOCK_OWNER);
+         }
+      }
+      
+      String msg = null;
+      
+      if (locked == true)
+      {
+         out.write("&nbsp;<img");
+         
+         outputAttribute(out, getAttributes().get("style"), "style");
+         outputAttribute(out, getAttributes().get("styleClass"), "class");
+         
+         outputAttribute(out, getAlign(), "align");
+         outputAttribute(out, getWidth(), "width");
+         outputAttribute(out, getHeight(), "height");
+         
+         out.write("src=\"");
+         out.write(context.getExternalContext().getRequestContextPath());
+         String lockImage = getLockImage();
+         if (lockedOwner == true && getLockOwnerImage() != null)
+         {
+            lockImage = getLockOwnerImage();
+         }
+         out.write(lockImage);
+         out.write("\" border=0");
+         
+         if (lockedOwner == true)
+         {
+            msg = Application.getMessage(context, MSG_LOCKED_YOU);
+            if (getLockedOwnerTooltip() != null)
+            {
+               msg = getLockedOwnerTooltip();
+            }
+         }
+         else
+         {
+            String lockingUser = (String)nodeService.getProperty(ref, ContentModel.PROP_LOCK_OWNER);
+            msg = Application.getMessage(context, MSG_LOCKED_USER);
+            if (getLockedUserTooltip() != null)
+            {
+               msg = getLockedUserTooltip();
+            }
+            StringBuilder buf = new StringBuilder(32);
+            msg = buf.append(msg).append(" '")
+                     .append(lockingUser)
+                     .append("'").toString();
+         }
+         
+         msg = Utils.encode(msg);
+         out.write(" alt=\"");
+         out.write(msg);
+         out.write("\" title=\"");
+         out.write(msg);
+         out.write("\">");
+      }
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Node Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Node Service bean instance or throws exception if not found
+    */
+   private static NodeService getNodeService(FacesContext context)
+   {
+      NodeService service = Repository.getServiceRegistry(context).getNodeService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain NodeService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Lock Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Lock Service bean instance or throws exception if not found
+    */
+   private static LockService getLockService(FacesContext context)
+   {
+      LockService service = Repository.getServiceRegistry(context).getLockService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain LockService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * @return the image to display as the lock icon. A default is provided if none is set.
+    */
+   public String getLockImage()
+   {
+      ValueBinding vb = getValueBinding("lockImage");
+      if (vb != null)
+      {
+         this.lockImage = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.lockImage;
+   }
+   
+   /**
+    * @param lockImage     the image to display as the lock icon. A default is provided if none is set.
+    */
+   public void setLockImage(String lockImage)
+   {
+      this.lockImage = lockImage;
+   }
+   
+   /**
+    * @return Returns the image to display if the owner has the lock.
+    */
+   public String getLockOwnerImage()
+   {
+      ValueBinding vb = getValueBinding("lockOwnerImage");
+      if (vb != null)
+      {
+         this.lockOwnerImage = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.lockOwnerImage;
+   }
+
+   /**
+    * @param lockOwnerImage     the image to display if the owner has the lock.
+    */
+   public void setLockOwnerImage(String lockOwnerImage)
+   {
+      this.lockOwnerImage = lockOwnerImage;
+   }
+   
+   /**
+    * @return Returns the image alignment value.
+    */
+   public String getAlign()
+   {
+      ValueBinding vb = getValueBinding("align");
+      if (vb != null)
+      {
+         this.align = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.align;
+   }
+
+   /**
+    * @param align      The image alignment value to set.
+    */
+   public void setAlign(String align)
+   {
+      this.align = align;
+   }
+
+   /**
+    * @return Returns the icon height.
+    */
+   public int getHeight()
+   {
+      ValueBinding vb = getValueBinding("height");
+      if (vb != null)
+      {
+         Integer value = (Integer)vb.getValue(getFacesContext());
+         if (value != null)
+         {
+            this.height = value.intValue();
+         }
+      }
+      
+      return this.height;
+   }
+
+   /**
+    * @param height         The icon height to set.
+    */
+   public void setHeight(int height)
+   {
+      this.height = height;
+   }
+   
+   /**
+    * @return Returns the icon width.
+    */
+   public int getWidth()
+   {
+      ValueBinding vb = getValueBinding("width");
+      if (vb != null)
+      {
+         Integer value = (Integer)vb.getValue(getFacesContext());
+         if (value != null)
+         {
+            this.width = value.intValue();
+         }
+      }
+      
+      return this.width;
+   }
+
+   /**
+    * @param width      The iconwidth to set.
+    */
+   public void setWidth(int width)
+   {
+      this.width = width;
+   }
+
+   /**
+    * @return Returns the lockedOwnerTooltip.
+    */
+   public String getLockedOwnerTooltip()
+   {
+      ValueBinding vb = getValueBinding("lockedOwnerTooltip");
+      if (vb != null)
+      {
+         this.lockedOwnerTooltip = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.lockedOwnerTooltip;
+   }
+
+   /**
+    * @param lockedOwnerTooltip The lockedOwnerTooltip to set.
+    */
+   public void setLockedOwnerTooltip(String lockedOwnerTooltip)
+   {
+      this.lockedOwnerTooltip = lockedOwnerTooltip;
+   }
+
+   /**
+    * @return Returns the lockedUserTooltip.
+    */
+   public String getLockedUserTooltip()
+   {
+      ValueBinding vb = getValueBinding("lockedUserTooltip");
+      if (vb != null)
+      {
+         this.lockedUserTooltip = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.lockedUserTooltip;
+   }
+
+   /**
+    * @param lockedUserTooltip The lockedUserTooltip to set.
+    */
+   public void setLockedUserTooltip(String lockedUserTooltip)
+   {
+      this.lockedUserTooltip = lockedUserTooltip;
+   }
+   
+   /**
+    * @return Returns the value (Node or NodeRef)
+    */
+   public Object getValue()
+   {
+      ValueBinding vb = getValueBinding("value");
+      if (vb != null)
+      {
+         this.value = vb.getValue(getFacesContext());
+      }
+      
+      return this.value;
+   }
+
+   /**
+    * @param value The Node or NodeRef value to set.
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+   
+   
+   private String lockImage = WebResources.IMAGE_LOCK;
+   private String lockOwnerImage = WebResources.IMAGE_LOCK_OWNER;
+   private String align = null;
+   private int width = 16;
+   private int height = 16;
+   private String lockedOwnerTooltip = null;
+   private String lockedUserTooltip = null;
+   private Object value = null;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java b/source/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java
new file mode 100644
index 0000000000..d5f7944341
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UIMultiValueEditor.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.app.Application;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * This component wraps a standard component to give it multi value capabilities.
+ * 
+ * A list of existing values are available, items can be removed from this list
+ * or new items added to the list. To add new items the component dynamically
+ * shows the child component this one wraps. 
+ * 
+ * @author gavinc
+ */
+public class UIMultiValueEditor extends UIInput
+{
+   private static final Log logger = LogFactory.getLog(UIMultiValueEditor.class);
+   private static final String MSG_SELECTED_ITEMS = "selected_items";
+   private static final String MSG_NO_SELECTED_ITEMS = "no_selected_items";
+   private static final String MSG_SELECT_ITEM = "select_an_item";
+   
+   
+   public final static String ACTION_SEPARATOR = ";";
+   public final static int ACTION_NONE   = -1;
+   public final static int ACTION_REMOVE = 0;
+   public final static int ACTION_SELECT = 1;
+   public final static int ACTION_ADD = 2;
+   
+   private Boolean addingNewItem = Boolean.FALSE;
+   private Boolean readOnly;
+   private Object lastItemAdded;
+   private String selectItemMsg;
+   private String selectedItemsMsg;
+   private String noSelectedItemsMsg;
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * Default constructor
+    */
+   public UIMultiValueEditor()
+   {
+      setRendererType("org.alfresco.faces.List");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.MultiValueEditor";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.lastItemAdded = values[1];
+      this.readOnly = (Boolean)values[2];
+      this.addingNewItem = (Boolean)values[3];
+      this.selectItemMsg = (String)values[4];
+      this.selectedItemsMsg = (String)values[5];
+      this.noSelectedItemsMsg = (String)values[6];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[7];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.lastItemAdded;
+      values[2] = this.readOnly;
+      values[3] = this.addingNewItem;
+      values[4] = this.selectItemMsg;
+      values[5] = this.selectedItemsMsg;
+      values[6] = this.noSelectedItemsMsg;
+      return (values);
+   }
+
+   /**
+    * Returns the last item added by the user
+    * 
+    * @return The last item added
+    */
+   public Object getLastItemAdded()
+   {
+      ValueBinding vb = getValueBinding("lastItemAdded");
+      if (vb != null)
+      {
+         this.lastItemAdded = vb.getValue(getFacesContext());
+      }
+      
+      return this.lastItemAdded;
+   }
+
+   /**
+    * Sets the last item to be added by the user
+    * 
+    * @param lastItemAdded The last item added
+    */
+   public void setLastItemAdded(Object lastItemAdded)
+   {
+      this.lastItemAdded = lastItemAdded;
+   }
+   
+   /**
+    * Returns the message to display for the selected items, if one hasn't been
+    * set it defaults to the message in the bundle under key 'selected_items'.
+    * 
+    * @return The message
+    */
+   public String getSelectedItemsMsg()
+   {
+      ValueBinding vb = getValueBinding("selectedItemsMsg");
+      if (vb != null)
+      {
+         this.selectedItemsMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.selectedItemsMsg == null)
+      {
+         this.selectedItemsMsg = Application.getMessage(getFacesContext(), MSG_SELECTED_ITEMS);
+      }
+      
+      return this.selectedItemsMsg;
+   }
+
+   /**
+    * Sets the selected items message to display in the UI
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectedItemsMsg(String selectedItemsMsg)
+   {
+      this.selectedItemsMsg = selectedItemsMsg;
+   }
+   
+   /**
+    * Returns the message to display when no items have been selected, if one hasn't been
+    * set it defaults to the message in the bundle under key 'no_selected_items'.
+    * 
+    * @return The message
+    */
+   public String getNoSelectedItemsMsg()
+   {
+      ValueBinding vb = getValueBinding("noSelectedItemsMsg");
+      if (vb != null)
+      {
+         this.noSelectedItemsMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.noSelectedItemsMsg == null)
+      {
+         this.noSelectedItemsMsg = Application.getMessage(getFacesContext(), MSG_NO_SELECTED_ITEMS);
+      }
+      
+      return this.noSelectedItemsMsg;
+   }
+
+   /**
+    * Sets the no selected items message to display in the UI
+    * 
+    * @param noSelectedItemsMsg The message
+    */
+   public void setNoSelectedItemsMsg(String noSelectedItemsMsg)
+   {
+      this.noSelectedItemsMsg = noSelectedItemsMsg;
+   }
+
+   /**
+    * Returns the message to display for select an item, if one hasn't been
+    * set it defaults to the message in the bundle under key 'select_an_item'.
+    * 
+    * @return The message
+    */
+   public String getSelectItemMsg()
+   {
+      ValueBinding vb = getValueBinding("selectItemMsg");
+      if (vb != null)
+      {
+         this.selectItemMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.selectItemMsg == null)
+      {
+         this.selectItemMsg = Application.getMessage(getFacesContext(), MSG_SELECT_ITEM);
+      }
+      
+      return this.selectItemMsg;
+   }
+
+   /**
+    * Sets the select an item message to display in the UI
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectItemMsg(String selectItemMsg)
+   {
+      this.selectItemMsg = selectItemMsg;
+   }
+
+   /**
+    * Determines whether the component is in read only mode
+    * 
+    * @return true if the component is in read only mode
+    */
+   public boolean getReadOnly()
+   {
+      ValueBinding vb = getValueBinding("readOnly");
+      if (vb != null)
+      {
+         this.readOnly = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.readOnly == null)
+      {
+         this.readOnly = Boolean.FALSE;
+      }
+      
+      return this.readOnly.booleanValue();
+   }
+
+   /**
+    * Sets the read only mode for the component
+    * 
+    * @param readOnly true to set read only mode
+    */
+   public void setReadOnly(boolean readOnly)
+   {
+      this.readOnly = Boolean.valueOf(readOnly);
+   }
+   
+   /**
+    * Determines whether the component is adding a new item
+    * 
+    * @return true if we are adding a new item
+    */
+   public boolean getAddingNewItem()
+   {
+      return this.addingNewItem.booleanValue();
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof MultiValueEditorEvent)
+      {
+         MultiValueEditorEvent assocEvent = (MultiValueEditorEvent)event;
+         List items = (List)getValue();
+         
+         switch (assocEvent.Action)
+         {
+            case ACTION_SELECT:
+            {
+               this.addingNewItem = Boolean.TRUE;
+               break;
+            }
+            case ACTION_ADD:
+            {
+               if (items == null)
+               {
+                  items = new ArrayList();
+                  setSubmittedValue(items);
+               }
+               
+               items.add(getLastItemAdded());
+               this.addingNewItem = Boolean.FALSE;
+               
+               // get hold of the value binding for the lastItemAdded property
+               // and set it to null to show it's been added to the list
+               ValueBinding vb = getValueBinding("lastItemAdded");
+               if (vb != null)
+               {
+                  vb.setValue(FacesContext.getCurrentInstance(), null);
+               }
+               
+               break;
+            }
+            case ACTION_REMOVE:
+            {
+               items.remove(assocEvent.RemoveIndex);
+               break;
+            }
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   
+   /**
+    * @see javax.faces.component.UIComponent#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      // only show the wrapped component when the add button has been clicked 
+      
+      return !this.addingNewItem.booleanValue();
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing an action relevant to the ChildAssociationEditor component.
+    */
+   public static class MultiValueEditorEvent extends ActionEvent
+   {
+      public int Action;
+      public int RemoveIndex;
+      
+      public MultiValueEditorEvent(UIComponent component, int action, int removeIndex)
+      {
+         super(component);
+         this.Action = action;
+         this.RemoveIndex = removeIndex;
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java b/source/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java
new file mode 100644
index 0000000000..0a83fdae5d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UINodeDescendants.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Kevin Roast
+ */
+public class UINodeDescendants extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Construction
+   
+   /**
+    * Default constructor
+    */
+   public UINodeDescendants()
+   {
+      setRendererType("org.alfresco.faces.NodeDescendantsLinkRenderer");
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.NodeDescendants";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.maxChildren = (Integer)values[1];
+      this.showEllipses = (Boolean)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.maxChildren;
+      values[2] = this.showEllipses;
+      return (values);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors
+   
+   /**
+    * @return the maximum number of child descendants to be displayed, default maximum is 3. 
+    */
+   public int getMaxChildren()
+   {
+      ValueBinding vb = getValueBinding("maxChildren");
+      if (vb != null)
+      {
+         this.maxChildren = (Integer)vb.getValue(getFacesContext());
+      }
+      
+      if (this.maxChildren != null)
+      {
+         return this.maxChildren.intValue();
+      }
+      else
+      {
+         // return default
+         return 3;
+      }
+   }
+   
+   /**
+    * @param value      The maximum allowed before the no more links are shown
+    */
+   public void setMaxChildren(int value)
+   {
+      if (value > 0 && value <= 256)
+      {
+         this.maxChildren = Integer.valueOf(value);
+      }
+   }
+   
+   /**
+    * @return whether to show ellipses "..." if more descendants than the maxChildren value are found
+    */
+   public boolean getShowEllipses()
+   {
+      ValueBinding vb = getValueBinding("showEllipses");
+      if (vb != null)
+      {
+         this.showEllipses = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.showEllipses != null)
+      {
+         return this.showEllipses.booleanValue();
+      }
+      else
+      {
+         // return default
+         return true;
+      }
+   }
+   
+   /**
+    * @param showLink      True to show ellipses "..." if more descendants than maxChildren are found
+    */
+   public void setShowEllipses(boolean showEllipses)
+   {
+      this.showEllipses = Boolean.valueOf(showEllipses);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the clicking of a node descendant element.
+    */
+   public static class NodeSelectedEvent extends ActionEvent
+   {
+      public NodeSelectedEvent(UIComponent component, NodeRef nodeRef, boolean isParent)
+      {
+         super(component);
+         this.NodeReference = nodeRef;
+         this.IsParent = isParent;
+      }
+      
+      public NodeRef NodeReference;
+      public boolean IsParent;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** maximum number of child descendants to display */
+   private Integer maxChildren = null;
+   
+   /** whether to show ellipses if more descendants than the maxChildren are found */
+   private Boolean showEllipses = null;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodePath.java b/source/java/org/alfresco/web/ui/repo/component/UINodePath.java
new file mode 100644
index 0000000000..8f748e80e2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UINodePath.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Kevin Roast
+ */
+public class UINodePath extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Construction
+   
+   /**
+    * Default constructor
+    */
+   public UINodePath()
+   {
+      setRendererType("org.alfresco.faces.NodePathLinkRenderer");
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.NodePath";
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the clicking of a part of the path element.
+    */
+   public static class PathElementEvent extends ActionEvent
+   {
+      public PathElementEvent(UIComponent component, NodeRef nodeRef)
+      {
+         super(component);
+         this.NodeReference = nodeRef;
+      }
+      
+      public NodeRef NodeReference;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
new file mode 100644
index 0000000000..5cb64a267f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIPanel;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryException;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.config.ClientConfigElement.CustomProperty;
+import org.alfresco.web.ui.common.ComponentConstants;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.alfresco.web.ui.repo.RepoConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * @author Kevin Roast
+ */
+public class UISearchCustomProperties extends SelfRenderingComponent implements NamingContainer
+{
+   public static final String PREFIX_DATE_TO    = "to_";
+   public static final String PREFIX_DATE_FROM  = "from_";
+   
+   private static final String MSG_TO   = "to";
+   private static final String MSG_FROM = "from";
+   
+   private static Log logger = LogFactory.getLog(UISearchCustomProperties.class);
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.AdvancedSearch";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      if (getChildCount() == 0)
+      {
+         createComponentsFromConfig(context);
+      }
+      
+      // encode the components in a 2 column table
+      out.write("<table cellspacing=2 cellpadding=2 border=0");
+      outputAttribute(out, getAttributes().get("styleClass"), "class");
+      outputAttribute(out, getAttributes().get("style"), "style");
+      out.write('>');
+      List<UIComponent> children = getChildren();
+      int colCounter = 0;
+      for (int i=0; i<children.size(); i++)
+      {
+         UIComponent component = children.get(i);
+         if (component instanceof UIPanel)
+         {
+            out.write("<tr><td colspan=2>");
+            Utils.encodeRecursive(context, component);
+            out.write("</td></tr>");
+            colCounter += 2;
+         }
+         else
+         {
+            if ((colCounter & 1) == 0)
+            {
+               out.write("<tr>");
+            }
+            out.write("<td>");
+            Utils.encodeRecursive(context, component);
+            out.write("</td>");
+            if ((colCounter & 1) == 1)
+            {
+               out.write("</tr>");
+            }
+            colCounter++;
+         }
+      }
+      out.write("</table>");
+   }
+   
+   /**
+    * Build the components from the Advanced Search config entries
+    * 
+    * @param context FacesContext
+    */
+   private void createComponentsFromConfig(FacesContext context)
+   {
+      DictionaryService dd = Repository.getServiceRegistry(context).getDictionaryService();
+      ConfigService configService = Application.getConfigService(context);
+      ClientConfigElement clientConfig = (ClientConfigElement)configService.getGlobalConfig().getConfigElement(
+            ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      // create an appropriate component for each custom property
+      // using the DataDictionary to look-up labels and value types
+      String beanBinding = (String)getAttributes().get("bean") + '.' + (String)getAttributes().get("var");
+      List<CustomProperty> props = clientConfig.getCustomProperties();
+      if (props != null)
+      {
+         for (CustomProperty property : props)
+         {
+            try
+            {
+               // try to find the Property definition for the specified Type or Aspect
+               PropertyDefinition propDef = null;
+               if (property.Type != null)
+               {
+                  QName type = Repository.resolveToQName(property.Type);
+                  TypeDefinition typeDef = dd.getType(type);
+                  propDef = typeDef.getProperties().get(Repository.resolveToQName(property.Property));
+               }
+               else if (property.Aspect != null)
+               {
+                  QName aspect = Repository.resolveToQName(property.Aspect);
+                  AspectDefinition aspectDef = dd.getAspect(aspect);
+                  propDef = aspectDef.getProperties().get(Repository.resolveToQName(property.Property));
+               }
+               
+               // if we found a def, then we can build components to represent it
+               if (propDef != null)
+               {
+                  // TODO: add display label I18N message support to configelement and here
+                  String label = propDef.getTitle() != null ? propDef.getTitle() : propDef.getName().getLocalName();
+                  
+                  // special handling for Date and DateTime
+                  DataTypeDefinition dataTypeDef = propDef.getDataType();
+                  if (DataTypeDefinition.DATE.equals(dataTypeDef.getName()) || DataTypeDefinition.DATETIME.equals(dataTypeDef.getName()))
+                  {
+                     getChildren().add( generateControl(context, propDef, label, beanBinding) );
+                  }
+                  else
+                  {
+                     getChildren().add( generateLabel(context, label) );
+                     getChildren().add( generateControl(context, propDef, null, beanBinding) );
+                  }
+               }
+            }
+            catch (DictionaryException ddErr)
+            {
+               logger.warn("Error building custom properties for Advanced Search: " + ddErr.getMessage());
+            }
+         }
+      }
+   }
+   
+   /**
+    * Generates a JSF OutputText component/renderer
+    * 
+    * @param context JSF context
+    * @param displayLabel The display label text
+    * @param parent The parent component for the label
+    * 
+    * @return UIComponent
+    */
+   private UIComponent generateLabel(FacesContext context, String displayLabel)
+   {
+      UIOutput label = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+      label.setId(context.getViewRoot().createUniqueId());
+      label.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+      label.setValue(displayLabel + ": ");
+      return label;
+   }
+   
+   /**
+    * Generates an appropriate control for the given property
+    * 
+    * @param context       JSF context
+    * @param propDef       The definition of the property to create the control for
+    * @param displayLabel  Display label for the component
+    * @param beanBinding   Combined name of the value bound bean and variable used for value binding expression
+    * 
+    * @return UIComponent
+    */
+   private UIComponent generateControl(FacesContext context, PropertyDefinition propDef, String displayLabel, String beanBinding)
+   {
+      UIComponent control = null;
+      
+      DataTypeDefinition dataTypeDef = propDef.getDataType();
+      QName typeName = dataTypeDef.getName();
+      
+      javax.faces.application.Application facesApp = context.getApplication();
+      
+      // create default value binding to a Map of values with a defined name
+      ValueBinding vb = facesApp.createValueBinding(
+            "#{" + beanBinding + "[\"" + propDef.getName().toString() + "\"]}");
+      
+      // generate the appropriate input field
+      if (typeName.equals(DataTypeDefinition.BOOLEAN))
+      {
+         control = (UISelectBoolean)facesApp.createComponent(ComponentConstants.JAVAX_FACES_SELECT_BOOLEAN);
+         control.setRendererType(ComponentConstants.JAVAX_FACES_CHECKBOX);
+         control.setValueBinding("value", vb);
+      }
+      else if (typeName.equals(DataTypeDefinition.CATEGORY))
+      {
+         control = (UICategorySelector)facesApp.createComponent(RepoConstants.ALFRESCO_FACES_CATEGORY_SELECTOR);
+         control.setValueBinding("value", vb);
+      }
+      else if (typeName.equals(DataTypeDefinition.DATETIME) || typeName.equals(DataTypeDefinition.DATE))
+      {
+         Boolean showTime = Boolean.valueOf(typeName.equals(DataTypeDefinition.DATETIME));
+         
+         // Need to output component for From and To date selectors and labels
+         // also neeed checkbox for enable/disable state - requires an outer wrapper component
+         control = (UIPanel)facesApp.createComponent(ComponentConstants.JAVAX_FACES_PANEL);
+         control.setRendererType(ComponentConstants.JAVAX_FACES_GRID);
+         control.getAttributes().put("columns", Integer.valueOf(2));
+         
+         // enabled state checkbox
+         UIInput checkbox = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_SELECT_BOOLEAN);
+         checkbox.setRendererType(ComponentConstants.JAVAX_FACES_CHECKBOX);
+         checkbox.setId(context.getViewRoot().createUniqueId());
+         ValueBinding vbCheckbox = facesApp.createValueBinding(
+            "#{" + beanBinding + "[\"" + propDef.getName().toString() + "\"]}");
+         checkbox.setValueBinding("value", vbCheckbox);
+         control.getChildren().add(checkbox);
+         
+         // main display label
+         UIOutput label = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+         label.setId(context.getViewRoot().createUniqueId());
+         label.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         label.setValue(displayLabel + ":");
+         control.getChildren().add(label);
+         
+         // from date label
+         UIOutput labelFromDate = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+         labelFromDate.setId(context.getViewRoot().createUniqueId());
+         labelFromDate.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         labelFromDate.setValue(Application.getMessage(context, MSG_FROM));
+         control.getChildren().add(labelFromDate);
+         
+         // from date control
+         UIInput inputFromDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+         inputFromDate.setId(context.getViewRoot().createUniqueId());
+         inputFromDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
+         inputFromDate.getAttributes().put("startYear", new Integer(1970));
+         inputFromDate.getAttributes().put("yearCount", new Integer(50));
+         inputFromDate.getAttributes().put("showTime", showTime);
+         ValueBinding vbFromDate = facesApp.createValueBinding(
+            "#{" + beanBinding + "[\"" + PREFIX_DATE_FROM + propDef.getName().toString() + "\"]}");
+         inputFromDate.setValueBinding("value", vbFromDate);
+         control.getChildren().add(inputFromDate);
+         
+         // to date label
+         UIOutput labelToDate = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+         labelToDate.setId(context.getViewRoot().createUniqueId());
+         labelToDate.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         labelToDate.setValue(Application.getMessage(context, MSG_TO));
+         control.getChildren().add(labelToDate);
+         
+         // to date control
+         UIInput inputToDate = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+         inputToDate.setId(context.getViewRoot().createUniqueId());
+         inputToDate.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
+         inputToDate.getAttributes().put("startYear", new Integer(1970));
+         inputToDate.getAttributes().put("yearCount", new Integer(50));
+         inputToDate.getAttributes().put("showTime", showTime);
+         ValueBinding vbToDate = facesApp.createValueBinding(
+            "#{" + beanBinding + "[\"" + PREFIX_DATE_TO + propDef.getName().toString() + "\"]}");
+         inputToDate.setValueBinding("value", vbToDate);
+         control.getChildren().add(inputToDate);
+      }
+      else if (typeName.equals(DataTypeDefinition.NODE_REF))
+      {
+         control = (UISpaceSelector)facesApp.createComponent(RepoConstants.ALFRESCO_FACES_SPACE_SELECTOR);
+         control.setValueBinding("value", vb);
+      }
+      else
+      {
+         // any other type is represented as an input text field
+         control = (UIInput)facesApp.createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+         control.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         control.getAttributes().put("size", "28");
+         control.getAttributes().put("maxlength", "1024");
+         control.setValueBinding("value", vb);
+      }
+      
+      // set up the common aspects of the control
+      control.setId(context.getViewRoot().createUniqueId());
+      
+      return control;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java b/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
new file mode 100644
index 0000000000..16e954c113
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.SearchContext;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+/**
+ * @author Kevin Roast
+ */
+public class UISimpleSearch extends UICommand
+{
+   // ------------------------------------------------------------------------------
+   // Component implementation
+
+   /**
+    * Default Constructor
+    */
+   public UISimpleSearch()
+   {
+      // specifically set the renderer type to null to indicate to the framework
+      // that this component renders itself - there is no abstract renderer class
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.SimpleSearch";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.search = (SearchContext)values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.search;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = Utils.getActionHiddenFieldName(context, this);
+      String value = (String)requestMap.get(fieldId);
+      // we are clicked if the hidden field contained our client id
+      if (value != null)
+      {
+         if (value.equals(this.getClientId(context)))
+         {
+            String searchText = (String)requestMap.get(getClientId(context));
+            
+            if (searchText.length() != 0)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Search text submitted: " + searchText);
+               int option = -1;
+               String optionFieldName = getClientId(context) + NamingContainer.SEPARATOR_CHAR + OPTION_PARAM;
+               String optionStr = (String)requestMap.get(optionFieldName);
+               if (optionStr.length() != 0)
+               {
+                  option = Integer.parseInt(optionStr);
+               }
+               if (logger.isDebugEnabled())
+                  logger.debug("Search option submitted: " + option);
+               
+               // queue event so system can perform a search and update the component
+               SearchEvent event = new SearchEvent(this, searchText, option);
+               this.queueEvent(event);
+            }
+         }
+         else if (value.equals(ADVSEARCH_PARAM))
+         {
+            // found advanced search navigation action
+            // TODO: TEMP: set this outcome from a component attribute!
+            AdvancedSearchEvent event = new AdvancedSearchEvent(this, "advSearch");
+            this.queueEvent(event);
+         }
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UICommand#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof SearchEvent)
+      {
+         // update the component parameters from the search event details
+         SearchEvent searchEvent = (SearchEvent)event;
+         
+         // construct the Search Context object
+         SearchContext context = new SearchContext();
+         context.setText(searchEvent.SearchText);
+         context.setMode(searchEvent.SearchMode);
+         this.search = context;
+         
+         super.broadcast(event);
+      }
+      else if (event instanceof AdvancedSearchEvent)
+      {
+         // special case to navigate to the advanced search screen
+         AdvancedSearchEvent searchEvent = (AdvancedSearchEvent)event;
+         FacesContext fc = getFacesContext();
+         fc.getApplication().getNavigationHandler().handleNavigation(fc, null, searchEvent.Outcome);
+         
+         // NOTE: we don't call super() here so that our nav outcome is the one that occurs!
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      ResourceBundle bundle = (ResourceBundle)Application.getBundle(context);
+      
+      // script for dynamic simple search menu drop-down options
+      out.write("<script>");
+      out.write("function _noenter(event) {" +
+                "if (event && event.keyCode == 13) {" +
+                "   _searchSubmit();return false; }" +
+                "else {" +
+                "   return true; } }");
+      out.write("function _searchSubmit() {");
+      out.write(Utils.generateFormSubmit(context, this, Utils.getActionHiddenFieldName(context, this), getClientId(context)));
+      out.write("}");
+      out.write("</script>");
+      
+      // outer table containing search drop-down icon, text box and search Go image button
+      out.write("<table cellspacing=4 cellpadding=0>");
+      out.write("<tr><td style='padding-top:2px'>");
+      
+      String searchImage = Utils.buildImageTag(context, "/images/icons/search_icon.gif", 15, 15,
+            bundle.getString(MSG_GO), "_searchSubmit();");
+      
+      out.write(Utils.buildImageTag(context, "/images/icons/search_controls.gif", 27, 13,
+            bundle.getString(MSG_OPTIONS), "javascript:_toggleMenu(event, '_alfsearch');"));
+      
+      // dynamic DIV area containing search options
+      out.write("<br><div id='_alfsearch' style='position:absolute;display:none'>");
+      out.write("<table border=0 bgcolor='#eeeeee' style='border-top:thin solid #FFFFFF;border-left:thin solid #FFFFFF;border-right:thin solid #444444;border-bottom:thin solid #444444;' cellspacing=4 cellpadding=0>");
+      
+      // output each option - setting the current one to CHECKED
+      String optionFieldName = getClientId(context) + NamingContainer.SEPARATOR_CHAR + OPTION_PARAM;
+      String radioOption = "<tr><td class='userInputForm'><input type='radio' name='" + optionFieldName + "'";
+      out.write(radioOption);
+      out.write(" VALUE='0'");
+      int searchMode = getSearchMode();
+      if (searchMode == 0) out.write(" CHECKED");
+      out.write("><nobr>" + bundle.getString(MSG_ALL_ITEMS) + "</nobr></td></tr>");
+      out.write(radioOption);
+      out.write(" VALUE='1'");
+      if (searchMode == 1) out.write(" CHECKED");
+      out.write("><nobr>" + bundle.getString(MSG_FILE_NAMES_CONTENTS) + "</nobr></td></tr>");
+      out.write(radioOption);
+      out.write(" VALUE='2'");
+      if (searchMode == 2) out.write(" CHECKED");
+      out.write("><nobr>" + bundle.getString(MSG_FILE_NAMES_ONLY) + "</nobr></td></tr>");
+      out.write(radioOption);
+      out.write(" VALUE='3'");
+      if (searchMode == 3) out.write(" CHECKED");
+      out.write("><nobr>" + bundle.getString(MSG_SPACE_NAMES_ONLY) + "</nobr></td></tr>");
+      
+      // row with table containing advanced search link and Search Go button 
+      out.write("<tr><td><table width=100%><tr><td>");
+      // generate a link that will cause an action event to navigate to the advanced search screen
+      out.write("<a class='small' href='#' onclick=\"");
+      out.write(Utils.generateFormSubmit(context, this, Utils.getActionHiddenFieldName(context, this), ADVSEARCH_PARAM));
+      out.write("\">");
+      out.write(bundle.getString(MSG_ADVANCED_SEARCH));
+      out.write("</a>");
+      out.write("</td><td align=right>");
+      out.write(searchImage);
+      out.write("</td></tr></table></td></tr>");
+      out.write("</table></div>");
+      
+      // input text box
+      out.write("</td><td>");
+      out.write("<input name='");
+      out.write(getClientId(context));
+      // TODO: style and class from component properties!
+      out.write("' onkeypress=\"return _noenter(event)\"");
+      out.write(" type='text' maxlength='1024' style='width:130px;padding-top:3px;font-size:10px' value=\"");
+      // output previous search text stored in this component!
+      out.write(Utils.replace(getLastSearch(), "\"", "&quot;"));
+      out.write("\">");
+      
+      // search Go image button
+      out.write("</td><td>");
+      out.write(searchImage);
+      
+      // end outer table
+      out.write("</td></tr></table>");
+   }
+   
+   /**
+    * Return the current Search Context
+    */
+   public SearchContext getSearchContext()
+   {
+      return this.search;
+   }
+   
+   /**
+    * @return The last set search text value
+    */
+   public String getLastSearch()
+   {
+      if (search != null)
+      {
+         return this.search.getText();
+      }
+      else
+      {
+         return "";
+      }
+   }
+   
+   /** 
+    * @return The current search mode (see constants) 
+    */
+   public int getSearchMode()
+   {
+      if (search != null)
+      {
+         return this.search.getMode();
+      }
+      else
+      {
+         return SearchContext.SEARCH_ALL;
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   private static Log logger = LogFactory.getLog(UISimpleSearch.class);
+   
+   /** I18N message Ids */
+   private static final String MSG_ADVANCED_SEARCH = "advanced_search";
+   private static final String MSG_OPTIONS = "options";
+   private static final String MSG_GO = "go";
+   private static final String MSG_SPACE_NAMES_ONLY = "space_names";
+   private static final String MSG_FILE_NAMES_ONLY = "file_names";
+   private static final String MSG_FILE_NAMES_CONTENTS = "file_names_contents";
+   private static final String MSG_ALL_ITEMS = "all_items";
+   
+   private static final String OPTION_PARAM = "_option";
+   private static final String ADVSEARCH_PARAM = "_advsearch";
+   
+   /** last search context used */
+   private SearchContext search = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing a search execution from the UISimpleSearch component.
+    */
+   public static class SearchEvent extends ActionEvent
+   {
+      private static final long serialVersionUID = 3918135612344774322L;
+
+      public SearchEvent(UIComponent component, String text, int mode)
+      {
+         super(component);
+         SearchText = text;
+         SearchMode = mode;
+      }
+      
+      public String SearchText;
+      public int SearchMode;
+   }
+   
+   public static class AdvancedSearchEvent extends ActionEvent
+   {
+      public AdvancedSearchEvent(UIComponent component, String outcome)
+      {
+         super(component);
+         Outcome = outcome;
+      }
+      
+      public String Outcome;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
new file mode 100644
index 0000000000..4fe45e78f9
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * @author Kevin Roast
+ */
+public class UISpaceSelector extends AbstractItemSelector
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.SpaceSelector";
+   }
+
+   /**
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getDefaultLabel()
+    */
+   public String getDefaultLabel()
+   {
+      return Application.getMessage(FacesContext.getCurrentInstance(), "select_space_prompt");
+   }
+   
+   /**
+    * Returns the parent id of the current space or null if the parent space is the company home space
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getParentNodeId(javax.faces.context.FacesContext)
+    */
+   public String getParentNodeId(FacesContext context)
+   {
+      String id = null;
+      
+      if (this.navigationId != null && this.navigationId.equals(Application.getCompanyRootId()) == false)
+      {
+         ChildAssociationRef parentRef = getNodeService(context).getPrimaryParent(
+               new NodeRef(Repository.getStoreRef(), this.navigationId));
+         id = parentRef.getParentRef().getId();
+      }
+      
+      return id;
+   }
+
+   /**
+    * Returns the child spaces of the current space
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getChildrenForNode(javax.faces.context.FacesContext)
+    */
+   public Collection<ChildAssociationRef> getChildrenForNode(FacesContext context)
+   {
+      NodeRef nodeRef = new NodeRef(Repository.getStoreRef(), this.navigationId);
+      List<ChildAssociationRef> allKids = getNodeService(context).getChildAssocs(nodeRef);
+      DictionaryService dd = getDictionaryService(context);
+      NodeService service = getNodeService(context);
+      
+      // filter out those children that are not spaces
+      List<ChildAssociationRef> spaceKids = new ArrayList<ChildAssociationRef>(); 
+      for (ChildAssociationRef ref : allKids)
+      {
+         if (dd.isSubClass(service.getType(ref.getChildRef()), ContentModel.TYPE_FOLDER) && 
+             dd.isSubClass(service.getType(ref.getChildRef()), ContentModel.TYPE_SYSTEM_FOLDER) == false)
+         {
+            spaceKids.add(ref);
+         }
+      }
+      
+      return spaceKids;
+   }
+
+   /**
+    * Returns the current users home space
+    * 
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getRootChildren(javax.faces.context.FacesContext)
+    */
+   public Collection<ChildAssociationRef> getRootChildren(FacesContext context)
+   {
+      // get the root space from the current user
+      //String rootId = Application.getCurrentUser(context).getHomeSpaceId();
+      NodeRef rootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+
+      // get a child association reference back to the real repository root to satisfy
+      // the generic API we have in the abstract super class
+      ChildAssociationRef childRefFromRealRoot = getNodeService(context).getPrimaryParent(rootRef);
+      List<ChildAssociationRef> roots = new ArrayList<ChildAssociationRef>(1);
+      roots.add(childRefFromRealRoot);
+                  
+      return roots;
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getItemIcon()
+    */
+   public String getItemIcon()
+   {
+      return WebResources.IMAGE_SPACE;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java b/source/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java
new file mode 100644
index 0000000000..309d2821a0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/evaluator/PermissionEvaluator.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.evaluator;
+
+import java.util.StringTokenizer;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.component.evaluator.BaseEvaluator;
+
+/**
+ * Evaulator for returning whether a Node is Allowed/Denied a list of permissions
+ * 
+ * @author Kevin Roast
+ */
+public class PermissionEvaluator extends BaseEvaluator
+{
+   /**
+    * Evaluate against the component attributes. Return true to allow the inner
+    * components to render, false to hide them during rendering.
+    * 
+    * IN: Value - either a Node (preferred) or NodeRef to test
+    *     Allow - Permission(s) (comma separated) to test against
+    *     Deny  - Permission(s) (comma separated) to test against
+    * 
+    * @return true to allow rendering of child components, false otherwise
+    */
+   public boolean evaluate()
+   {
+      boolean result = false;
+      
+      // TODO: implement Deny permissions checking (as required...)
+      
+      try
+      {
+         Object obj = getValue();
+         if (obj instanceof Node)
+         {
+            // used the cached permissions checks in the Node instance
+            // this means multiple calls to evaluators don't need to keep calling services
+            // and permissions on a Node shouldn't realistically change over the life of an instance
+            String[] allow = getAllowPermissions();
+            if (allow.length != 0)
+            {
+               result = true;
+               for (int i=0; i<allow.length; i++)
+               {
+                  result = result & ((Node)obj).hasPermission(allow[i]);
+               }
+            }
+         }
+         else if (obj instanceof NodeRef)
+         {
+            // perform the check for permissions here against NodeRef using service
+            PermissionService service = Repository.getServiceRegistry(getFacesContext()).getPermissionService();
+            String[] allow = getAllowPermissions();
+            if (allow.length != 0)
+            {
+               result = true;
+               for (int i=0; i<allow.length; i++)
+               {
+                  result = result & (AccessStatus.ALLOWED == service.hasPermission(((NodeRef)obj), allow[i]));
+               }
+            }
+         }
+      }
+      catch (Exception err)
+      {
+         // return default value on error
+         s_logger.debug("Error during PermissionEvaluator evaluation: " + err.getMessage());
+      }
+      
+      return result;
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.allow = (String)values[1];
+      this.deny = (String)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.allow;
+      values[2] = this.deny;
+      return (values);
+   }
+   
+   /**
+    * @return the array of Allow permissions
+    */
+   private String[] getAllowPermissions()
+   {
+      String[] allowPermissions;
+      
+      String allow = getAllow();
+      if (allow != null)
+      {
+         if (allow.indexOf(',') == -1)
+         {
+            // simple case - one permission
+            allowPermissions = new String[1];
+            allowPermissions[0] = allow;
+         }
+         else
+         {  
+            // complex case - multiple permissions
+            StringTokenizer t = new StringTokenizer(allow, ",");
+            allowPermissions = new String[t.countTokens()];
+            for (int i=0; i<allowPermissions.length; i++)
+            {
+               allowPermissions[i] = t.nextToken();
+            }
+         }
+      }
+      else
+      {
+         allowPermissions = new String[0];
+      }
+      
+      return allowPermissions;
+   }
+   
+   /**
+    * Get the allow permissions to match value against
+    * 
+    * @return the allow permissions to match value against
+    */
+   public String getAllow()
+   {
+      ValueBinding vb = getValueBinding("allow");
+      if (vb != null)
+      {
+         this.allow = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.allow;
+   }
+   
+   /**
+    * Set the allow permissions to match value against
+    * 
+    * @param allow     allow permissions to match value against
+    */
+   public void setAllow(String allow)
+   {
+      this.allow = allow;
+   }
+   
+   /**
+    * Get the deny permissions to match value against
+    * 
+    * @return the deny permissions to match value against
+    */
+   public String getDeny()
+   {
+      ValueBinding vb = getValueBinding("deny");
+      if (vb != null)
+      {
+         this.deny = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.deny;
+   }
+   
+   /**
+    * Set the deny permissions to match value against
+    * 
+    * @param deny     deny permissions to match value against
+    */
+   public void setDeny(String deny)
+   {
+      this.deny = deny;
+   }
+   
+   
+   /** the deny permissions to match value against */
+   private String deny = null;
+   
+   /** the allow permissions to match value against */
+   private String allow = null;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
new file mode 100644
index 0000000000..0f6dbf2eef
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
@@ -0,0 +1,924 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.DataDictionary;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Base class for all association editor components 
+ * 
+ * @author gavinc
+ */
+public abstract class BaseAssociationEditor extends UIInput
+{
+   private final static Log logger = LogFactory.getLog(BaseAssociationEditor.class);
+   
+   private final static String ACTION_SEPARATOR = ";";
+   private final static int ACTION_NONE   = -1;
+   private final static int ACTION_REMOVE = 0;
+   private final static int ACTION_SELECT = 1;
+   private final static int ACTION_ADD = 2;
+   private final static int ACTION_CHANGE = 3;
+   private final static int ACTION_CANCEL = 4;
+   private final static int ACTION_SEARCH = 5;
+   private final static int ACTION_SET = 6;
+   
+   private final static String MSG_ERROR_ASSOC = "error_association";
+   private final static String FIELD_CONTAINS = "_contains";
+   private final static String FIELD_AVAILABLE = "_available";
+   
+   /** I18N message strings */
+   private final static String MSG_ADD_TO_LIST_BUTTON = "add_to_list_button";
+   private final static String MSG_SELECT_BUTTON = "select_button";
+   private static final String MSG_NO_SELECTED_ITEMS = "no_selected_items";
+   private final static String MSG_SEARCH_SELECT_ITEMS = "search_select_items";
+   private final static String MSG_SEARCH_SELECT_ITEM = "search_select_item";
+   private final static String MSG_SELECTED_ITEMS = "selected_items";
+   private final static String MSG_REMOVE = "remove";
+   private final static String MSG_ADD = "add";
+   private final static String MSG_OK = "ok";
+   private final static String MSG_CANCEL = "cancel";
+   private final static String MSG_SEARCH = "search";
+   private final static String MSG_CHANGE = "change";
+   
+   protected String associationName;
+   protected String availableOptionsSize;
+   protected String selectItemMsg;
+   protected String selectItemsMsg;
+   protected String selectedItemsMsg;
+   protected String noSelectedItemsMsg;
+   protected Boolean disabled;
+   
+   protected boolean showAvailable = false;
+   
+   /** Map of the original associations keyed by the id of the child */
+   protected Map<String, Object> originalAssocs;
+   protected Map<String, Object> added;
+   protected Map<String, Object> removed;
+   
+   /** List containing the currently available options */
+   protected List<NodeRef> availableOptions;
+   
+   protected String changingAssociation;
+   protected boolean highlightedRow;
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * Default constructor
+    */
+   public BaseAssociationEditor()
+   {
+      setRendererType(null);
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   @SuppressWarnings("unchecked")
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.associationName = (String)values[1];
+      this.originalAssocs = (Map<String, Object>)values[2];
+      this.availableOptions = (List<NodeRef>)values[3];
+      this.availableOptionsSize = (String)values[4];
+      this.selectItemMsg = (String)values[5];
+      this.selectItemsMsg = (String)values[6];
+      this.selectedItemsMsg = (String)values[7];
+      this.changingAssociation = (String)values[8];
+      this.disabled = (Boolean)values[9];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[10];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.associationName;
+      values[2] = this.originalAssocs;
+      values[3] = this.availableOptions;
+      values[4] = this.availableOptionsSize;
+      values[5] = this.selectItemMsg;
+      values[6] = this.selectItemsMsg;
+      values[7] = this.selectedItemsMsg;
+      values[8] = this.changingAssociation;
+      values[9] = this.disabled;
+      
+      // NOTE: we don't save the state of the added and removed maps as these
+      //       need to be rebuilt everytime
+      
+      return (values);
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      Map valuesMap = context.getExternalContext().getRequestParameterValuesMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      int action = ACTION_NONE;
+      String removeId = null;
+      if (value != null && value.length() != 0)
+      {
+         // break up the action into it's parts
+         int sepIdx = value.indexOf(ACTION_SEPARATOR);
+         if (sepIdx != -1)
+         {
+            action = Integer.parseInt(value.substring(0, sepIdx));
+            removeId = value.substring(sepIdx+1);
+         }
+         else
+         {
+            action = Integer.parseInt(value);
+         }
+      }
+      
+      // gather the current state and queue an event
+      String[] addedItems = (String[])valuesMap.get(fieldId + FIELD_AVAILABLE);
+      String contains = (String)requestMap.get(fieldId + FIELD_CONTAINS);
+      
+      AssocEditorEvent event = new AssocEditorEvent(this, action, addedItems, removeId, contains);
+      queueEvent(event);
+      
+      super.decode(context);
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof AssocEditorEvent)
+      {
+         AssocEditorEvent assocEvent = (AssocEditorEvent)event;
+         Node node = (Node)getValue();
+         
+         switch (assocEvent.Action)
+         {
+            case ACTION_SEARCH:
+            {
+               this.showAvailable = true;
+               this.availableOptions = new ArrayList<NodeRef>();
+               getAvailableOptions(FacesContext.getCurrentInstance(), assocEvent.Contains);
+               break;
+            }
+            case ACTION_SELECT:
+            {
+               this.showAvailable = true;
+               break;
+            }
+            case ACTION_ADD:
+            {
+               addTarget(node, assocEvent.ToAdd);
+               break;
+            }
+            case ACTION_REMOVE:
+            {
+               removeTarget(node, assocEvent.RemoveId);
+               break;
+            }
+            case ACTION_CHANGE:
+            {
+               this.changingAssociation = assocEvent.RemoveId;
+               this.showAvailable = true;
+               break;
+            }
+            case ACTION_CANCEL:
+            {
+               this.showAvailable = false;
+               break;
+            }
+            case ACTION_SET:
+            {
+               if (assocEvent.ToAdd != null && assocEvent.ToAdd.length > 0)
+               {
+                  removeTarget(node, this.changingAssociation);
+                  addTarget(node, assocEvent.ToAdd);
+               }
+               break;
+            }
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      // reset the highlighted row flag
+      this.highlightedRow = false;
+      
+      ResponseWriter out = context.getResponseWriter();
+      String clientId = getClientId(context);
+
+      // get the child associations currently on the node and any that have been added
+      NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
+      
+      // show the editable association component
+      AssociationDefinition assocDef = getAssociationDefinition(context);
+      if (assocDef == null)
+      {
+         logger.warn("Failed to find association definition for association '" + associationName + "'");
+         
+         // add an error message as the property is not defined in the data dictionary
+         String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_ASSOC), new Object[] {this.associationName});
+         Utils.addErrorMessage(msg);
+      }
+      else
+      {
+         String targetType = assocDef.getTargetClass().getName().toString();
+         boolean allowMany = assocDef.isTargetMany();
+         
+         populateAssocationMaps((Node)getValue());
+         
+         if (isDisabled())
+         {
+            // show the current list of associations in a read-only form
+            renderReadOnlyAssociations(context, out, nodeService);
+         }
+         else
+         {
+            // start outer table
+            out.write("<table border='0' cellspacing='4' cellpadding='0' class='selector'>");
+            
+            if (allowMany)
+            {
+               out.write("<tr><td colspan='2'>1.&nbsp;");
+               out.write(getSelectItemsMsg());
+               out.write("</td></tr>");
+               
+               // show the search field
+               renderSearchField(context, out);
+               
+               // show available options for this association
+               renderAvailableOptions(context, out, nodeService, targetType, allowMany);
+               
+               // add the Add to List button
+               out.write("<tr><td colspan='2'>2.&nbsp;<input type='submit' value='");
+               out.write(Application.getMessage(context, MSG_ADD_TO_LIST_BUTTON));
+               out.write("' onclick=\"");
+               out.write(generateFormSubmit(context, Integer.toString(ACTION_ADD)));
+               out.write("\"/>");
+               
+               // add some padding
+               out.write("<tr><td height='6'></td></tr>");
+               
+               out.write("<tr><td colspan='2'>");
+               out.write(getSelectedItemsMsg());
+               out.write("</td></tr>");
+               
+               // show all the current associations
+               out.write("<tr><td colspan='2'><table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>");
+               out.write("<tr><td colspan='2' class='selectedItemsHeader'>");
+               out.write(Application.getMessage(context, "name"));
+               out.write("</td></tr>");
+               renderExistingAssociations(context, out, nodeService, allowMany);
+               out.write("</table></td></tr>");
+            }
+            else
+            {
+               if (this.showAvailable)
+               {
+                  out.write("<tr><td colspan='2'>1.&nbsp;");
+                  out.write(getSelectItemMsg());
+                  out.write("</td></tr>");
+               
+                  // show the search field
+                  renderSearchField(context, out);
+                  
+                  // show available options for this association 
+                  renderAvailableOptions(context, out, nodeService, targetType, allowMany);
+                  
+                  // add the ok and cancel buttons
+                  out.write("<tr><td colspan='2' align='right'><input type='submit' value='");
+                  out.write(Application.getMessage(context, MSG_OK));
+                  out.write("' onclick=\"");
+                  out.write(generateFormSubmit(context, Integer.toString(ACTION_SET)));
+                  out.write("\"/>&nbsp;&nbsp;<input type='submit' value='");
+                  out.write(Application.getMessage(context, MSG_CANCEL));
+                  out.write("' onclick=\"");
+                  out.write(generateFormSubmit(context, Integer.toString(ACTION_CANCEL)));
+                  out.write("\"/></td></tr>");
+               }
+               else
+               {
+                  // show the select button if required
+                  if ((allowMany == false && this.originalAssocs.size() == 0 && this.added.size() == 0) ||
+                      (allowMany == false && this.originalAssocs.size() == 1 && this.removed.size() == 1 && this.added.size() == 0) )
+                  {
+                     out.write("<tr><td><input type='submit' value='");
+                     out.write(Application.getMessage(context, MSG_SELECT_BUTTON));
+                     out.write("' onclick=\"");
+                     out.write(generateFormSubmit(context, Integer.toString(ACTION_SELECT)));
+                     out.write("\"/></td></tr>");
+                  }
+                  else
+                  {
+                     // show the current association
+                     renderExistingAssociations(context, out, nodeService, allowMany);
+                  }
+               }
+            }
+            
+            if (logger.isDebugEnabled())
+            {
+               logger.debug("number original = " + this.originalAssocs.size());
+               logger.debug("number added = " + this.added.size());
+               logger.debug("number removed = " + this.removed.size());
+            }
+            
+            // close table
+            out.write("</table>");
+         }
+      }
+   }
+   
+   /**
+    * Returns the name of the association this component is editing
+    * 
+    * @return Association name
+    */
+   public String getAssociationName()
+   {
+      ValueBinding vb = getValueBinding("associationName");
+      if (vb != null)
+      {
+         this.associationName = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.associationName;
+   }
+
+   /**
+    * Sets the name of the association this component will edit
+    * 
+    * @param associationName Name of the association to edit
+    */
+   public void setAssociationName(String associationName)
+   {
+      this.associationName = associationName;
+   }
+   
+   /**
+    * Determines whether the component should be rendered in a disabled state
+    * 
+    * @return Returns whether the component is disabled
+    */
+   public boolean isDisabled()
+   {
+      if (this.disabled == null)
+      {
+         ValueBinding vb = getValueBinding("disabled");
+         if (vb != null)
+         {
+            this.disabled = (Boolean)vb.getValue(getFacesContext());
+         }
+      }
+      
+      if (this.disabled == null)
+      {
+         this.disabled = Boolean.FALSE;
+      }
+      
+      return this.disabled;
+   }
+
+   /**
+    * Determines whether the component should be rendered in a disabled state
+    * 
+    * @param disabled true to disable the component
+    */
+   public void setDisabled(boolean disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   /**
+    * Returns the size of the select control when multiple items
+    * can be selected 
+    * 
+    * @return The size of the select control
+    */
+   public String getAvailableOptionsSize()
+   {
+      if (this.availableOptionsSize == null)
+      {
+         this.availableOptionsSize = "4";
+      }
+      
+      return this.availableOptionsSize;
+   }
+   
+   /**
+    * Sets the size of the select control used when multiple items can
+    * be selected 
+    * 
+    * @param availableOptionsSize The size
+    */
+   public void setAvailableOptionsSize(String availableOptionsSize)
+   {
+      this.availableOptionsSize = availableOptionsSize;
+   }
+   
+   /**
+    * Returns the message to display when no items have been selected, if one hasn't been
+    * set it defaults to the message in the bundle under key 'no_selected_items'.
+    * 
+    * @return The message
+    */
+   public String getNoSelectedItemsMsg()
+   {
+      ValueBinding vb = getValueBinding("noSelectedItemsMsg");
+      if (vb != null)
+      {
+         this.noSelectedItemsMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.noSelectedItemsMsg == null)
+      {
+         this.noSelectedItemsMsg = Application.getMessage(getFacesContext(), MSG_NO_SELECTED_ITEMS);
+      }
+      
+      return this.noSelectedItemsMsg;
+   }
+
+   /**
+    * Sets the no selected items message to display in the UI
+    * 
+    * @param noSelectedItemsMsg The message
+    */
+   public void setNoSelectedItemsMsg(String noSelectedItemsMsg)
+   {
+      this.noSelectedItemsMsg = noSelectedItemsMsg;
+   }
+   
+   /**
+    * Returns the message to display for the selected items, if one hasn't been
+    * set it defaults to the message in the bundle under key 'selected_items'.
+    * 
+    * @return The message
+    */
+   public String getSelectedItemsMsg()
+   {
+      ValueBinding vb = getValueBinding("selectedItemsMsg");
+      if (vb != null)
+      {
+         this.selectedItemsMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.selectedItemsMsg == null)
+      {
+         this.selectedItemsMsg = Application.getMessage(getFacesContext(), MSG_SELECTED_ITEMS);
+      }
+      
+      return this.selectedItemsMsg;
+   }
+
+   /**
+    * Sets the selected items message to display in the UI
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectedItemsMsg(String selectedItemsMsg)
+   {
+      this.selectedItemsMsg = selectedItemsMsg;
+   }
+   
+   /**
+    * Returns the message to display for select an item, if one hasn't been
+    * set it defaults to the message in the bundle under key 'search_select_item'.
+    * 
+    * @return The message
+    */
+   public String getSelectItemMsg()
+   {
+      ValueBinding vb = getValueBinding("selectItemMsg");
+      if (vb != null)
+      {
+         this.selectItemMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.selectItemMsg == null)
+      {
+         this.selectItemMsg = Application.getMessage(getFacesContext(), MSG_SEARCH_SELECT_ITEM);
+      }
+      
+      return this.selectItemMsg;
+   }
+
+   /**
+    * Sets the select an item message to display in the UI
+    * 
+    * @param selectedItemMsg The message
+    */
+   public void setSelectItemMsg(String selectItemMsg)
+   {
+      this.selectItemMsg = selectItemMsg;
+   }
+   
+   /**
+    * Returns the message to display for select items, if one hasn't been
+    * set it defaults to the message in the bundle under key 'search_select_items'.
+    * 
+    * @return The message
+    */
+   public String getSelectItemsMsg()
+   {
+      ValueBinding vb = getValueBinding("selectItemsMsg");
+      if (vb != null)
+      {
+         this.selectItemsMsg = (String)vb.getValue(getFacesContext());
+      }
+      
+      if (this.selectItemsMsg == null)
+      {
+         this.selectItemsMsg = Application.getMessage(getFacesContext(), MSG_SEARCH_SELECT_ITEMS);
+      }
+      
+      return this.selectItemsMsg;
+   }
+
+   /**
+    * Sets the select items message to display in the UI
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectItemsMsg(String selectItemsMsg)
+   {
+      this.selectItemsMsg = selectItemsMsg;
+   }
+   
+   /**
+    * Populates all the internal Maps with the appropriate association reference objects
+    * 
+    * @param node The Node we are dealing with
+    */
+   protected abstract void populateAssocationMaps(Node node);
+   
+   /**
+    * Renders the existing associations in a read-only form 
+    * 
+    * @param context FacesContext
+    * @param out ResponseWriter
+    * @param nodeService The NodeService
+    * @throws IOException
+    */
+   protected abstract void renderReadOnlyAssociations(FacesContext context, ResponseWriter out,
+         NodeService nodeService) throws IOException;
+   
+   /**
+    * Renders the existing associations in an editable form
+    * 
+    * @param context FacesContext
+    * @param out ResponseWriter
+    * @param nodeService The NodeService
+    * @param allowMany Whether multiple associations are allowed 
+    * @throws IOException
+    */
+   protected abstract void renderExistingAssociations(FacesContext context, ResponseWriter out, 
+         NodeService nodeService, boolean allowMany) throws IOException;
+   
+   /**
+    * Updates the component and node state to reflect an association being removed 
+    * 
+    * @param node The node we are dealing with
+    * @param targetId The id of the child to remove
+    */
+   protected abstract void removeTarget(Node node, String targetId);
+
+   /**
+    * Updates the component and node state to reflect an association being added 
+    * 
+    * @param node The node we are dealing with
+    * @param childId The id of the child to add
+    */
+   protected abstract void addTarget(Node node, String[] toAdd);
+   
+   /**
+    * Renders an existing association with the appropriate options
+    * 
+    * @param context FacesContext
+    * @param out Writer to write output to
+    * @param nodeService The NodeService
+    * @param targetRef The node at the end of the association being rendered
+    * @param allowMany Whether the current association allows multiple children
+    * @throws IOException
+    */
+   protected void renderExistingAssociation(FacesContext context, ResponseWriter out, NodeService nodeService,
+         NodeRef targetRef, boolean allowMany) throws IOException
+   {
+      out.write("<tr><td class='");
+      if (this.highlightedRow)
+      {
+         out.write("selectedItemsRowAlt");
+      }
+      else
+      {
+         out.write("selectedItemsRow");
+      }
+      out.write("'>");
+
+      out.write(Repository.getDisplayPath(nodeService.getPath(targetRef)));
+      out.write("/");
+      out.write(Repository.getNameForNode(nodeService, targetRef));
+      out.write("</td><td class='");
+      if (this.highlightedRow)
+      {
+         out.write("selectedItemsRowAlt");
+      }
+      else
+      {
+         out.write("selectedItemsRow");
+      }
+      out.write("'><a href='#' title='");
+      out.write(Application.getMessage(context, MSG_REMOVE));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, ACTION_REMOVE + ACTION_SEPARATOR + targetRef.getId()));
+      out.write("\"><img src='");
+      out.write(context.getExternalContext().getRequestContextPath());
+      out.write("/images/icons/delete.gif' border='0' width='13' height='16'/></a>");
+      
+      if (allowMany == false)
+      {
+         out.write("&nbsp;<a href='#' title='");
+         out.write(Application.getMessage(context, MSG_CHANGE));
+         out.write("' onclick=\"");
+         out.write(generateFormSubmit(context, ACTION_CHANGE + ACTION_SEPARATOR + targetRef.getId()));
+         out.write("\"><img src='");
+         out.write(context.getExternalContext().getRequestContextPath());
+         out.write("/images/icons/edit_icon.gif' border='0' width='12' height='16'/></a>");
+      }
+      
+      out.write("</td></tr>");
+      
+      this.highlightedRow = !this.highlightedRow;
+   }
+   
+   /**
+    * Renders the search fields
+    * 
+    * @param context Faces Context
+    * @param out The Response Writer
+    * @throws IOException
+    */
+   protected void renderSearchField(FacesContext context, ResponseWriter out) throws IOException
+   {
+      // TODO: externalise the max and size attributes
+      out.write("<tr><td colspan='2'><input type='text' maxlength='1024' size='32' name='");
+      out.write(getClientId(context) + FIELD_CONTAINS);
+      out.write("'/>&nbsp;&nbsp;<input type='submit' value='");
+      out.write(Application.getMessage(context, MSG_SEARCH));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, Integer.toString(ACTION_SEARCH)));
+      out.write("\"/></td></tr>");
+   }
+   
+   /**
+    * Renders the <None> message
+    * 
+    * @param context Faces Context
+    * @param out Response Writer
+    * @throws IOException
+    */
+   protected void renderNone(FacesContext context, ResponseWriter out) throws IOException
+   {
+      out.write("<tr><td class='selectedItemsRow'>");
+      out.write(getNoSelectedItemsMsg());
+      out.write("</td></tr>");
+   }
+   
+   /**
+    * Renders the list of available options for a new association
+    * 
+    * @param context FacesContext
+    * @param out Writer to write output to
+    * @param nodeService The NodeService
+    * @param targetType The type of the child at the end of the association
+    * @param allowMany Whether the current association allows multiple children
+    * @throws IOException
+    */
+   protected void renderAvailableOptions(FacesContext context, ResponseWriter out, NodeService nodeService, 
+         String targetType, boolean allowMany) throws IOException
+   {
+      boolean itemsPresent = (this.availableOptions != null && this.availableOptions.size() > 0);
+      
+      out.write("<tr><td colspan='2'><select ");
+      if (itemsPresent == false)
+      {
+         // rather than having a very slim select box set the width if there are no results
+         out.write("style='width:240px;' ");
+      }
+      out.write("name='");
+      out.write(getClientId(context) + FIELD_AVAILABLE);
+      out.write("' size='");
+      if (allowMany)
+      {
+         out.write(getAvailableOptionsSize());
+         out.write("' multiple");
+      }
+      else
+      {
+         out.write("1'");
+      }
+      out.write(">");
+      
+      if (itemsPresent)
+      {
+         Node currentNode = (Node)getValue();
+         for (NodeRef item : this.availableOptions)
+         {
+            // NOTE: only show the items that are not already associated to and don't show the current node
+            if ((this.originalAssocs.containsKey(item.getId()) == false && this.added.containsKey(item.getId()) == false &&
+                item.getId().equals(currentNode.getId()) == false) || 
+                this.removed.containsKey(item.getId())) 
+            {
+               out.write("<option value='");
+               out.write(item.getId());
+               out.write("'>");
+               out.write(Repository.getDisplayPath(nodeService.getPath(item)));
+               out.write("/");
+               out.write(Repository.getNameForNode(nodeService, item));
+               out.write("</option>");
+            }
+         }
+      }
+      
+      out.write("</select></td></tr>");
+   }   
+   
+   /**
+    * Retrieves the AssociationDefinition for the association we are representing
+    * 
+    * @param context Faces Context
+    * @return The AssociationDefinition for the association, null if a definition does not exist
+    */
+   protected AssociationDefinition getAssociationDefinition(FacesContext context)
+   {
+      // get some metadata about the association from the data dictionary
+      DataDictionary dd = (DataDictionary)FacesContextUtils.getRequiredWebApplicationContext(
+               context).getBean(Application.BEAN_DATA_DICTIONARY);
+      return dd.getAssociationDefinition((Node)getValue(), this.associationName);
+   }
+   
+   /**
+    * Retrieves the available options for the current association
+    * 
+    * @param context Faces Context
+    * @param contains The contains part of the query
+    */
+   protected void getAvailableOptions(FacesContext context, String contains)
+   {
+      AssociationDefinition assocDef = getAssociationDefinition(context);
+      if (assocDef != null)
+      {
+         // find and show all the available options for the current association
+         StringBuilder query = new StringBuilder("+TYPE:\"");
+         query.append(assocDef.getTargetClass().getName().toString());
+         query.append("\"");
+         
+         if (contains != null && contains.length() > 0)
+         {
+            String safeContains = Utils.remove(contains.trim(), "\"");
+            String nameAttr = Repository.escapeQName(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "name"));
+            
+            query.append(" AND +@");
+            query.append(nameAttr);
+            query.append(":*" + safeContains + "*");
+         }
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Query: " + query.toString());
+         
+         ResultSet results = null;
+         try
+         {
+            results = Repository.getServiceRegistry(context).getSearchService().query(
+                  Repository.getStoreRef(), SearchService.LANGUAGE_LUCENE, query.toString());
+            this.availableOptions = results.getNodeRefs();
+         }
+         finally
+         {
+            if (results != null)
+            {
+               results.close();
+            }
+         }
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Found " + this.availableOptions.size() + " available options");
+      }
+   }
+   
+   /**
+    * We use a hidden field per picker instance on the page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   /**
+    * Generate FORM submit JavaScript for the specified action
+    *  
+    * @param context    FacesContext
+    * @param action     Action string
+    * 
+    * @return FORM submit JavaScript
+    */
+   private String generateFormSubmit(FacesContext context, String action)
+   {
+      return Utils.generateFormSubmit(context, this, getHiddenFieldName(), action);
+   }
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing an action relevant to the AssociationEditor component.
+    */
+   public static class AssocEditorEvent extends ActionEvent
+   {
+      private static final long serialVersionUID = 7346758616063937703L;
+
+      public int Action;
+      public String[] ToAdd;
+      public String RemoveId;
+      public String Contains;
+      
+      public AssocEditorEvent(UIComponent component, int action, String[] toAdd, String removeId, String contains)
+      {
+         super(component);
+         this.Action = action;
+         this.ToAdd = toAdd;
+         this.RemoveId = removeId;
+         this.Contains = contains;
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java b/source/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java
new file mode 100644
index 0000000000..a910e58fe2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/PropertySheetItem.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIPanel;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.DataDictionary;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Abstract base class for all items that can appear in a property sheet component
+ * 
+ * @author gavinc
+ */
+public abstract class PropertySheetItem extends UIPanel implements NamingContainer
+{
+   private static Log logger = LogFactory.getLog(PropertySheetItem.class);
+   
+   protected String name;
+   protected String displayLabel;
+   protected String converter;
+   protected Boolean readOnly;
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      // get the variable being used from the parent
+      UIComponent parent = this.getParent();
+      if ((parent instanceof UIPropertySheet) == false)
+      {
+         throw new IllegalStateException(getIncorrectParentMsg());
+      }
+      
+      // only build the components if there are currently no children
+      int howManyKids = getChildren().size();
+      if (howManyKids == 0)
+      {
+         UIPropertySheet propSheet = (UIPropertySheet)parent;
+         generateItem(context, propSheet.getNode(), propSheet.getVar());
+      }
+      
+      super.encodeBegin(context);
+   }
+   
+   /**
+    * @return Returns the display label
+    */
+   public String getDisplayLabel()
+   {
+      if (this.displayLabel == null)
+      {
+         ValueBinding vb = getValueBinding("displayLabel");
+         if (vb != null)
+         {
+            this.displayLabel = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.displayLabel;
+   }
+
+   /**
+    * @param displayLabel Sets the display label
+    */
+   public void setDisplayLabel(String displayLabel)
+   {
+      this.displayLabel = displayLabel;
+   }
+
+   /**
+    * @return Returns the name
+    */
+   public String getName()
+   {
+      if (this.name == null)
+      {
+         ValueBinding vb = getValueBinding("name");
+         if (vb != null)
+         {
+            this.name = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.name;
+   }
+
+   /**
+    * @param name Sets the name
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   /**
+    * @return Returns the converter
+    */
+   public String getConverter()
+   {
+      if (this.converter == null)
+      {
+         ValueBinding vb = getValueBinding("converter");
+         if (vb != null)
+         {
+            this.converter = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return this.converter;
+   }
+
+   /**
+    * @param converter Sets the converter
+    */
+   public void setConverter(String converter)
+   {
+      this.converter = converter;
+   }
+
+   /**
+    * @return Returns whether the property is read only
+    */
+   public boolean isReadOnly()
+   {
+      if (this.readOnly == null)
+      {
+         ValueBinding vb = getValueBinding("readOnly");
+         if (vb != null)
+         {
+            this.readOnly = (Boolean)vb.getValue(getFacesContext());
+         }
+      }
+      
+      if (this.readOnly == null)
+      {
+         this.readOnly = Boolean.FALSE;
+      }
+      
+      return this.readOnly;
+   }
+
+   /**
+    * @param readOnly Sets the read only flag for the component
+    */
+   public void setReadOnly(boolean readOnly)
+   {
+      this.readOnly = readOnly;
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.name = (String)values[1];
+      this.displayLabel = (String)values[2];
+      this.readOnly = (Boolean)values[3];
+      this.converter = (String)values[4];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[5];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.name;
+      values[2] = this.displayLabel;
+      values[3] = this.readOnly;
+      values[4] = this.converter;
+      return (values);
+   }
+   
+   /**
+    * Generates the label and control for the item
+    * 
+    * @param context FacesContext
+    * @param node The Node we are displaying the property sheet for
+    * @param var The variable name used to store the Node in the session
+    */
+   protected abstract void generateItem(FacesContext context, Node node, String var)
+      throws IOException;
+   
+   /**
+    * Returns the message to use in the exception that is thrown if the component
+    * is not nested inside a PropertySheet component
+    * 
+    * @return The message
+    */
+   protected abstract String getIncorrectParentMsg(); 
+   
+   /**
+    * Generates a JSF OutputText component/renderer
+    * 
+    * @param context JSF context
+    * @param displayLabel The display label text
+    * @param parent The parent component for the label
+    */
+   protected void generateLabel(FacesContext context, String displayLabel)
+   {
+      UIOutput label = (UIOutput)context.getApplication().
+                        createComponent("javax.faces.Output");
+      label.setId(context.getViewRoot().createUniqueId());
+      label.setRendererType("javax.faces.Text");
+      label.setValue(displayLabel + ": ");
+      this.getChildren().add(label);
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Created label " + label.getClientId(context) + 
+                      " for '" + displayLabel + "' and added it to component " + this);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
new file mode 100644
index 0000000000..8a184689fc
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIOutput;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.DataDictionary;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Component to represent an individual association within a property sheet
+ * 
+ * @author gavinc
+ */
+public class UIAssociation extends PropertySheetItem
+{
+   private static final String MSG_ERROR_ASSOC = "error_association";
+   private static final String MSG_ERROR_NOT_ASSOC = "error_not_association";
+
+   private static Log logger = LogFactory.getLog(UIAssociation.class);
+   
+   /**
+    * Default constructor
+    */
+   public UIAssociation()
+   {
+      // set the default renderer
+      setRendererType("org.alfresco.faces.AssociationRenderer");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Association";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#getIncorrectParentMsg()
+    */
+   protected String getIncorrectParentMsg()
+   {
+      return "The association component must be nested within a property sheet component";
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#generateItem(javax.faces.context.FacesContext, org.alfresco.web.bean.repository.Node, java.lang.String)
+    */
+   protected void generateItem(FacesContext context, Node node, String var) throws IOException
+   {
+      String associationName = (String)getName();
+
+      // get details of the association
+      DataDictionary dd = (DataDictionary)FacesContextUtils.getRequiredWebApplicationContext(
+            context).getBean(Application.BEAN_DATA_DICTIONARY);
+      AssociationDefinition assocDef = dd.getAssociationDefinition(node, associationName);
+      
+      if (assocDef == null)
+      {
+         logger.warn("Failed to find association definition for association '" + associationName + "'");
+         
+         // add an error message as the property is not defined in the data dictionary and 
+         // not in the node's set of properties
+         String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_ASSOC), new Object[] {associationName});
+         Utils.addErrorMessage(msg);
+      }
+      else
+      {
+         // we've found the association definition but we also need to check
+         // that the association is a parent child one
+         if (assocDef.isChild())
+         {
+            String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_NOT_ASSOC), new Object[] {associationName});
+            Utils.addErrorMessage(msg);
+         }
+         else
+         {
+            String displayLabel = (String)getDisplayLabel();
+            if (displayLabel == null)
+            {
+               // try and get the repository assigned label
+               displayLabel = assocDef.getTitle();
+               
+               // if the label is still null default to the local name of the property
+               if (displayLabel == null)
+               {
+                  displayLabel = assocDef.getName().getLocalName();
+               }
+            }
+            
+            // generate the label and type specific control
+            generateLabel(context, displayLabel);
+            generateControl(context, assocDef, var);
+         }
+      }
+   }
+   
+   /**
+    * Generates an appropriate control for the given property
+    * 
+    * @param context JSF context
+    * @param propDef The definition of the association to create the control for
+    * @param varName Name of the variable the node is stored in the session as 
+    *                (used for value binding expression)
+    * @param parent The parent component for the control
+    */
+   private void generateControl(FacesContext context, AssociationDefinition assocDef, 
+                                String varName)
+   {
+      UIPropertySheet propSheet = (UIPropertySheet)this.getParent();
+      ValueBinding vb = context.getApplication().createValueBinding("#{" + varName + "}");
+      
+      UIAssociationEditor control = (UIAssociationEditor)context.
+         getApplication().createComponent("org.alfresco.faces.AssociationEditor");
+      control.setAssociationName(assocDef.getName().toString());
+      
+      // set up the common aspects of the control
+      control.setId(context.getViewRoot().createUniqueId());
+      control.setValueBinding("value", vb);
+      
+      // disable the component if necessary
+      if (propSheet.getMode().equalsIgnoreCase(UIPropertySheet.VIEW_MODE) || isReadOnly() || assocDef.isProtected())
+      {
+         control.setDisabled(true);
+      }
+      
+      // add the control itself
+      this.getChildren().add(control);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
new file mode 100644
index 0000000000..f41bf0d6e7
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Component that allows associations to be edited 
+ * i.e. new associations to be added, existing ones to be 
+ * removed whilst following the rules in the data dictionary 
+ * 
+ * @author gavinc
+ */
+public class UIAssociationEditor extends BaseAssociationEditor
+{
+   private static final Log logger = LogFactory.getLog(UIAssociationEditor.class);
+
+   // ------------------------------------------------------------------------------
+   // Component implementation
+      
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.AssociationEditor";
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node)
+    */
+   protected void populateAssocationMaps(Node node)
+   {
+      // we need to remember the original set of associations (if there are any)
+      // and place them in a map keyed by the id of the child node
+      if (this.originalAssocs == null)
+      {
+         this.originalAssocs = new HashMap<String, Object>();
+
+         List assocs = (List)node.getAssociations().get(this.associationName);
+         if (assocs != null)
+         {
+            Iterator iter = assocs.iterator();
+            while (iter.hasNext())
+            {
+               AssociationRef assoc = (AssociationRef)iter.next();
+               
+               // add the association to the map
+               this.originalAssocs.put(assoc.getTargetRef().getId(), assoc);
+            }
+         }
+      }
+      
+      // get the map of added associations for this node and association type
+      this.added = (Map)node.getAddedAssociations().get(this.associationName);
+      if (added == null)
+      {
+         // if there aren't any added associations for 'associationName' create a map and add it
+         added = new HashMap<String, Object>();
+         node.getAddedAssociations().put(this.associationName, (Map)added);
+      }
+      
+      // get the map of removed associations for this node and association type
+      this.removed = (Map)node.getRemovedAssociations().get(this.associationName);
+      if (removed == null)
+      {
+         // if there aren't any added associations for 'associationName' create a map and add it
+         removed = new HashMap<String, Object>();
+         node.getRemovedAssociations().put(this.associationName, (Map)removed);
+      }
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#renderExistingAssociations(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.alfresco.service.cmr.repository.NodeService, boolean)
+    */
+   protected void renderExistingAssociations(FacesContext context, ResponseWriter out, 
+         NodeService nodeService, boolean allowManyChildren) throws IOException
+   {
+      boolean itemsRendered = false;
+      
+      // show the associations from the original list if they are not in the removed list
+      Iterator iter = this.originalAssocs.values().iterator();
+      while (iter.hasNext())
+      {
+         AssociationRef assoc = (AssociationRef)iter.next();
+         if (removed.containsKey(assoc.getTargetRef().getId()) == false)
+         {
+            renderExistingAssociation(context, out, nodeService, assoc.getTargetRef(), allowManyChildren);
+            itemsRendered = true;
+         }
+      }
+      
+      // also show any associations added in this session
+      iter = this.added.values().iterator();
+      while (iter.hasNext())
+      {
+         AssociationRef assoc = (AssociationRef)iter.next();
+         renderExistingAssociation(context, out, nodeService, assoc.getTargetRef(), allowManyChildren);
+         itemsRendered = true;
+      }
+      
+      // show the none selected message if no items were rendered
+      if (itemsRendered == false && allowManyChildren == true)
+      {
+         renderNone(context, out);
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#renderReadOnlyAssociations(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.alfresco.service.cmr.repository.NodeService)
+    */
+   protected void renderReadOnlyAssociations(FacesContext context, ResponseWriter out, NodeService nodeService) throws IOException
+   {
+      if (this.originalAssocs.size() > 0)
+      {
+         out.write("<table cellspacing='0' cellpadding='2' border='0'>");
+         
+         Iterator iter = this.originalAssocs.values().iterator();
+         while (iter.hasNext())
+         {
+            out.write("<tr><td>");
+            AssociationRef assoc = (AssociationRef)iter.next();
+            out.write(Repository.getDisplayPath(nodeService.getPath(assoc.getTargetRef())));
+            out.write("/");
+            out.write(Repository.getNameForNode(nodeService, assoc.getTargetRef()));
+            out.write("</td></tr>");
+         }
+         
+         out.write("</table>");
+      }
+   }
+   
+   /**
+    * Updates the component and node state to reflect an association being removed 
+    * 
+    * @param node The node we are dealing with
+    * @param targetId The id of the child to remove
+    */
+   protected void removeTarget(Node node, String targetId)
+   {
+      if (node != null && targetId != null)
+      {
+         QName assocQName = Repository.resolveToQName(this.associationName);
+         AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName, new NodeRef(Repository.getStoreRef(), targetId));
+         
+         // update the node so it knows to remove the association, but only if the association
+         // was one of the original ones
+         if (this.originalAssocs.containsKey(targetId))
+         {
+            Map<String, AssociationRef> removed = node.getRemovedAssociations().get(this.associationName);
+            removed.put(targetId, newAssoc);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Added association to " + targetId + " to the removed list");
+         }
+         
+         // if this association was previously added in this session it will still be
+         // in the added list so remove it if it is
+         Map<String, AssociationRef> added = node.getAddedAssociations().get(this.associationName);
+         if (added.containsKey(targetId))
+         {
+            added.remove(targetId);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Removed association to " + targetId + " from the added list");
+         }
+      }
+   }
+   
+   /**
+    * Updates the component and node state to reflect an association being added 
+    * 
+    * @param node The node we are dealing with
+    * @param childId The id of the child to add
+    */
+   protected void addTarget(Node node, String[] toAdd)
+   {
+      if (node != null && toAdd != null && toAdd.length > 0)
+      {
+         for (int x = 0; x < toAdd.length; x++)
+         {
+            String targetId = toAdd[x];   
+            
+            // update the node so it knows to add the association (if it wasn't there originally)
+            if (this.originalAssocs.containsKey(targetId) == false)
+            {
+               QName assocQName = Repository.resolveToQName(this.associationName);
+               AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName, 
+                     new NodeRef(Repository.getStoreRef(), targetId));
+            
+               Map<String, AssociationRef> added = node.getAddedAssociations().get(this.associationName);
+               added.put(targetId, newAssoc);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Added association to " + targetId + " to the added list");
+            }
+            
+            // if the association was previously removed and has now been re-added it
+            // will still be in the "to be removed" list so remove it if it is
+            Map<String, AssociationRef> removed = node.getRemovedAssociations().get(this.associationName);
+            if (removed.containsKey(targetId))
+            {
+               removed.remove(targetId);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Removed association to " + targetId + " from the removed list");
+            }
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
new file mode 100644
index 0000000000..766df365b5
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIOutput;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.DataDictionary;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Component to represent an individual child association within a property sheet
+ * 
+ * @author gavinc
+ */
+public class UIChildAssociation extends PropertySheetItem
+{
+   private static final String MSG_ERROR_CHILD_ASSOC = "error_child_association";
+   private static final String MSG_ERROR_NOT_CHILD_ASSOC = "error_not_child_association";
+
+   private static Log logger = LogFactory.getLog(UIChildAssociation.class);
+   
+   /**
+    * Default constructor
+    */
+   public UIChildAssociation()
+   {
+      // set the default renderer
+      setRendererType("org.alfresco.faces.ChildAssociationRenderer");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.ChildAssociation";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#getIncorrectParentMsg()
+    */
+   protected String getIncorrectParentMsg()
+   {
+      return "The childAssociation component must be nested within a property sheet component";
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#generateItem(javax.faces.context.FacesContext, org.alfresco.web.bean.repository.Node, java.lang.String)
+    */
+   protected void generateItem(FacesContext context, Node node, String var) throws IOException
+   {
+      String associationName = (String)getName();
+
+      // get details of the association
+      DataDictionary dd = (DataDictionary)FacesContextUtils.getRequiredWebApplicationContext(
+            context).getBean(Application.BEAN_DATA_DICTIONARY);
+      AssociationDefinition assocDef = dd.getAssociationDefinition(node, associationName);
+      
+      if (assocDef == null)
+      {
+         logger.warn("Failed to find child association definition for association '" + associationName + "'");
+         
+         // add an error message as the property is not defined in the data dictionary
+         String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_CHILD_ASSOC), new Object[] {associationName});
+         Utils.addErrorMessage(msg);
+      }
+      else
+      {
+         // we've found the association definition but we also need to check
+         // that the association is a parent child one
+         if (assocDef.isChild() == false)
+         {
+            String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_NOT_CHILD_ASSOC), new Object[] {associationName});
+            Utils.addErrorMessage(msg);
+         }
+         else
+         {
+            String displayLabel = (String)getDisplayLabel();
+            if (displayLabel == null)
+            {
+               // try and get the repository assigned label
+               displayLabel = assocDef.getTitle();
+               
+               // if the label is still null default to the local name of the property
+               if (displayLabel == null)
+               {
+                  displayLabel = assocDef.getName().getLocalName();
+               }
+            }
+            
+            // generate the label and type specific control
+            generateLabel(context, displayLabel);
+            generateControl(context, assocDef, var);
+         }
+      }
+   }
+   
+   /**
+    * Generates an appropriate control for the given property
+    * 
+    * @param context JSF context
+    * @param propDef The definition of the association to create the control for
+    * @param varName Name of the variable the node is stored in the session as 
+    *                (used for value binding expression)
+    * @param parent The parent component for the control
+    */
+   private void generateControl(FacesContext context, AssociationDefinition assocDef, 
+                                String varName)
+   {
+      UIPropertySheet propSheet = (UIPropertySheet)this.getParent();
+      ValueBinding vb = context.getApplication().createValueBinding("#{" + varName + "}");
+      
+      UIChildAssociationEditor control = (UIChildAssociationEditor)context.
+         getApplication().createComponent("org.alfresco.faces.ChildAssociationEditor");
+      control.setAssociationName(assocDef.getName().toString());
+      
+      // set up the common aspects of the control
+      control.setId(context.getViewRoot().createUniqueId());
+      control.setValueBinding("value", vb);
+      
+      // disable the component if necessary
+      if (propSheet.getMode().equalsIgnoreCase(UIPropertySheet.VIEW_MODE) || isReadOnly() || assocDef.isProtected())
+      {
+         control.setDisabled(true);
+      }
+      
+      // add the control itself
+      this.getChildren().add(control);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
new file mode 100644
index 0000000000..78890b62bc
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version
+ * 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.gnu.org/licenses/lgpl.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Component that allows child associations to be edited 
+ * i.e. new associations to be added, existing ones to be 
+ * removed whilst following the rules in the data dictionary 
+ * 
+ * @author gavinc
+ */
+public class UIChildAssociationEditor extends BaseAssociationEditor
+{
+   private static final Log logger = LogFactory.getLog(UIChildAssociationEditor.class);
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.ChildAssociationEditor";
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node)
+    */
+   protected void populateAssocationMaps(Node node)
+   {
+      // we need to remember the original set of associations (if there are any)
+      // and place them in a map keyed by the id of the child node
+      if (this.originalAssocs == null)
+      {
+         this.originalAssocs = new HashMap<String, Object>();
+
+         List assocs = (List)node.getChildAssociations().get(this.associationName);
+         if (assocs != null)
+         {
+            Iterator iter = assocs.iterator();
+            while (iter.hasNext())
+            {
+               ChildAssociationRef assoc = (ChildAssociationRef)iter.next();
+               
+               // add the association to the map
+               this.originalAssocs.put(assoc.getChildRef().getId(), assoc);
+            }
+         }
+      }
+      
+      // get the map of added associations for this node and association type
+      this.added = (Map)node.getAddedChildAssociations().get(this.associationName);
+      if (added == null)
+      {
+         // if there aren't any added associations for 'associationName' create a map and add it
+         added = new HashMap<String, Object>();
+         node.getAddedChildAssociations().put(this.associationName, (Map)added);
+      }
+      
+      // get the map of removed associations for this node and association type
+      this.removed = (Map)node.getRemovedChildAssociations().get(this.associationName);
+      if (removed == null)
+      {
+         // if there aren't any added associations for 'associationName' create a map and add it
+         removed = new HashMap<String, Object>();
+         node.getRemovedChildAssociations().put(this.associationName, (Map)removed);
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#renderExistingAssociations(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.alfresco.service.cmr.repository.NodeService, boolean)
+    */
+   protected void renderExistingAssociations(FacesContext context, ResponseWriter out, 
+         NodeService nodeService, boolean allowMany) throws IOException
+   {
+      boolean itemsRendered = false;
+      
+      // show the associations from the original list if they are not in the removed list
+      Iterator iter = this.originalAssocs.values().iterator();
+      while (iter.hasNext())
+      {
+         ChildAssociationRef assoc = (ChildAssociationRef)iter.next();
+         if (removed.containsKey(assoc.getChildRef().getId()) == false)
+         {
+            renderExistingAssociation(context, out, nodeService, assoc.getChildRef(), allowMany);
+            itemsRendered = true;
+         }
+      }
+      
+      // also show any associations added in this session
+      iter = this.added.values().iterator();
+      while (iter.hasNext())
+      {
+         ChildAssociationRef assoc = (ChildAssociationRef)iter.next();
+         renderExistingAssociation(context, out, nodeService, assoc.getChildRef(), allowMany);
+         itemsRendered = true;
+      }
+      
+      // show the none selected message if no items were rendered
+      if (itemsRendered == false && allowMany == true)
+      {
+         renderNone(context, out);
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#renderReadOnlyAssociations(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, org.alfresco.service.cmr.repository.NodeService)
+    */
+   protected void renderReadOnlyAssociations(FacesContext context, ResponseWriter out, NodeService nodeService) throws IOException
+   {
+      if (this.originalAssocs.size() > 0)
+      {
+         out.write("<table cellspacing='0' cellpadding='2' border='0'>");
+         
+         Iterator iter = this.originalAssocs.values().iterator();
+         while (iter.hasNext())
+         {
+            out.write("<tr><td>");
+            ChildAssociationRef assoc = (ChildAssociationRef)iter.next();
+            out.write(Repository.getDisplayPath(nodeService.getPath(assoc.getChildRef())));
+            out.write("/");
+            out.write(Repository.getNameForNode(nodeService, assoc.getChildRef()));
+            out.write("</tr></td>");
+         }
+         
+         out.write("</table>");
+      }
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#removeTarget(org.alfresco.web.bean.repository.Node, java.lang.String)
+    */
+   protected void removeTarget(Node node, String childId)
+   {
+      if (node != null && childId != null)
+      {
+         QName assocQName = Repository.resolveToQName(this.associationName);
+         ChildAssociationRef childAssoc = new ChildAssociationRef(assocQName, 
+            node.getNodeRef(), assocQName, new NodeRef(Repository.getStoreRef(), childId));
+         
+         // update the node so it knows to remove the association, but only if the association
+         // was one of the original ones
+         if (this.originalAssocs.containsKey(childId))
+         {
+            Map<String, ChildAssociationRef> removed = node.getRemovedChildAssociations().get(this.associationName);
+            removed.put(childId, childAssoc);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Added association to " + childId + " to the removed list");
+         }
+         
+         // if this association was previously added in this session it will still be
+         // in the added list so remove it if it is
+         Map<String, ChildAssociationRef> added = node.getAddedChildAssociations().get(this.associationName);
+         if (added.containsKey(childId))
+         {
+            added.remove(childId);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Removed association to " + childId + " from the added list");
+         }
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#addTarget(org.alfresco.web.bean.repository.Node, java.lang.String[])
+    */
+   protected void addTarget(Node node, String[] toAdd)
+   {
+      if (node != null && toAdd != null && toAdd.length > 0)
+      {
+         for (int x = 0; x < toAdd.length; x++)
+         {
+            String childId = toAdd[x];
+            
+            // update the node so it knows to add the association
+            if (this.originalAssocs.containsKey(childId) == false)
+            {
+               QName assocQName = Repository.resolveToQName(this.associationName);
+               ChildAssociationRef childAssoc = new ChildAssociationRef(assocQName, 
+                     node.getNodeRef(), assocQName, new NodeRef(Repository.getStoreRef(), childId));
+            
+               Map<String, ChildAssociationRef> added = node.getAddedChildAssociations().get(this.associationName);
+               added.put(childId, childAssoc);
+            
+               if (logger.isDebugEnabled())
+                  logger.debug("Added association to " + childId + " to the added list");
+            }
+            
+            // if the association was previously removed and has now been re-added it
+            // will still be in the "to be removed" list so remove it if it is
+            Map<String, ChildAssociationRef> removed = node.getRemovedChildAssociations().get(this.associationName);
+            if (removed.containsKey(childId))
+            {
+               removed.remove(childId);
+               
+               if (logger.isDebugEnabled())
+                  logger.debug("Removed association to " + childId + " from the removed list");
+            }
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java b/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
new file mode 100644
index 0000000000..2d93f547db
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIInput;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.DataDictionary;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.ComponentConstants;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.converter.XMLDateConverter;
+import org.alfresco.web.ui.repo.RepoConstants;
+import org.alfresco.web.ui.repo.component.UICategorySelector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Component to represent an individual property within a property sheet
+ * 
+ * @author gavinc
+ */
+public class UIProperty extends PropertySheetItem
+{
+   private static final String MSG_ERROR_PROPERTY = "error_property";
+   private static final String MSG_DATE_TIME = "date_time_pattern";
+   private static final String MSG_DATE = "date_pattern";
+
+   private static Log logger = LogFactory.getLog(UIProperty.class);
+
+   /**
+    * Default constructor
+    */
+   public UIProperty()
+   {
+      // set the default renderer
+      setRendererType("org.alfresco.faces.PropertyRenderer");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Property";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#getIncorrectParentMsg()
+    */
+   protected String getIncorrectParentMsg()
+   {
+      return "The property component must be nested within a property sheet component";
+   }
+
+   /**
+    * @see org.alfresco.web.ui.repo.component.property.PropertySheetItem#generateItem(javax.faces.context.FacesContext, org.alfresco.web.bean.repository.Node, java.lang.String)
+    */
+   protected void generateItem(FacesContext context, Node node, String var) throws IOException
+   {
+      String propertyName = (String)getName();
+
+      DataDictionary dd = (DataDictionary)FacesContextUtils.getRequiredWebApplicationContext(
+            context).getBean(Application.BEAN_DATA_DICTIONARY);
+      PropertyDefinition propDef = dd.getPropertyDefinition(node, propertyName);
+      
+      if (propDef == null)
+      {
+         // there is no definition for the node, so it may have been added to
+         // the node as an additional property, so look for it in the node itself
+         if (node.hasProperty(propertyName))
+         {
+            String displayLabel = (String)getDisplayLabel();
+            if (displayLabel == null)
+            {
+               displayLabel = propertyName;
+            }
+            
+            // generate the label and generic control
+            generateLabel(context, displayLabel);
+            generateControl(context, propertyName, var);
+         }
+         else
+         {
+            if (logger.isDebugEnabled())
+               logger.debug("Failed to find property definition for property '" + propertyName + "'");
+            
+            // add an error message as the property is not defined in the data dictionary and 
+            // not in the node's set of properties
+            String msg = MessageFormat.format(Application.getMessage(context, MSG_ERROR_PROPERTY), new Object[] {propertyName});
+            Utils.addErrorMessage(msg);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Added global error message: " + msg);
+         }
+      }
+      else
+      {
+         String displayLabel = (String)getDisplayLabel();
+         if (displayLabel == null)
+         {
+            // try and get the repository assigned label
+            displayLabel = propDef.getTitle();
+            
+            // if the label is still null default to the local name of the property
+            if (displayLabel == null)
+            {
+               displayLabel = propDef.getName().getLocalName();
+            }
+         }
+         
+         // generate the label and type specific control
+         generateLabel(context, displayLabel);
+         generateControl(context, propDef, var);
+      }
+   }
+   
+   /**
+    * Generates an appropriate control for the given property
+    * 
+    * @param context JSF context
+    * @param propDef The definition of the property to create the control for
+    * @param varName Name of the variable the node is stored in the session as 
+    *                (used for value binding expression)
+    * @param parent The parent component for the control
+    */
+   private void generateControl(FacesContext context, PropertyDefinition propDef, 
+                                String varName)
+   {
+      UIOutput control = null;
+      ValueBinding vb = context.getApplication().
+                        createValueBinding("#{" + varName + ".properties[\"" + 
+                        propDef.getName().toString() + "\"]}");
+      
+      UIPropertySheet propSheet = (UIPropertySheet)this.getParent();
+      
+      DataTypeDefinition dataTypeDef = propDef.getDataType();
+      QName typeName = dataTypeDef.getName();
+         
+      if (propSheet.getMode().equalsIgnoreCase(UIPropertySheet.VIEW_MODE))
+      {
+         // if we are in view mode simply output the text to the screen unless the type
+         // of the property is a category
+         if (typeName.equals(DataTypeDefinition.CATEGORY))
+         {
+            control = (UICategorySelector)context.getApplication().
+                  createComponent(RepoConstants.ALFRESCO_FACES_CATEGORY_SELECTOR);
+            ((UICategorySelector)control).setDisabled(true);
+         }
+         else
+         {
+            control = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+            control.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         }
+         
+         // if it is a date or datetime property add the converter
+         if (typeName.equals(DataTypeDefinition.DATETIME) )
+         {
+            XMLDateConverter conv = (XMLDateConverter)context.getApplication().
+               createConverter(RepoConstants.ALFRESCO_FACES_XMLDATA_CONVERTER);
+            conv.setType("both");
+            conv.setPattern(Application.getMessage(context, MSG_DATE_TIME));
+            control.setConverter(conv);
+         }
+         else if (typeName.equals(DataTypeDefinition.DATE))
+         {
+            XMLDateConverter conv = (XMLDateConverter)context.getApplication().
+               createConverter(RepoConstants.ALFRESCO_FACES_XMLDATA_CONVERTER);
+            conv.setType("date");
+            conv.setPattern(Application.getMessage(context, MSG_DATE));
+            control.setConverter(conv);
+         }
+      }
+      else
+      {
+         // generate the appropriate input field 
+         if (typeName.equals(DataTypeDefinition.BOOLEAN))
+         {
+            control = (UISelectBoolean)context.getApplication().
+                  createComponent(ComponentConstants.JAVAX_FACES_SELECT_BOOLEAN);
+            control.setRendererType(ComponentConstants.JAVAX_FACES_CHECKBOX);
+         }
+         else if (typeName.equals(DataTypeDefinition.CATEGORY))
+         {
+            control = (UICategorySelector)context.getApplication().
+                  createComponent(RepoConstants.ALFRESCO_FACES_CATEGORY_SELECTOR);
+         }
+         else if (typeName.equals(DataTypeDefinition.DATETIME))
+         {
+            control = (UIInput)context.getApplication().
+                  createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+            control.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
+            control.getAttributes().put("startYear", new Integer(1970));
+            control.getAttributes().put("yearCount", new Integer(50));
+            control.getAttributes().put("showTime", Boolean.valueOf(true));
+            control.getAttributes().put("style", "margin-right: 7px;");
+         }
+         else if (typeName.equals(DataTypeDefinition.DATE))
+         {
+            control = (UIInput)context.getApplication().
+                  createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+            control.setRendererType(RepoConstants.ALFRESCO_FACES_DATE_PICKER_RENDERER);
+            control.getAttributes().put("startYear", new Integer(1970));
+            control.getAttributes().put("yearCount", new Integer(50));
+            control.getAttributes().put("style", "margin-right: 7px;");
+         }
+         else
+         {
+            // any other type is represented as an input text field
+            control = (UIInput)context.getApplication().
+                  createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+            control.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+            control.getAttributes().put("size", "35");
+            control.getAttributes().put("maxlength", "1024");
+         }
+         
+         // if we are trying to edit a NodeRef or Path property type set it to read-only as 
+         // these are internal properties that shouldn't be edited.
+         if (typeName.equals(DataTypeDefinition.NODE_REF) || typeName.equals(DataTypeDefinition.PATH))
+         {
+            logger.warn("Setting property " + propDef.getName().toString() + " to read-only as it can not be edited");
+            control.getAttributes().put("disabled", Boolean.TRUE);
+         }
+      
+         // set control to disabled state if set to read only or if the
+         // property definition says it is protected
+         if (isReadOnly() || propDef.isProtected())
+         {
+            control.getAttributes().put("disabled", Boolean.TRUE);
+         }
+         
+         // add a validator if the field is required
+//         if (propDef.isMandatory())
+//         {
+//            control.setRequired(true);
+//            LengthValidator val = (LengthValidator)context.getApplication().
+//                                   createValidator("javax.faces.Length");
+//            val.setMinimum(1);
+//            control.addValidator(val);
+//         }   
+      }
+      
+      // set up the common aspects of the control
+      control.setId(context.getViewRoot().createUniqueId());
+      control.setValueBinding("value", vb);
+      
+      // if a converter has been specified we need to instantiate it
+      // and apply it to the control
+      if (getConverter() != null)
+      {
+         // catch null pointer exception to workaround bug in myfaces
+         try
+         {
+            Converter conv = context.getApplication().createConverter(getConverter());
+            control.setConverter(conv);
+         }
+         catch (FacesException fe)
+         {
+            logger.warn("Converter " + getConverter() + " could not be applied");
+         }
+      }
+      
+      // add the control itself
+      this.getChildren().add(control);
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Created control " + control + "(" + 
+                      control.getClientId(context) + 
+                      ") for '" + propDef.getName().toString() + 
+                      "' and added it to component " + this);
+   }
+   
+   /**
+    * Generates an appropriate control for the given property name
+    * 
+    * @param context JSF context
+    * @param propName The name of the property to create a control for
+    * @param varName Name of the variable the node is stored in the session as 
+    *                (used for value binding expression)
+    * @param parent The parent component for the control
+    */
+   private void generateControl(FacesContext context, String propName, 
+                                String varName)
+   {
+      ValueBinding vb = context.getApplication().
+                        createValueBinding("#{" + varName + ".properties[\"" + 
+                        propName + "\"]}");
+      
+      UIOutput control = null;
+      UIPropertySheet propSheet = (UIPropertySheet)this.getParent();
+      if (propSheet.getMode().equalsIgnoreCase(UIPropertySheet.VIEW_MODE))
+      {
+         // if we are in view mode simply output the text to the screen
+         control = (UIOutput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_OUTPUT);
+         control.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+      }
+      else
+      {
+         // as we don't know the type of the property we can only output a text field 
+         control = (UIInput)context.getApplication().createComponent(ComponentConstants.JAVAX_FACES_INPUT);
+         control.setRendererType(ComponentConstants.JAVAX_FACES_TEXT);
+         control.getAttributes().put("size", "35");
+         control.getAttributes().put("maxlength", "1024");
+      
+         // set control to disabled state if set to read only
+         if (isReadOnly())
+         {
+            control.getAttributes().put("disabled", Boolean.TRUE);
+         }
+      }
+      
+      // set the common attributes
+      control.setId(context.getViewRoot().createUniqueId());
+      control.setValueBinding("value", vb);
+      
+      // if a converter has been specified we need to instantiate it
+      // and apply it to the control
+      if (getConverter() != null)
+      {
+         try
+         {
+            Converter conv = context.getApplication().createConverter(getConverter());
+            control.setConverter(conv);
+         }
+         catch (FacesException fe)
+         {
+            logger.warn("Converter " + getConverter() + " could not be applied");
+         }
+      }
+      
+      // add the control itself
+      this.getChildren().add(control);
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Created control " + control + "(" + 
+                      control.getClientId(context) + 
+                      ") for '" + propName +  
+                      "' and added it to component " + this);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
new file mode 100644
index 0000000000..8349eb8494
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java
@@ -0,0 +1,549 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.property;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIPanel;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.config.Config;
+import org.alfresco.config.ConfigLookupContext;
+import org.alfresco.config.ConfigService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.config.PropertySheetConfigElement;
+import org.alfresco.web.config.PropertySheetConfigElement.AssociationConfig;
+import org.alfresco.web.config.PropertySheetConfigElement.ChildAssociationConfig;
+import org.alfresco.web.config.PropertySheetConfigElement.ItemConfig;
+import org.alfresco.web.config.PropertySheetConfigElement.PropertyConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.jsf.FacesContextUtils;
+
+/**
+ * Component that represents the properties of a Node
+ * 
+ * @author gavinc
+ */
+public class UIPropertySheet extends UIPanel implements NamingContainer
+{
+   public static final String VIEW_MODE = "view";
+   public static final String EDIT_MODE = "edit";
+   
+   private static Log logger = LogFactory.getLog(UIPropertySheet.class);
+   private static String DEFAULT_VAR_NAME = "node";
+   
+   private String variable;
+   private NodeRef nodeRef;
+   private Node node;
+   private Boolean readOnly;
+   private String mode;
+   private String configArea;
+   
+   /**
+    * Default constructor
+    */
+   public UIPropertySheet()
+   {
+      // set the default renderer for a property sheet
+      setRendererType("javax.faces.Grid");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "javax.faces.Panel";
+   }
+
+   /**
+    * @see javax.faces.component.UIComponent#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      String var = null;
+      int howManyKids = getChildren().size();
+      Boolean externalConfig = (Boolean)getAttributes().get("externalConfig");
+      
+      // generate a variable name to use if necessary
+      if (this.variable == null)
+      {
+         this.variable = DEFAULT_VAR_NAME;
+      }
+      
+      // force retrieval of node info
+      Node node = getNode();
+      
+      if (howManyKids == 0)
+      {
+         if (externalConfig != null && externalConfig.booleanValue())
+         {
+            // configure the component using the config service
+            if (logger.isDebugEnabled())
+               logger.debug("Configuring property sheet using ConfigService");
+
+            // get the properties to display
+            ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext(
+                  context).getBean(Application.BEAN_CONFIG_SERVICE);
+            Config configProps = null;
+            if (getConfigArea() == null)
+            {
+               configProps = configSvc.getConfig(node);
+            }
+            else
+            {
+               // only look within the given area
+               configProps = configSvc.getConfig(node, new ConfigLookupContext(getConfigArea()));
+            }
+            
+            PropertySheetConfigElement itemsToDisplay = (PropertySheetConfigElement)configProps.
+               getConfigElement("property-sheet");
+            
+            if (itemsToDisplay != null)
+            {
+               List<ItemConfig> itemsToRender = itemsToDisplay.getItemsToShow();
+            
+               if (logger.isDebugEnabled())
+                  logger.debug("Items to render: " + itemsToDisplay.getItemNamesToShow());
+            
+               createComponentsFromConfig(context, itemsToRender);
+            }
+            else
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("There are no items to render!");
+            }
+         }
+         else
+         {
+            // show all the properties for the current node
+            if (logger.isDebugEnabled())
+               logger.debug("Configuring property sheet using node's current state");
+            
+            createComponentsFromNode(context, node);
+         }
+      }
+      
+      // put the node in the session if it is not there already
+      Map sessionMap = getFacesContext().getExternalContext().getSessionMap();
+      sessionMap.put(this.variable, node);
+
+      if (logger.isDebugEnabled())
+         logger.debug("Put node into session with key '" + this.variable + "': " + node);
+
+      super.encodeBegin(context);
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.nodeRef = (NodeRef)values[1];
+      this.node = (Node)values[2];
+      this.variable = (String)values[3];
+      this.readOnly = (Boolean)values[4];
+      this.mode = (String)values[5];
+      this.configArea = (String)values[6];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[7];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.nodeRef;
+      values[2] = this.node;
+      values[3] = this.variable;
+      values[4] = this.readOnly;
+      values[5] = this.mode;
+      values[6] = this.configArea;
+      return (values);
+   }
+   
+   /**
+    * @return Returns the node
+    */
+   public Node getNode()
+   {
+      Node node = null;
+      
+      if (this.node == null)
+      {
+         // use the value to get hold of the actual object
+         Object value = getAttributes().get("value");
+         
+         if (value == null)
+         {
+            ValueBinding vb = getValueBinding("value");
+            if (vb != null)
+            {
+               value = vb.getValue(getFacesContext());
+            }
+         }
+         
+         // TODO: for now we presume the object is a Node, but we need to support id's too
+         if (value instanceof Node)
+         {
+            node = (Node)value;
+         }
+      }
+      else
+      {
+         node = this.node;
+      }
+      
+      return node;
+   }
+   
+   /**
+    * @param node The node
+    */
+   public void setNode(Node node)
+   {
+      this.node = node;
+   }
+   
+   /**
+    * @return Returns the variable.
+    */
+   public String getVar()
+   {
+      return this.variable;
+   }
+
+   /**
+    * @param variable The variable to set.
+    */
+   public void setVar(String variable)
+   {
+      this.variable = variable;
+   }
+   
+   /**
+    * @return Returns whether the property sheet is read only
+    */
+   public boolean isReadOnly()
+   {
+      if (this.readOnly == null)
+      {
+         ValueBinding vb = getValueBinding("readOnly");
+         if (vb != null)
+         {
+            this.readOnly = (Boolean)vb.getValue(getFacesContext());
+         }
+      }
+      
+      if (this.readOnly == null)
+      {
+         this.readOnly = Boolean.FALSE;
+      }
+      
+      return this.readOnly; 
+   }
+
+   /**
+    * @param readOnly Sets the read only flag for the property sheet
+    */
+   public void setReadOnly(boolean readOnly)
+   {
+      this.readOnly = Boolean.valueOf(readOnly);
+   }
+
+   /**
+    * @return Returns the mode
+    */
+   public String getMode()
+   {
+      if (this.mode == null)
+      {
+         ValueBinding vb = getValueBinding("mode");
+         if (vb != null)
+         {
+            this.mode = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      if (this.mode == null)
+      {
+         mode = EDIT_MODE;
+      }
+      
+      return mode;
+   }
+
+   /**
+    * @param mode Sets the mode
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * @return Returns the config area to use
+    */
+   public String getConfigArea()
+   {
+      if (this.configArea == null)
+      {
+         ValueBinding vb = getValueBinding("configArea");
+         if (vb != null)
+         {
+            this.configArea = (String)vb.getValue(getFacesContext());
+         }
+      }
+      
+      return configArea;
+   }
+   
+   /**
+    * @param configArea Sets the config area to use
+    */
+   public void setConfigArea(String configArea)
+   {
+      this.configArea = configArea;
+   }
+   
+   /**
+    * Creates all the property components required to display the properties held by the node.
+    * 
+    * @param context JSF context
+    * @param node The Node to show all the properties for 
+    * @throws IOException
+    */
+   private void createComponentsFromNode(FacesContext context, Node node)
+      throws IOException
+   {
+      // add all the properties of the node to the UI
+      Map<String, Object> props = node.getProperties();
+      for (String propertyName : props.keySet())
+      {
+         // create the property component
+         UIProperty propComp = (UIProperty)context.getApplication().createComponent("org.alfresco.faces.Property");
+         propComp.setId(context.getViewRoot().createUniqueId());
+         propComp.setName(propertyName);
+         
+         // if this property sheet is set as read only, set all properties to read only
+         if (isReadOnly())
+         {
+            propComp.setReadOnly(true);
+         }
+         
+         // NOTE: we don't know what the display label is so don't set it
+         
+         this.getChildren().add(propComp);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Created property component " + propComp + "(" + 
+                   propComp.getClientId(context) + 
+                   ") for '" + propertyName +
+                   "' and added it to property sheet " + this);
+      }
+      
+      // add all the associations of the node to the UI
+      Map associations = node.getAssociations();
+      Iterator iter = associations.keySet().iterator();
+      while (iter.hasNext())
+      {
+         String assocName = (String)iter.next();
+         UIAssociation assocComp = (UIAssociation)context.getApplication().createComponent("org.alfresco.faces.Association");
+         assocComp.setId(context.getViewRoot().createUniqueId());
+         assocComp.setName(assocName);
+         
+         // if this property sheet is set as read only, set all properties to read only
+         if (isReadOnly())
+         {
+            assocComp.setReadOnly(true);
+         }
+         
+         // NOTE: we don't know what the display label is so don't set it
+         
+         this.getChildren().add(assocComp);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Created association component " + assocComp + "(" + 
+                   assocComp.getClientId(context) + 
+                   ") for '" + assocName +
+                   "' and added it to property sheet " + this);
+      }
+      
+      // add all the child associations of the node to the UI
+      Map childAssociations = node.getChildAssociations();
+      iter = childAssociations.keySet().iterator();
+      while (iter.hasNext())
+      {
+         String assocName = (String)iter.next();
+         UIChildAssociation childAssocComp = (UIChildAssociation)context.getApplication().createComponent(
+               "org.alfresco.faces.ChildAssociation");
+         childAssocComp.setId(context.getViewRoot().createUniqueId());
+         childAssocComp.setName(assocName);
+         
+         // if this property sheet is set as read only, set all properties to read only
+         if (isReadOnly())
+         {
+            childAssocComp.setReadOnly(true);
+         }
+         
+         // NOTE: we don't know what the display label is so don't set it
+         
+         this.getChildren().add(childAssocComp);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Created child association component " + childAssocComp + "(" + 
+                   childAssocComp.getClientId(context) + 
+                   ") for '" + assocName +
+                   "' and added it to property sheet " + this);
+      }
+   }
+   
+   /**
+    * Creates all the property components required to display the properties specified
+    * in an external config file.
+    * 
+    * @param context JSF context
+    * @param properties List of properties to render (driven from configuration) 
+    * @throws IOException
+    */
+   private void createComponentsFromConfig(FacesContext context, List<ItemConfig> items)
+      throws IOException
+   {
+      // **********************************
+      // TODO: Make a common base class for the UIxxx components so we can
+      //       reduce the code below...
+      // **********************************
+      
+      for (ItemConfig item : items)
+      {
+         // create the appropriate component
+         if (item instanceof PropertyConfig)
+         {
+            UIProperty propComp = (UIProperty)context.getApplication().createComponent("org.alfresco.faces.Property");
+            propComp.setId(context.getViewRoot().createUniqueId());
+            propComp.setName(item.getName());
+            propComp.setConverter(item.getConverter());
+            
+            String displayLabel = item.getDisplayLabel();
+            if (item.getDisplayLabelId() != null)
+            {
+               String label = Application.getMessage(context, item.getDisplayLabelId());
+               if (label != null)
+               {
+                  displayLabel = label; 
+               }
+            }
+            propComp.setDisplayLabel(displayLabel);
+            
+            // if this property sheet is set as read only or the config says the property
+            // should be read only set it as such
+            if (isReadOnly() || item.isReadOnly())
+            {
+               propComp.setReadOnly(true);
+            }
+            
+            this.getChildren().add(propComp);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Created property component " + propComp + "(" + 
+                      propComp.getClientId(context) + 
+                      ") for '" + item.getName() + 
+                      "' and added it to property sheet " + this);
+         }
+         else if (item instanceof AssociationConfig)
+         {
+            UIAssociation assocComp = (UIAssociation)context.getApplication().createComponent("org.alfresco.faces.Association");
+            assocComp.setId(context.getViewRoot().createUniqueId());
+            assocComp.setName(item.getName());
+            assocComp.setConverter(item.getConverter());
+            
+            String displayLabel = item.getDisplayLabel();
+            if (item.getDisplayLabelId() != null)
+            {
+               String label = Application.getMessage(context, item.getDisplayLabelId());
+               if (label != null)
+               {
+                  displayLabel = label; 
+               }
+            }
+            assocComp.setDisplayLabel(displayLabel);
+            
+            // if this property sheet is set as read only or the config says the property
+            // should be read only set it as such
+            if (isReadOnly() || item.isReadOnly())
+            {
+               assocComp.setReadOnly(true);
+            }
+            
+            this.getChildren().add(assocComp);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Created association component " + assocComp + "(" + 
+                      assocComp.getClientId(context) + 
+                      ") for '" + item.getName() + 
+                      "' and added it to property sheet " + this);
+         }
+         else if (item instanceof ChildAssociationConfig)
+         {
+            UIChildAssociation assocComp = (UIChildAssociation)context.getApplication().createComponent("org.alfresco.faces.ChildAssociation");
+            assocComp.setId(context.getViewRoot().createUniqueId());
+            assocComp.setName(item.getName());
+            assocComp.setConverter(item.getConverter());
+            
+            String displayLabel = item.getDisplayLabel();
+            if (item.getDisplayLabelId() != null)
+            {
+               String label = Application.getMessage(context, item.getDisplayLabelId());
+               if (label != null)
+               {
+                  displayLabel = label; 
+               }
+            }
+            assocComp.setDisplayLabel(displayLabel);
+            
+            // if this property sheet is set as read only or the config says the property
+            // should be read only set it as such
+            if (isReadOnly() || item.isReadOnly())
+            {
+               assocComp.setReadOnly(true);
+            }
+            
+            this.getChildren().add(assocComp);
+            
+            if (logger.isDebugEnabled())
+               logger.debug("Created child association component " + assocComp + "(" + 
+                      assocComp.getClientId(context) + 
+                      ") for '" + item.getName() + 
+                      "' and added it to property sheet " + this);
+         }
+      }
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
new file mode 100644
index 0000000000..43cb00f289
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.clipboard.ClipboardItem;
+import org.alfresco.web.bean.clipboard.ClipboardStatus;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.repo.WebResources;
+
+
+/**
+ * @author Kevin Roast
+ */
+public class UIClipboardShelfItem extends UIShelfItem
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.collections = (List)values[1];
+      this.pasteActionListener = (MethodBinding)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.collections;
+      values[2] = this.pasteActionListener;
+      return values;
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      if (value != null && value.length() != 0)
+      {
+         // decode the values - we are expecting an action identifier and an index
+         int sepIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         int action = Integer.parseInt(value.substring(0, sepIndex));
+         int index = Integer.parseInt(value.substring(sepIndex + 1));
+         
+         // raise an event to process the action later in the lifecycle
+         ClipboardEvent event = new ClipboardEvent(this, action, index);
+         this.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ClipboardEvent)
+      {
+         // found an event we should handle
+         ClipboardEvent clipEvent = (ClipboardEvent)event;
+         
+         List<ClipboardItem> items = getCollections();
+         if (items.size() > clipEvent.Index)
+         {
+            // process the action
+            switch (clipEvent.Action)
+            {
+               case ACTION_REMOVE_ALL:
+                  items.clear();
+                  break;
+               
+               case ACTION_REMOVE_ITEM:
+                  items.remove(clipEvent.Index);
+                  break;
+               
+               case ACTION_PASTE_ALL:
+               case ACTION_PASTE_ITEM:
+                  Utils.processActionMethod(getFacesContext(), getPasteActionListener(), clipEvent);
+                  break;
+            }
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      List<ClipboardItem> items = getCollections();
+      out.write(SHELF_START);
+      if (items.size() != 0)
+      {
+         DictionaryService dd = Repository.getServiceRegistry(context).getDictionaryService();
+         
+         ResourceBundle bundle = Application.getBundle(context);
+         
+         for (int i=0; i<items.size(); i++)
+         {
+            ClipboardItem item = items.get(i);
+            
+            // start row with cut/copy state icon
+            out.write("<tr><td>");
+            if (item.Mode == ClipboardStatus.COPY)
+            {
+               out.write(Utils.buildImageTag(context, WebResources.IMAGE_COPY, 14, 16, bundle.getString(MSG_COPY), null, "absmiddle"));
+            }
+            else
+            {
+               out.write(Utils.buildImageTag(context, WebResources.IMAGE_CUT, 13, 16, bundle.getString(MSG_CUT), null, "absmiddle"));
+            }
+            out.write("</td><td>");
+            
+            if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER))
+            {
+               // start row with Space icon
+               out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle"));
+            }
+            else if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT))
+            {
+               String image = Utils.getFileTypeImage(item.Node.getName(), true);
+               out.write(Utils.buildImageTag(context, image, 16, 16, null, null, "absmiddle"));
+            }
+            
+            // output cropped item label - we also output with no breaks, this is ok
+            // as the copped label will ensure a sensible maximum width
+            out.write("</td><td width=100%><nobr>&nbsp;");
+            out.write(Utils.cropEncode(item.Node.getName()));
+            
+            // output actions
+            out.write("</nobr></td><td align=right><nobr>");
+            out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE));
+            out.write("&nbsp;");
+            out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE));
+            
+            // end actions cell and end row
+            out.write("</nobr></td></tr>");
+         }
+         
+         // output general actions if any clipboard items are present
+         out.write("<tr><td colspan=3><nobr>");
+         out.write(buildActionLink(ACTION_PASTE_ALL, -1, bundle.getString(MSG_PASTE_ALL), null));
+         out.write("&nbsp;");
+         out.write(buildActionLink(ACTION_REMOVE_ALL, -1, bundle.getString(MSG_REMOVE_ALL), null));
+         out.write("</nobr></td><td></td></tr>");
+      }
+      
+      out.write(SHELF_END);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * @param collections   Set the clipboard item collections to use
+    */
+   public void setCollections(List<ClipboardItem> collections)
+   {
+      this.collections = collections;
+   }
+   
+   /**
+    * @return The clipboard item collections to use
+    */
+   public List<ClipboardItem> getCollections()
+   {
+      ValueBinding vb = getValueBinding("collections");
+      if (vb != null)
+      {
+         this.collections = (List<ClipboardItem>)vb.getValue(getFacesContext());
+      }
+      
+      return this.collections;
+   }
+   
+   /** 
+    * @param binding    The MethodBinding to call when Paste is selected by the user
+    */
+   public void setPasteActionListener(MethodBinding binding)
+   {
+      this.pasteActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call when Paste is selected by the user
+    */
+   public MethodBinding getPasteActionListener()
+   {
+      return this.pasteActionListener;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name on the assumption that only one clipboard shelf item instance
+    * is present on a single page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   /**
+    * Encode the specified values for output to a hidden field
+    * 
+    * @param action     Action identifer
+    * @param index      Index of the clipboard item the action is for
+    * 
+    * @return encoded values
+    */
+   private static String encodeValues(int action, int index)
+   {
+      return Integer.toString(action) + NamingContainer.SEPARATOR_CHAR + Integer.toString(index);
+   }
+   
+   /**
+    * Build HTML for an link representing a clipboard action
+    * 
+    * @param action     action indentifier to represent
+    * @param index      index of the clipboard item this action relates too
+    * @param text       of the action to display
+    * @param image      image icon to display
+    * 
+    * @return HTML for action link
+    */
+   private String buildActionLink(int action, int index, String text, String image)
+   {
+      FacesContext context = getFacesContext(); 
+      
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<a href='#' onclick=\"");
+      // generate JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), encodeValues(action, index)));
+      buf.append("\">");
+      
+      if (image != null)
+      {
+         buf.append(Utils.buildImageTag(context, image, text));
+      }
+      else
+      {
+         buf.append(Utils.encode(text));
+      }
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action relevant to the Clipboard element.
+    */
+   public static class ClipboardEvent extends ActionEvent
+   {
+      public ClipboardEvent(UIComponent component, int action, int index)
+      {
+         super(component);
+         Action = action;
+         Index = index;
+      }
+      
+      public int Action;
+      public int Index;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** I18N messages */
+   private static final String MSG_REMOVE_ALL = "remove_all";
+   private static final String MSG_PASTE_ALL = "paste_all";
+   private static final String MSG_PASTE_ITEM = "paste_item";
+   private static final String MSG_REMOVE_ITEM = "remove_item";
+   private static final String MSG_CUT = "cut";
+   private static final String MSG_COPY = "copy";
+   
+   private final static int ACTION_REMOVE_ITEM = 0;
+   private final static int ACTION_REMOVE_ALL = 1;
+   private final static int ACTION_PASTE_ITEM = 2;
+   private final static int ACTION_PASTE_ALL = 3;
+   
+   /** the current list of clipboard items */
+   private List<ClipboardItem> collections;
+   
+   /** action listener called when a paste action occurs */
+   private MethodBinding pasteActionListener;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java
new file mode 100644
index 0000000000..daddef9c09
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * JSF Component providing UI for a real-time updated list of the most recently visited Spaces.
+ * 
+ * @author Kevin Roast
+ */
+public class UIRecentSpacesShelfItem extends UIShelfItem
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+      this.navigateActionListener = (MethodBinding)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      values[2] = this.navigateActionListener;
+      
+      return (values);
+   }
+   
+   /**
+    * Get the value (for this component the value is used as the List of recent Space Nodes)
+    *
+    * @return the value
+    */
+   public Object getValue()
+   {
+      if (this.value == null)
+      {
+         ValueBinding vb = getValueBinding("value");
+         if (vb != null)
+         {
+            this.value = vb.getValue(getFacesContext());
+         }
+      }
+      return this.value;
+   }
+
+   /**
+    * Set the value (for this component the value is used as the List of recent Space Nodes)
+    *
+    * @param value     the value
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+   
+   /** 
+    * @param binding    The MethodBinding to call when Navigate is performed by the user
+    */
+   public void setNavigateActionListener(MethodBinding binding)
+   {
+      this.navigateActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call when Navigate is performed by the user
+    */
+   public MethodBinding getNavigateActionListener()
+   {
+      return this.navigateActionListener;
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      if (value != null && value.length() != 0)
+      {
+         // decode the values - we are expecting an action identifier and an index
+         int sepIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         int action = Integer.parseInt(value.substring(0, sepIndex));
+         int index = Integer.parseInt(value.substring(sepIndex + 1));
+         
+         // raise an event to process the action later in the lifecycle
+         RecentSpacesEvent event = new RecentSpacesEvent(this, action, index);
+         this.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      List<Node> items = (List<Node>)getValue();
+      out.write(SHELF_START);
+      for (int i=0; i<items.size(); i++)
+      {
+         Node item = items.get(i);
+         
+         // start row with Space icon
+         out.write("<tr><td>");
+         out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle"));
+         
+         // output cropped item label - we also output with no breaks, this is ok
+         // as the copped label will ensure a sensible maximum width
+         out.write("</td><td width=100%><nobr>&nbsp;");
+         out.write(buildActionLink(ACTION_NAVIGATE_ITEM, i, item.getName()));
+         
+         // end actions cell and end row
+         out.write("</nobr></td></tr>");
+      }
+      
+      out.write(SHELF_END);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof RecentSpacesEvent)
+      {
+         // found an event we should handle
+         RecentSpacesEvent spaceEvent = (RecentSpacesEvent)event;
+         
+         List<Node> items = (List<Node>)getValue();
+         if (items.size() > spaceEvent.Index)
+         {
+            // process the action
+            switch (spaceEvent.Action)
+            {
+               case ACTION_NAVIGATE_ITEM:
+                  Utils.processActionMethod(getFacesContext(), getNavigateActionListener(), spaceEvent);
+                  break;
+            }
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name on the assumption that only one Recent Spaces shelf item
+    * instance is present on a single page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   /**
+    * Build HTML for an link representing a Recent Space action
+    * 
+    * @param action     action indentifier to represent
+    * @param index      index of the Node item this action relates too
+    * @param text       of the action to display
+    * 
+    * @return HTML for action link
+    */
+   private String buildActionLink(int action, int index, String text)
+   {
+      FacesContext context = getFacesContext(); 
+      
+      StringBuilder buf = new StringBuilder(200);
+      
+      buf.append("<a href='#' onclick=\"");
+      // generate JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), encodeValues(action, index)));
+      buf.append("\">");
+      
+      buf.append(Utils.cropEncode(text));
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Encode the specified values for output to a hidden field
+    * 
+    * @param action     Action identifer
+    * @param index      Index of the Node item the action is for
+    * 
+    * @return encoded values
+    */
+   private static String encodeValues(int action, int index)
+   {
+      return Integer.toString(action) + NamingContainer.SEPARATOR_CHAR + Integer.toString(index);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action relevant to the Recent Spaces element.
+    */
+   public static class RecentSpacesEvent extends ActionEvent
+   {
+      public RecentSpacesEvent(UIComponent component, int action, int index)
+      {
+         super(component);
+         Action = action;
+         Index = index;
+      }
+      
+      public int Action;
+      public int Index;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   private final static int ACTION_NAVIGATE_ITEM = 0;
+   
+   /** for this component the value is used as the List of recent Space Nodes */
+   private Object value = null;
+   
+   /** action listener called when a Navigate action occurs */
+   private MethodBinding navigateActionListener;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
new file mode 100644
index 0000000000..758f8859f6
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.web.ui.common.PanelGenerator;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.WebResources;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIShelf extends SelfRenderingComponent
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Shelf";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.groupPanel = (String)values[1];
+      this.groupBgcolor = (String)values[2];
+      this.selectedGroupPanel = (String)values[3];
+      this.selectedGroupBgcolor = (String)values[4];
+      this.innerGroupPanel = (String)values[5];
+      this.innerGroupBgcolor = (String)values[6];
+      this.groupExpandedActionListener = (MethodBinding)values[7];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[8];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.groupPanel;
+      values[2] = this.groupBgcolor;
+      values[3] = this.selectedGroupPanel;
+      values[4] = this.selectedGroupBgcolor;
+      values[5] = this.innerGroupPanel;
+      values[6] = this.innerGroupBgcolor;
+      values[7] = this.groupExpandedActionListener;
+      return values;
+   }
+   
+   /** 
+    * @param binding    The MethodBinding to call when the Group expand action is performed by the user
+    */
+   public void setGroupExpandedActionListener(MethodBinding binding)
+   {
+      this.groupExpandedActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call for the Group expand action
+    */
+   public MethodBinding getGroupExpandedActionListener()
+   {
+      return this.groupExpandedActionListener;
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.length() != 0)
+      {
+         int sepIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         int groupIndex = Integer.parseInt( value.substring(0, sepIndex) );
+         boolean expanded = Boolean.parseBoolean( value.substring(sepIndex + 1) );
+         
+         // fire an event here to indicate the change that occured
+         ShelfEvent event = new ShelfEvent(this, groupIndex, expanded);
+         this.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ShelfEvent)
+      {
+         ShelfEvent shelfEvent = (ShelfEvent)event;
+         
+         // set the new expanded state of the appropriate shelf item
+         int index = 0;
+         for (Iterator i=this.getChildren().iterator(); i.hasNext(); index++)
+         {
+            UIComponent child = (UIComponent)i.next();
+            if (index == shelfEvent.Index && child instanceof UIShelfGroup)
+            {
+               // found correct child - set the new state
+               ((UIShelfGroup)child).setExpanded(shelfEvent.Expanded);
+               break;
+            }
+         }
+         
+         // if an action event is registered to be notified then fire that next
+         if (getGroupExpandedActionListener() != null)
+         {
+            Utils.processActionMethod(getFacesContext(), getGroupExpandedActionListener(), shelfEvent);
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // TODO: allow config of spacing between ShelfGroup components
+      out.write("<table border=0 cellspacing=2 cellpadding=0 width=100%>");
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeChildren(javax.faces.context.FacesContext)
+    */
+   public void encodeChildren(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // output each shelf group in turn
+      int index = 0;
+      for (Iterator i=this.getChildren().iterator(); i.hasNext(); index++)
+      {
+         UIComponent child = (UIComponent)i.next();
+         if (child instanceof UIShelfGroup)
+         {
+            UIShelfGroup group = (UIShelfGroup)child;
+            if (group.isRendered() == true)
+            {
+               // output the surrounding structure then call the component to render itself and children
+               boolean isExpanded = group.isExpanded();      // TODO: get this from Shelf or ShelfGroup?
+               out.write("<tr><td>");
+               
+               String contextPath = context.getExternalContext().getRequestContextPath();
+               
+               // output appropriate panel start section and bgcolor
+               String groupPanel;
+               String groupBgcolor;
+               if (isExpanded == false)
+               {
+                  groupPanel = getGroupPanel();
+                  groupBgcolor = getGroupBgcolor();
+               }
+               else
+               {
+                  groupPanel = getSelectedGroupPanel();
+                  groupBgcolor = getSelectedGroupBgcolor();
+               }
+               if (groupBgcolor == null)
+               {
+                  groupBgcolor = PanelGenerator.BGCOLOR_WHITE;
+               }
+               if (groupPanel != null)
+               {
+                  PanelGenerator.generatePanelStart(out, contextPath, groupPanel, groupBgcolor);
+               }
+               
+               // output appropriate expanded icon state
+               out.write("<div style='padding-top:2px;padding-bottom:4px'><nobr>");
+               out.write("<a href='#' onclick=\"");
+               // encode value as the index of the ShelfGroup clicked and the new state
+               String value = Integer.toString(index) + NamingContainer.SEPARATOR_CHAR + Boolean.toString(!isExpanded);
+               out.write(Utils.generateFormSubmit(context, this, getHiddenFieldName(), value));
+               out.write("\">");
+               if (isExpanded == true)
+               {
+                  out.write(Utils.buildImageTag(context, WebResources.IMAGE_EXPANDED, 11, 11, ""));
+               }
+               else
+               {
+                  out.write(Utils.buildImageTag(context, WebResources.IMAGE_COLLAPSED, 11, 11, ""));
+               }
+               out.write("</a>&nbsp;");
+               
+               // output title label text
+               String label = group.getLabel();
+               out.write("<span");
+               outputAttribute(out, group.getAttributes().get("style"), "style");
+               outputAttribute(out, group.getAttributes().get("styleClass"), "class");
+               out.write('>');
+               out.write(Utils.encode(label));
+               out.write("</span>");
+               out.write("</nobr></div>");
+               
+               if (isExpanded == true)
+               {
+                  // if this is the expanded group, output the inner panel 
+                  String innerGroupPanel = getInnerGroupPanel();
+                  String innerGroupBgcolor = getInnerGroupBgcolor();
+                  if (innerGroupBgcolor == null)
+                  {
+                     innerGroupBgcolor = PanelGenerator.BGCOLOR_WHITE;
+                  }
+                  if (innerGroupPanel != null)
+                  {
+                     PanelGenerator.generatePanelStart(out, contextPath, innerGroupPanel, innerGroupBgcolor);
+                  }
+                  
+                  // allow child components to render themselves
+                  Utils.encodeRecursive(context, group);
+                  
+                  if (innerGroupPanel != null)
+                  {
+                     PanelGenerator.generatePanelEnd(out, contextPath, innerGroupPanel);
+                  }
+               }
+               
+               // output panel and group end elements
+               PanelGenerator.generatePanelEnd(out, contextPath, groupPanel);
+               out.write("</td></tr>");
+            }
+         }
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeEnd(javax.faces.context.FacesContext)
+    */
+   public void encodeEnd(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      out.write("</table>");
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * @return Returns the group panel name.
+    */
+   public String getGroupPanel()
+   {
+      ValueBinding vb = getValueBinding("groupPanel");
+      if (vb != null)
+      {
+         this.groupPanel = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.groupPanel;
+   }
+   
+   /**
+    * @param groupPanel    The group panel name to set.
+    */
+   public void setGroupPanel(String groupPanel)
+   {
+      this.groupPanel = groupPanel;
+   }
+   
+   /**
+    * @return Returns the group background colour.
+    */
+   public String getGroupBgcolor()
+   {
+      ValueBinding vb = getValueBinding("groupBgcolor");
+      if (vb != null)
+      {
+         this.groupBgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.groupBgcolor;
+   }
+   
+   /**
+    * @param groupBgcolor    The group background colour to set.
+    */
+   public void setGroupBgcolor(String groupBgcolor)
+   {
+      this.groupBgcolor = groupBgcolor;
+   }
+   
+   /**
+    * @return Returns the selected group panel name.
+    */
+   public String getSelectedGroupPanel()
+   {
+      ValueBinding vb = getValueBinding("selectedGroupPanel");
+      if (vb != null)
+      {
+         this.selectedGroupPanel = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.selectedGroupPanel;
+   }
+   
+   /**
+    * @param selectedGroupPanel    The selected group panel name to set.
+    */
+   public void setSelectedGroupPanel(String selectedGroupPanel)
+   {
+      this.selectedGroupPanel = selectedGroupPanel;
+   }
+   
+   /**
+    * @return Returns the selected group background colour.
+    */
+   public String getSelectedGroupBgcolor()
+   {
+      ValueBinding vb = getValueBinding("selectedGroupBgcolor");
+      if (vb != null)
+      {
+         this.selectedGroupBgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.selectedGroupBgcolor;
+   }
+   
+   /**
+    * @param selectedGroupBgcolor    The selected group background colour to set.
+    */
+   public void setSelectedGroupBgcolor(String selectedGroupBgcolor)
+   {
+      this.selectedGroupBgcolor = selectedGroupBgcolor;
+   }
+   
+   /**
+    * @return Returns the inner group panel name.
+    */
+   public String getInnerGroupPanel()
+   {
+      ValueBinding vb = getValueBinding("innerGroupPanel");
+      if (vb != null)
+      {
+         this.innerGroupPanel = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.innerGroupPanel;
+   }
+   
+   /**
+    * @param innerGroupPanel    The inner group panel name to set.
+    */
+   public void setInnerGroupPanel(String innerGroupPanel)
+   {
+      this.innerGroupPanel = innerGroupPanel;
+   }
+   
+   /**
+    * @return Returns the inner group background colour.
+    */
+   public String getInnerGroupBgcolor()
+   {
+      ValueBinding vb = getValueBinding("innerGroupBgcolor");
+      if (vb != null)
+      {
+         this.innerGroupBgcolor = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.innerGroupBgcolor;
+   }
+   
+   /**
+    * @param innerGroupBgcolor    The inner group background colour to set.
+    */
+   public void setInnerGroupBgcolor(String innerGroupBgcolor)
+   {
+      this.innerGroupBgcolor = innerGroupBgcolor;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name on the assumption that very few shelf instances will
+    * be present on a single page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action event relevant to the Shelf.
+    */
+   public static class ShelfEvent extends ActionEvent
+   {
+      public ShelfEvent(UIComponent component, int index, boolean expanded)
+      {
+         super(component);
+         Expanded = expanded;
+         Index = index;
+      }
+      
+      public boolean Expanded;
+      public int Index;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** component properties */
+   private String groupPanel;
+   private String groupBgcolor;
+   private String selectedGroupPanel;
+   private String selectedGroupBgcolor;
+   private String innerGroupPanel;
+   private String innerGroupBgcolor;
+   private MethodBinding groupExpandedActionListener;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
new file mode 100644
index 0000000000..8f74755b1b
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfGroup.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIShelfGroup extends SelfRenderingComponent
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Shelf";
+   }
+
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.expanded = ((Boolean)values[1]).booleanValue();
+      this.label = (String)values[2];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = (this.expanded ? Boolean.TRUE : Boolean.FALSE);
+      values[2] = this.label;
+      return values;
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeChildren(javax.faces.context.FacesContext)
+    */
+   public void encodeChildren(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      
+      // output each shelf group component in turn
+      out.write("<table cellspacing=0 cellpadding=0 border=0 width=100%>");
+      for (Iterator i=this.getChildren().iterator(); i.hasNext(); /**/)
+      {
+         UIComponent child = (UIComponent)i.next();
+         if (child instanceof UIShelfItem)
+         {
+            // render child items
+            out.write("<tr><td>");
+            Utils.encodeRecursive(context, child);
+            out.write("</tr></td>");
+         }
+      }
+      out.write("</table>");
+   }
+
+   /**
+    * @see javax.faces.component.UIComponentBase#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+   
+   /**
+    * @return Returns the label.
+    */
+   public String getLabel()
+   {
+      ValueBinding vb = getValueBinding("label");
+      if (vb != null)
+      {
+         this.label = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.label;
+   }
+
+   /**
+    * @param label The label to set.
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+   
+   /**
+    * Returns whether the component show allow rendering of its child components.
+    */
+   public boolean isExpanded()
+   {
+      ValueBinding vb = getValueBinding("expanded");
+      if (vb != null)
+      {
+         Boolean expanded = (Boolean)vb.getValue(getFacesContext());
+         if (expanded != null)
+         {
+            this.expanded = expanded.booleanValue();
+         }
+      }
+      
+      return this.expanded;
+   }
+   
+   /**
+    * Sets whether the group is expanded
+    */
+   public void setExpanded(boolean expanded)
+   {
+      this.expanded = expanded;
+   }
+   
+   
+   private String label = null;
+   private boolean expanded = false;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
new file mode 100644
index 0000000000..452a28153c
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelfItem.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+
+/**
+ * @author Kevin Roast
+ */
+public class UIShelfItem extends SelfRenderingComponent
+{
+   protected final static String SHELF_START = "<table border=0 cellspacing=3 cellpadding=0 width=100% valign=top>";
+   protected final static String SHELF_END   = "</table>";
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component Impl 
+
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Shelf";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java
new file mode 100644
index 0000000000..a22c69a410
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.shelf;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.repo.WebResources;
+
+/**
+ * JSF Component providing UI for a list of user defined shortcuts to favorite nodes.
+ * 
+ * @author Kevin Roast
+ */
+public class UIShortcutsShelfItem extends UIShelfItem
+{
+   // ------------------------------------------------------------------------------
+   // Component Impl
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.value = values[1];
+      this.clickActionListener = (MethodBinding)values[2];
+      this.removeActionListener = (MethodBinding)values[3];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[4];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.value;
+      values[2] = this.clickActionListener;
+      values[3] = this.removeActionListener;
+      
+      return (values);
+   }
+   
+   /**
+    * Get the value (for this component the value is used as the List of shortcut nodes)
+    *
+    * @return the value
+    */
+   public Object getValue()
+   {
+      if (this.value == null)
+      {
+         ValueBinding vb = getValueBinding("value");
+         if (vb != null)
+         {
+            this.value = vb.getValue(getFacesContext());
+         }
+      }
+      return this.value;
+   }
+
+   /**
+    * Set the value (for this component the value is used as the List of shortcut nodes)
+    *
+    * @param value     the value
+    */
+   public void setValue(Object value)
+   {
+      this.value = value;
+   }
+   
+   /** 
+    * @param binding    The MethodBinding to call when Click is performed by the user
+    */
+   public void setClickActionListener(MethodBinding binding)
+   {
+      this.clickActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call when Click is performed by the user
+    */
+   public MethodBinding getClickActionListener()
+   {
+      return this.clickActionListener;
+   }
+   
+   /** 
+    * @param binding    The MethodBinding to call when Remove is performed by the user
+    */
+   public void setRemoveActionListener(MethodBinding binding)
+   {
+      this.removeActionListener = binding;
+   }
+   
+   /** 
+    * @return The MethodBinding to call when Remove is performed by the user
+    */
+   public MethodBinding getRemoveActionListener()
+   {
+      return this.removeActionListener;
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName();
+      String value = (String)requestMap.get(fieldId);
+      
+      if (value != null && value.length() != 0)
+      {
+         // decode the values - we are expecting an action identifier and an index
+         int sepIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         int action = Integer.parseInt(value.substring(0, sepIndex));
+         int index = Integer.parseInt(value.substring(sepIndex + 1));
+         
+         // raise an event to process the action later in the lifecycle
+         ShortcutEvent event = new ShortcutEvent(this, action, index);
+         this.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      ResponseWriter out = context.getResponseWriter();
+      List<Node> items = (List<Node>)getValue();
+      out.write(SHELF_START);
+      if (items != null)
+      {
+         DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
+         
+         for (int i=0; i<items.size(); i++)
+         {
+            Node item = items.get(i);
+            
+            out.write("<tr><td>");
+            if (dd.isSubClass(item.getType(), ContentModel.TYPE_FOLDER))
+            {
+               // start row with Space icon
+               out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle"));
+            }
+            else if (dd.isSubClass(item.getType(), ContentModel.TYPE_CONTENT))
+            {
+               String image = Utils.getFileTypeImage(item.getName(), true);
+               out.write(Utils.buildImageTag(context, image, 16, 16, null, null, "absmiddle"));
+            }
+            
+            // output cropped item label - we also output with no breaks, this is ok
+            // as the copped label will ensure a sensible maximum width
+            out.write("</td><td width=100%><nobr>&nbsp;");
+            out.write(buildActionLink(ACTION_CLICK_ITEM, i, item.getName()));
+            
+            // output actions
+            out.write("</nobr></td><td align=right><nobr>");
+            out.write(buildActionLink(ACTION_REMOVE_ITEM, i, Application.getMessage(context, MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE));
+            // TODO: add view details action here?
+            
+            // end actions cell and end row
+            out.write("</nobr></td></tr>");
+         }
+      }
+      
+      out.write(SHELF_END);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent)
+    */
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof ShortcutEvent)
+      {
+         // found an event we should handle
+         ShortcutEvent shortcutEvent = (ShortcutEvent)event;
+         
+         List<Node> items = (List<Node>)getValue();
+         if (items != null && items.size() > shortcutEvent.Index)
+         {
+            // process the action
+            switch (shortcutEvent.Action)
+            {
+               case ACTION_CLICK_ITEM:
+                  Utils.processActionMethod(getFacesContext(), getClickActionListener(), shortcutEvent);
+                  break;
+               case ACTION_REMOVE_ITEM:
+                  Utils.processActionMethod(getFacesContext(), getRemoveActionListener(), shortcutEvent);
+                  break;
+            }
+         }
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+   
+   /**
+    * We use a hidden field name on the assumption that only one Shortcut Shelf item
+    * instance is present on a single page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName()
+   {
+      return getClientId(getFacesContext());
+   }
+   
+   /**
+    * Build HTML for an link representing a Shortcut action
+    * 
+    * @param action     action indentifier to represent
+    * @param index      index of the Node item this action relates too
+    * @param text       of the action to display
+    * 
+    * @return HTML for action link
+    */
+   private String buildActionLink(int action, int index, String text)
+   {
+      FacesContext context = getFacesContext(); 
+      
+      StringBuilder buf = new StringBuilder(200);
+      
+      buf.append("<a href='#' onclick=\"");
+      // generate JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), encodeValues(action, index)));
+      buf.append("\">");
+      
+      buf.append(Utils.cropEncode(text));
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Build HTML for an link representing a clipboard action
+    * 
+    * @param action     action indentifier to represent
+    * @param index      index of the clipboard item this action relates too
+    * @param text       of the action to display
+    * @param image      image icon to display
+    * 
+    * @return HTML for action link
+    */
+   private String buildActionLink(int action, int index, String text, String image)
+   {
+      FacesContext context = getFacesContext(); 
+      
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<a href='#' onclick=\"");
+      // generate JavaScript to set a hidden form field and submit
+      // a form which request attributes that we can decode
+      buf.append(Utils.generateFormSubmit(context, this, getHiddenFieldName(), encodeValues(action, index)));
+      buf.append("\">");
+      
+      if (image != null)
+      {
+         buf.append(Utils.buildImageTag(context, image, text));
+      }
+      else
+      {
+         buf.append(Utils.encode(text));
+      }
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Encode the specified values for output to a hidden field
+    * 
+    * @param action     Action identifer
+    * @param index      Index of the Node item the action is for
+    * 
+    * @return encoded values
+    */
+   private static String encodeValues(int action, int index)
+   {
+      return Integer.toString(action) + NamingContainer.SEPARATOR_CHAR + Integer.toString(index);
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Inner classes
+   
+   /**
+    * Class representing the an action relevant to the Shortcut element.
+    */
+   public static class ShortcutEvent extends ActionEvent
+   {
+      public ShortcutEvent(UIComponent component, int action, int index)
+      {
+         super(component);
+         Action = action;
+         Index = index;
+      }
+      
+      public int Action;
+      public int Index;
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private data
+   
+   /** I18N messages */
+   private static final String MSG_REMOVE_ITEM = "remove_item";
+   
+   private final static int ACTION_CLICK_ITEM = 0;
+   private final static int ACTION_REMOVE_ITEM = 1;
+   
+   /** for this component the value is used as the List of shortcut Nodes */
+   private Object value = null;
+   
+   /** action listener called when a Click action occurs */
+   private MethodBinding clickActionListener;
+   
+   /** action listener called when a Remove action occurs */
+   private MethodBinding removeActionListener;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
new file mode 100644
index 0000000000..1eb06707ec
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.component.template;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+import org.alfresco.config.ConfigService;
+import org.alfresco.repo.template.DateCompareMethod;
+import org.alfresco.repo.template.HasAspectMethod;
+import org.alfresco.repo.template.I18NMessageMethod;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.TemplateException;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.repository.TemplateService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Kevin Roast
+ */
+public class UITemplate extends SelfRenderingComponent
+{
+   private final static String ENGINE_DEFAULT = "freemarker";
+   private final static String TEMPLATE_KEY = "_template_";
+   
+   private static Logger logger = Logger.getLogger(UITemplate.class);
+   
+   /** Template engine name */
+   private String engine = null;
+   
+   /** Template name/path */
+   private String template = null;
+   
+   /** Data model reference */
+   private Object model = null;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Component implementation
+   
+   /**
+    * @see javax.faces.component.UIComponent#getFamily()
+    */
+   public String getFamily()
+   {
+      return "org.alfresco.faces.Template";
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.engine = (String)values[1];
+      this.template = (String)values[2];
+      this.model = (Object)values[3];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[4];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.engine;
+      values[2] = this.template;
+      values[3] = this.model;
+      return (values);
+   }
+   
+   /**
+    * @see javax.faces.component.UIComponentBase#encodeBegin(javax.faces.context.FacesContext)
+    */
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (isRendered() == false)
+      {
+         return;
+      }
+      
+      // get the data model to use - building default if required
+      Object model = getModel();
+      
+      // get the configservice to find the appropriate processor
+      ConfigService service = Application.getConfigService(context);
+      ClientConfigElement clientConfig = (ClientConfigElement)service.getGlobalConfig().getConfigElement(
+            ClientConfigElement.CONFIG_ELEMENT_ID);
+      
+      // get the template to process
+      String template = getTemplate();
+      if (template != null && template.length() != 0)
+      {
+         // get the class name of the processor to instantiate
+         String engine = getEngine();
+         
+         long startTime = 0;
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("Using template processor name: " + engine);
+            startTime = System.currentTimeMillis();
+         }
+         
+         // process the template against the model
+         try
+         {
+            TemplateService templateService = Repository.getServiceRegistry(context).getTemplateService();
+            templateService.processTemplate(engine, getTemplate(), model, context.getResponseWriter());
+         }
+         catch (TemplateException err)
+         {
+            Utils.addErrorMessage(err.getMessage(), err);
+         }
+         
+         if (logger.isDebugEnabled())
+         {
+            long endTime = System.currentTimeMillis();
+            logger.debug("Time to process template: " + (endTime - startTime) + "ms");
+         }
+      }
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Strongly typed component property accessors 
+
+   /**
+    * @return the name of the template engine to use.
+    */
+   public String getEngine()
+   {
+      ValueBinding vb = getValueBinding("engine");
+      if (vb != null)
+      {
+         this.engine = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.engine != null ? this.engine : ENGINE_DEFAULT;
+   }
+   
+   /**
+    * @param engine      the name of the template engine to use. A default is provided if none is set.
+    */
+   public void setEngine(String engine)
+   {
+      this.engine = engine;
+   }
+
+   /**
+    * Return the data model to bind template against.
+    * <p>
+    * By default we return a Map model containing root references to the Company Home Space,
+    * the users Home Space and the Person Node for the current user.
+    * 
+    * @return Returns the data model to bind template against.
+    */
+   public Object getModel()
+   {
+      if (this.model == null)
+      {
+         Object model = null;
+         ValueBinding vb = getValueBinding("model");
+         if (vb != null)
+         {
+            model = vb.getValue(getFacesContext());
+         }
+         
+         if (getEngine().equals(ENGINE_DEFAULT))
+         {
+            // create FreeMarker default model and merge
+            Map root = new HashMap(11, 1.0f);
+            
+            FacesContext context = FacesContext.getCurrentInstance();
+            ServiceRegistry services = Repository.getServiceRegistry(context);
+            
+            // supply the CompanyHome space as "companyhome"
+            NodeRef companyRootRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId());
+            TemplateNode companyRootNode = new TemplateNode(companyRootRef, services, imageResolver);
+            root.put("companyhome", companyRootNode);
+            
+            // supply the users Home Space as "userhome"
+            User user = Application.getCurrentUser(context);
+            NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
+            TemplateNode userRootNode = new TemplateNode(userRootRef, services, imageResolver);
+            root.put("userhome", userRootNode);
+            
+            // supply the current user Node as "person"
+            root.put("person", new TemplateNode(user.getPerson(), services, imageResolver));
+            
+            // current date/time is useful to have and isn't supplied by FreeMarker by default
+            root.put("date", new Date());
+            
+            // add custom method objects
+            root.put("hasAspect", new HasAspectMethod());
+            root.put("message", new I18NMessageMethod());
+            root.put("dateCompare", new DateCompareMethod());
+            
+            // merge models
+            if (model instanceof Map)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Found valid Map model to merge with FreeMarker: " + model);
+               
+               root.putAll((Map)model);
+            }
+            
+            model = root;
+         }
+         
+         return model;
+      }
+      else
+      {
+         return this.model;
+      }
+   }
+
+   /**
+    * @param model The model to set.
+    */
+   public void setModel(Object model)
+   {
+      this.model = model;
+   }
+
+   /**
+    * @return Returns the template name.
+    */
+   public String getTemplate()
+   {
+      ValueBinding vb = getValueBinding("template");
+      if (vb != null)
+      {
+         // convert object to string - then we can handle either a path, NodeRef instance or noderef string
+         Object val = vb.getValue(getFacesContext());
+         if (val != null)
+         {
+            this.template = val.toString();
+         }
+      }
+      
+      return this.template;
+   }
+
+   /**
+    * @param template The template name to set.
+    */
+   public void setTemplate(String template)
+   {
+      this.template = template;
+   }
+   
+   /** Template Image resolver helper */
+   private TemplateImageResolver imageResolver = new TemplateImageResolver()
+   {
+       public String resolveImagePathForName(String filename, boolean small)
+       {
+           return Utils.getFileTypeImage(filename, small);
+       }
+   };
+}
diff --git a/source/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java b/source/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java
new file mode 100644
index 0000000000..84ee3269e7
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/converter/MimeTypeConverter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.converter;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.web.bean.repository.Repository;
+
+/**
+ * Converter class to convert an XML date representation into a Date
+ * 
+ * @author gavinc
+ */
+public class MimeTypeConverter implements Converter
+{
+   /**
+    * <p>The standard converter id for this converter.</p>
+    */
+   public static final String CONVERTER_ID = "org.alfresco.faces.MimeTypeConverter";
+
+   /**
+    * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+    */
+   public Object getAsObject(FacesContext context, UIComponent component, String value)
+   {
+      return value;
+   }
+
+   /**
+    * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+    */
+   public String getAsString(FacesContext context, UIComponent component, Object value)
+   {
+      String result = null;
+      
+      if (value instanceof String)
+      {
+         MimetypeService mimetypeService = Repository.getServiceRegistry(context).getMimetypeService();
+         result = mimetypeService.getDisplaysByMimetype().get(value.toString());
+      }
+      else if (value != null)
+      {
+         result = value.toString();
+      }
+      
+      return result;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/MultiValueListEditorRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/MultiValueListEditorRenderer.java
new file mode 100644
index 0000000000..ae3265ff14
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/MultiValueListEditorRenderer.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.UIMultiValueEditor;
+import org.alfresco.web.ui.repo.component.UIMultiValueEditor.MultiValueEditorEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Renders the MultiValueEditor component as a list of options that can be
+ * removed using a Remove button
+ * 
+ * @author gavinc
+ */
+public class MultiValueListEditorRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(MultiValueListEditorRenderer.class);
+   
+   /** I18N message strings */
+   private final static String MSG_REMOVE = "remove";
+   private final static String MSG_SELECT_BUTTON = "select_button";
+   private final static String MSG_ADD_TO_LIST_BUTTON = "add_to_list_button";
+   
+   private boolean highlightedRow;
+   
+   // ------------------------------------------------------------------------------
+   // Renderer implemenation
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      Map valuesMap = context.getExternalContext().getRequestParameterValuesMap();
+      String fieldId = getHiddenFieldName(component);
+      String value = (String)requestMap.get(fieldId);
+      
+      int action = UIMultiValueEditor.ACTION_NONE;
+      int removeIndex = -1;
+      if (value != null && value.length() != 0)
+      {
+         // break up the action into it's parts
+         int sepIdx = value.indexOf(UIMultiValueEditor.ACTION_SEPARATOR);
+         if (sepIdx != -1)
+         {
+            action = Integer.parseInt(value.substring(0, sepIdx));
+            removeIndex = Integer.parseInt(value.substring(sepIdx+1));
+         }
+         else
+         {
+            action = Integer.parseInt(value);
+         }
+      }
+      
+      if (action != UIMultiValueEditor.ACTION_NONE)
+      {
+         MultiValueEditorEvent event = new MultiValueEditorEvent(component, action, removeIndex);
+         component.queueEvent(event);
+      }
+      
+      super.decode(context, component);
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+
+      // reset the highlighted row flag
+      this.highlightedRow = false;
+      
+      if (component instanceof UIMultiValueEditor)
+      {
+         ResponseWriter out = context.getResponseWriter();
+         Map attrs = component.getAttributes();
+         String clientId = component.getClientId(context);
+         UIMultiValueEditor editor = (UIMultiValueEditor)component;
+         
+         // start outer table
+         out.write("<table border='0' cellspacing='4' cellpadding='4' class='selector'");
+         this.outputAttribute(out, attrs.get("style"), "style");
+         this.outputAttribute(out, attrs.get("styleClass"), "styleClass");
+         out.write(">");
+         
+         // show the select an item message
+         out.write("<tr><td>");
+         out.write("1. ");
+         out.write(editor.getSelectItemMsg());
+         out.write("</td></tr>");
+         
+         if (editor.getAddingNewItem())
+         {
+            out.write("<tr><td style='padding-left:8px'>");
+         }
+         else
+         {
+            out.write("<tr><td style='padding-left:8px;'><input type='submit' value='");
+            out.write(Application.getMessage(context, MSG_SELECT_BUTTON));
+            out.write("' onclick=\"");
+            out.write(generateFormSubmit(context, component, Integer.toString(UIMultiValueEditor.ACTION_SELECT)));
+            out.write("\"/></td></tr>");
+         }
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component instanceof UIMultiValueEditor)
+      {
+         ResponseWriter out = context.getResponseWriter();
+         UIMultiValueEditor editor = (UIMultiValueEditor)component;
+         
+         // get hold of the node service
+         NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
+         
+         if (editor.getAddingNewItem())
+         {
+            out.write("</td></tr>");
+         }
+         
+         // show the add to list button but only if something has been selected
+         out.write("<tr><td>2. <input type='submit'");
+         if (editor.getAddingNewItem() == false && editor.getLastItemAdded() != null || 
+             editor.getLastItemAdded() == null)
+         {
+            out.write(" disabled='true'");
+         }
+         out.write(" value='");
+         out.write(Application.getMessage(context, MSG_ADD_TO_LIST_BUTTON));
+         out.write("' onclick=\"");
+         out.write(generateFormSubmit(context, component, Integer.toString(UIMultiValueEditor.ACTION_ADD)));
+         out.write("\"/></td></tr>");
+         
+         out.write("<tr><td style='padding-top:8px'>");
+         out.write(editor.getSelectedItemsMsg());
+         out.write("</td></tr>");
+         
+         // show the current items
+         out.write("<tr><td><table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>");
+         out.write("<tr><td colspan='2' class='selectedItemsHeader'>");
+         out.write(Application.getMessage(context, "name"));
+         out.write("</td></tr>");
+         
+         List currentItems = (List)editor.getValue();
+         if (currentItems != null && currentItems.size() > 0)
+         {
+            for (int x = 0; x < currentItems.size(); x++)
+            {  
+               Object obj = currentItems.get(x);
+               if (obj != null)
+               {
+                  if (obj instanceof NodeRef)
+                  {
+                     if (nodeService.exists((NodeRef)obj))
+                     {
+                        renderExistingItem(context, component, out, nodeService, x, obj);
+                     }
+                     else
+                     {
+                        // remove invalid NodeRefs from the list
+                        currentItems.remove(x);
+                     }
+                  }
+                  else
+                  {
+                     renderExistingItem(context, component, out, nodeService, x, obj);
+                  }
+               }
+            }
+         }
+         else
+         {
+            out.write("<tr><td class='selectedItemsRow'>");
+            out.write(editor.getNoSelectedItemsMsg());
+            out.write("</td></tr>");
+         }
+         
+         // close tables
+         out.write("</table></td></tr></table>");
+      }
+   }
+
+   /**
+    * Renders an existing item with a remove button
+    * 
+    * @param context FacesContext
+    * @param component The UIComponent
+    * @param out Writer to write output to
+    * @param nodeService The NodeService
+    * @param key The key of the item
+    * @param value The item's value
+    * @throws IOException
+    */
+   protected void renderExistingItem(FacesContext context, UIComponent component, ResponseWriter out, 
+         NodeService nodeService, int index, Object value) throws IOException
+   {
+      out.write("<tr><td class='");
+      if (this.highlightedRow)
+      {
+         out.write("selectedItemsRowAlt");
+      }
+      else
+      {
+         out.write("selectedItemsRow");
+      }
+      out.write("'>");
+      
+      if (value instanceof NodeRef)
+      {
+         out.write(Repository.getNameForNode(nodeService, (NodeRef)value));
+      }
+      else
+      {
+         out.write(value.toString());
+      }
+
+      out.write("&nbsp;&nbsp;");
+      out.write("</td><td class='");
+      if (this.highlightedRow)
+      {
+         out.write("selectedItemsRowAlt");
+      }
+      else
+      {
+         out.write("selectedItemsRow");
+      }
+      out.write("'><a href='#' title='");
+      out.write(Application.getMessage(context, MSG_REMOVE));
+      out.write("' onclick=\"");
+      out.write(generateFormSubmit(context, component, UIMultiValueEditor.ACTION_REMOVE + UIMultiValueEditor.ACTION_SEPARATOR + index));
+      out.write("\"><img src='");
+      out.write(context.getExternalContext().getRequestContextPath());
+      out.write("/images/icons/delete.gif' border='0' width='13' height='16'/></a>");
+      
+      this.highlightedRow = !this.highlightedRow;
+   }
+
+   /**
+    * We use a hidden field per picker instance on the page.
+    * 
+    * @return hidden field name
+    */
+   private String getHiddenFieldName(UIComponent component)
+   {
+      return component.getClientId(FacesContext.getCurrentInstance());
+   }
+   
+   /**
+    * Generate FORM submit JavaScript for the specified action
+    *  
+    * @param context    FacesContext
+    * @param component  The UIComponent
+    * @param action     Action string
+    * 
+    * @return FORM submit JavaScript
+    */
+   private String generateFormSubmit(FacesContext context, UIComponent component, String action)
+   {
+      return Utils.generateFormSubmit(context, component, getHiddenFieldName(component), action);
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java
new file mode 100644
index 0000000000..e30379d30d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/NodeDescendantsLinkRenderer.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.UINodeDescendants;
+
+/**
+ * @author Kevin Roast
+ */
+public class NodeDescendantsLinkRenderer extends BaseRenderer
+{
+   // ------------------------------------------------------------------------------
+   // Renderer implementation
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName(context, component);
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.startsWith(component.getClientId(context) + NamingContainer.SEPARATOR_CHAR))
+      {
+         value = value.substring(component.getClientId(context).length() + 1);
+         
+         // found a new selected value for this component
+         // queue an event to represent the change
+         int separatorIndex = value.indexOf(NamingContainer.SEPARATOR_CHAR);
+         String selectedNodeId = value.substring(0, separatorIndex);
+         boolean isParent = Boolean.parseBoolean(value.substring(separatorIndex + 1));
+         NodeService service = getNodeService(context);
+         NodeRef ref = new NodeRef(Repository.getStoreRef(), selectedNodeId);
+         
+         UINodeDescendants.NodeSelectedEvent event = new UINodeDescendants.NodeSelectedEvent(component, ref, isParent); 
+         component.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == true)
+      {
+         Writer out = context.getResponseWriter();
+         
+         UINodeDescendants control = (UINodeDescendants)component;
+         
+         // make sure we have a NodeRef from the 'value' property ValueBinding
+         Object val = control.getValue();
+         if (val instanceof NodeRef == false)
+         {
+            throw new IllegalArgumentException("UINodeDescendants component 'value' property must resolve to a NodeRef!");
+         }
+         NodeRef parentRef = (NodeRef)val;
+         
+         // use Spring JSF integration to get the node service bean
+         NodeService service = getNodeService(context);
+         DictionaryService dd = getDictionaryService(context);
+         UserTransaction tx = null;
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
+            tx.begin();
+               
+            // TODO: need a comparator to sort node refs (based on childref qname)
+            //       as currently the list is returned in a random order per request!
+            
+            String separator = (String)component.getAttributes().get("separator");
+            if (separator == null)
+            {
+               separator = DEFAULT_SEPARATOR;
+            }
+            
+            // calculate the number of displayed child refs
+            if (service.exists(parentRef) == true)
+            {
+               List<ChildAssociationRef> childRefs = service.getChildAssocs(parentRef);
+               List<ChildAssociationRef> refs = new ArrayList<ChildAssociationRef>(childRefs.size());
+               for (int index=0; index<childRefs.size(); index++)
+               {
+                  ChildAssociationRef ref = childRefs.get(index);
+                  QName type = service.getType(ref.getChildRef());
+                  TypeDefinition typeDef = dd.getType(type);
+                  if (typeDef != null && dd.isSubClass(type, ContentModel.TYPE_FOLDER) && 
+                      dd.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
+                  {
+                     refs.add(ref);
+                  }
+               }
+               
+               // walk each child ref and output a descendant link control for each item
+               int total = 0;
+               int maximum = refs.size() > control.getMaxChildren() ? control.getMaxChildren() : refs.size();
+               for (int index=0; index<maximum; index++)
+               {
+                  ChildAssociationRef ref = refs.get(index);
+                  QName type = service.getType(ref.getChildRef());
+                  TypeDefinition typeDef = dd.getType(type);
+                  if (typeDef != null && dd.isSubClass(type, ContentModel.TYPE_FOLDER) && 
+                      dd.isSubClass(type, ContentModel.TYPE_SYSTEM_FOLDER) == false)
+                  {
+                     // output separator if appropriate
+                     if (total > 0)
+                     {
+                        out.write( separator );
+                     }
+                     
+                     out.write(renderDescendant(context, control, ref, false));
+                     total++;
+                  }
+               }
+               
+               // do we need to render ellipses to indicate more items than the maximum
+               if (control.getShowEllipses() == true && refs.size() > maximum)
+               {
+                  out.write( separator );
+                  // TODO: is this the correct way to get the information we need?
+                  //       e.g. primary parent may not be the correct path? how do we make sure we find
+                  //       the correct parent and more importantly the correct Display Name value!
+                  out.write( renderDescendant(context, control, service.getPrimaryParent(parentRef), true) );
+               }
+            }
+            
+            tx.commit();
+         }
+         catch (Throwable err)
+         {
+            try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+            throw new RuntimeException(err);
+         }
+      }
+   }
+   
+   /**
+    * Render a descendant as a clickable link
+    * 
+    * @param context    FacesContext
+    * @param control    UINodeDescendants to get attributes from
+    * @param childRef   The ChildAssocRef of the child to render an HTML link for
+    * @param ellipses   Whether to render the label of this descendant as a ellipses i.e. "..."
+    *  
+    * @return HTML for a descendant link
+    */
+   private String renderDescendant(FacesContext context, UINodeDescendants control, ChildAssociationRef childRef, boolean ellipses)
+   {
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<a href='#' onclick=\"");
+      // build an HTML param that contains the client Id of this control, followed by the node Id
+      // followed by whether this is the parent node not a decendant (ellipses clicked)
+      String param = control.getClientId(context) + NamingContainer.SEPARATOR_CHAR +
+                     childRef.getChildRef().getId() + NamingContainer.SEPARATOR_CHAR +
+                     Boolean.toString(ellipses);
+      buf.append(Utils.generateFormSubmit(context, control, getHiddenFieldName(context, control), param));
+      buf.append('"');
+      Map attrs = control.getAttributes();
+      if (attrs.get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(attrs.get("style"))
+            .append('"');
+      }
+      if (attrs.get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(attrs.get("styleClass"));
+      }
+      buf.append('>');
+      
+      if (ellipses == false)
+      {
+         // label is the name of the child node assoc
+         String name = Repository.getNameForNode(getNodeService(context), childRef.getChildRef());
+         buf.append(Utils.encode(name));
+      }
+      else
+      {
+         // TODO: allow the ellipses string to be set as component property?
+         buf.append("...");
+      }
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+
+   /**
+    * Get the hidden field name for this node descendant component.
+    * Build a shared field name from the parent form name and the string "ndec".
+    * 
+    * @return hidden field name shared by all node descendant components within the Form.
+    */
+   private static String getHiddenFieldName(FacesContext context, UIComponent component)
+   {
+      return Utils.getParentForm(context, component).getClientId(context) + NamingContainer.SEPARATOR_CHAR + "ndec";
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Node Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Node Service bean instance or throws exception if not found
+    */
+   private static NodeService getNodeService(FacesContext context)
+   {
+      NodeService service = Repository.getServiceRegistry(context).getNodeService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain NodeService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   /**
+    * Use Spring JSF integration to return the Dictionary Service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return Dictionary Service bean instance or throws exception if not found
+    */
+   private static DictionaryService getDictionaryService(FacesContext context)
+   {
+      DictionaryService service = Repository.getServiceRegistry(context).getDictionaryService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain DictionaryService bean reference.");
+      }
+      
+      return service;
+   }
+   
+   private static final String DEFAULT_SEPARATOR = " | ";
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
new file mode 100644
index 0000000000..4736f9bd22
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Map;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.UINodeDescendants;
+import org.alfresco.web.ui.repo.component.UINodePath;
+
+/**
+ * @author Kevin Roast
+ */
+public class NodePathLinkRenderer extends BaseRenderer
+{
+   // ------------------------------------------------------------------------------
+   // Renderer implementation
+   
+   /**
+    * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void decode(FacesContext context, UIComponent component)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getHiddenFieldName(context, component);
+      String value = (String)requestMap.get(fieldId);
+      
+      // we encoded the value to start with our Id
+      if (value != null && value.startsWith(component.getClientId(context) + NamingContainer.SEPARATOR_CHAR))
+      {
+         // found a new selected value for this component
+         // queue an event to represent the change
+         String selectedNodeId = value.substring(component.getClientId(context).length() + 1);
+         NodeRef ref = new NodeRef(Repository.getStoreRef(), selectedNodeId);
+         
+         UINodePath.PathElementEvent event = new UINodePath.PathElementEvent(component, ref); 
+         component.queueEvent(event);
+      }
+   }
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // always check for this flag - as per the spec
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      Writer out = context.getResponseWriter();
+      
+      // make sure we have a NodeRef or Path from the 'value' property ValueBinding
+      Path path = null;
+      NodeRef nodeRef = null;
+      Object val = ((UINodePath)component).getValue();
+      if (val instanceof NodeRef == true)
+      {
+         nodeRef = (NodeRef)val;
+      }
+      else if (val instanceof Path == true)
+      {
+         path = (Path)val;
+      }
+      else
+      {
+         throw new IllegalArgumentException("UINodePath component 'value' property must resolve to a NodeRef or Path!");
+      }
+      
+      boolean isBreadcrumb = false;
+      Boolean breadcrumb = (Boolean)component.getAttributes().get("breadcrumb");
+      if (breadcrumb != null)
+      {
+         isBreadcrumb = breadcrumb.booleanValue();
+      }
+      
+      boolean isDisabled = false;
+      Boolean disabled = (Boolean)component.getAttributes().get("disabled");
+      if (disabled != null)
+      {
+         isDisabled = disabled.booleanValue();
+      }
+      
+      boolean showLeaf = false;
+      Boolean showLeafBool = (Boolean)component.getAttributes().get("showLeaf");
+      if (showLeafBool != null)
+      {
+         showLeaf = showLeafBool.booleanValue();
+      }
+      
+      // use Spring JSF integration to get the node service bean
+      NodeService service = getNodeService(context);
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
+         tx.begin();
+         
+         if (path == null)
+         {
+            path = service.getPath(nodeRef);
+         }
+         
+         if (isBreadcrumb == false || isDisabled == true)
+         {
+            out.write(buildPathAsSingular(context, component, path, showLeaf, isDisabled));
+         }
+         else
+         {
+            out.write(buildPathAsBreadcrumb(context, component, path, showLeaf));
+         }
+         
+         tx.commit();
+      }
+      catch (InvalidNodeRefException refErr)
+      {
+         // this error simple means we cannot output the path
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (AccessDeniedException accessErr)
+      {
+         // this error simple means we cannot output the path
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      catch (Throwable err)
+      {
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+         throw new RuntimeException(err);
+      }
+   }
+   
+   /**
+    * Return the path with each element as a single clickable link e.g. breadcrumb style
+    * 
+    * @param context        FacesContext
+    * @param component      UIComponent to get display attribute from
+    * @param path           Node Path to use
+    * 
+    * @return the path with each individual element clickable
+    */
+   private String buildPathAsBreadcrumb(FacesContext context, UIComponent component, Path path, boolean showLeaf)
+   {
+      StringBuilder buf = new StringBuilder(1024);
+      
+      int size = (showLeaf ? path.size() : path.size() - 1);
+      for (int i=0; i<size; i++)
+      {
+         Path.Element element = path.get(i);
+         String elementString = null;
+         if (element instanceof Path.ChildAssocElement)
+         {
+            ChildAssociationRef elementRef = ((Path.ChildAssocElement)element).getRef();
+            if (elementRef.getParentRef() != null)
+            {
+               String name = Repository.getNameForNode(getNodeService(context), elementRef.getChildRef());
+               elementString = renderPathElement(context, component, elementRef.getChildRef(), name);
+            }
+         }
+         else
+         {
+            elementString = element.getElementString();
+         }
+         
+         if (elementString != null)
+         {
+            buf.append("/");
+            buf.append(elementString);
+         }
+      }
+      
+      return buf.toString();
+   }
+   
+   /**
+    * Return the path with the entire path as a single clickable link
+    * 
+    * @param context        FacesContext
+    * @param component      UIComponent to get display attribute from
+    * @param path           Node Path to use
+    * 
+    * @return the entire path as a single clickable link
+    */
+   private String buildPathAsSingular(FacesContext context, UIComponent component, Path path, boolean showLeaf, boolean disabled)
+   {
+      StringBuilder buf = new StringBuilder(512);
+      
+      NodeRef lastElementRef = null;
+      int size = (showLeaf ? path.size() : path.size() - 1);
+      for (int i=0; i<size; i++)
+      {
+         Path.Element element = path.get(i);
+         String elementString = null;
+         if (element instanceof Path.ChildAssocElement)
+         {
+            ChildAssociationRef elementRef = ((Path.ChildAssocElement)element).getRef();
+            if (elementRef.getParentRef() != null)
+            {
+               elementString = Repository.getNameForNode(getNodeService(context), elementRef.getChildRef());
+            }
+            if (i == path.size() - 2)
+            {
+               lastElementRef = elementRef.getChildRef();
+            }
+         }
+         else
+         {
+            elementString = element.getElementString();
+         }
+         
+         if (elementString != null)
+         {
+            buf.append("/");
+            buf.append(elementString);
+         }
+      }
+      
+      if (disabled == false)
+      {
+         return renderPathElement(context, component, lastElementRef, buf.toString());
+      }
+      else
+      {
+         return buf.toString();
+      }
+   }
+   
+   /**
+    * Render a path element as a clickable link
+    * 
+    * @param context    FacesContext
+    * @param control    UIComponent to get attributes from
+    * @param nodeRef    NodeRef of the path element
+    * @param label      Display label to output with this link
+    * 
+    * @return HTML for a descendant link
+    */
+   private String renderPathElement(FacesContext context, UIComponent control, NodeRef nodeRef, String label)
+   {
+      StringBuilder buf = new StringBuilder(256);
+      
+      buf.append("<a href='#' onclick=\"");
+      // build an HTML param that contains the client Id of this control, followed by the node Id
+      String param = control.getClientId(context) + NamingContainer.SEPARATOR_CHAR + nodeRef.getId();
+      buf.append(Utils.generateFormSubmit(context, control, getHiddenFieldName(context, control), param));
+      buf.append('"');
+      Map attrs = control.getAttributes();
+      if (attrs.get("style") != null)
+      {
+         buf.append(" style=\"")
+            .append(attrs.get("style"))
+            .append('"');
+      }
+      if (attrs.get("styleClass") != null)
+      {
+         buf.append(" class=")
+            .append(attrs.get("styleClass"));
+      }
+      buf.append('>');
+      
+      buf.append(Utils.encode(label));
+      
+      buf.append("</a>");
+      
+      return buf.toString();
+   }
+
+   
+   // ------------------------------------------------------------------------------
+   // Private helpers
+
+   /**
+    * Get the hidden field name for this node path component.
+    * Build a shared field name from the parent form name and the string "npath".
+    * 
+    * @return hidden field name shared by all node path components within the Form.
+    */
+   private static String getHiddenFieldName(FacesContext context, UIComponent component)
+   {
+      return Utils.getParentForm(context, component).getClientId(context) + NamingContainer.SEPARATOR_CHAR + "npath";
+   }
+   
+   /**
+    * Use Spring JSF integration to return the node service bean instance
+    * 
+    * @param context    FacesContext
+    * 
+    * @return node service bean instance or throws runtime exception if not found
+    */
+   private static NodeService getNodeService(FacesContext context)
+   {
+      NodeService service = Repository.getServiceRegistry(context).getNodeService();
+      if (service == null)
+      {
+         throw new IllegalStateException("Unable to obtain NodeService bean reference.");
+      }
+      
+      return service;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java
new file mode 100644
index 0000000000..1f8c53aaf8
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/property/AssociationRenderer.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer.property;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.property.UIAssociation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Renderer for the UIAssociation component
+ * 
+ * @author gavinc
+ */
+public class AssociationRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(AssociationRenderer.class);
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+
+      // NOTE: we close off the first <td> generated by the property sheet's grid renderer
+      context.getResponseWriter().write("</td>");
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIAssociation association = (UIAssociation)component;
+      ResponseWriter out = context.getResponseWriter();
+      
+      // make sure there are exactly 2 child components
+      int count = association.getChildCount();
+      
+      if (count == 2)
+      {
+         // get the label and the control
+         List<UIComponent> kids = association.getChildren();
+         UIComponent label = kids.get(0);
+         UIComponent control = kids.get(1);
+         
+         // place a style class on the label column if necessary
+         String labelStylceClass = (String)association.getParent().getAttributes().get("labelStyleClass");
+         out.write("</td><td");
+         if (labelStylceClass != null)
+         {
+            outputAttribute(out, labelStylceClass, "class");
+         }
+         
+         // close the <td> 
+         out.write(">");
+         // encode the label
+         Utils.encodeRecursive(context, label);
+         // encode the control
+         context.getResponseWriter().write("</td><td>");
+         Utils.encodeRecursive(context, control);
+         
+         // NOTE: we'll allow the property sheet's grid renderer close off the last <td>
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // we don't need to do anything in here
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java
new file mode 100644
index 0000000000..6a594c1fde
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/property/ChildAssociationRenderer.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer.property;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.property.UIChildAssociation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Renderer for the UIChildAssociation component
+ * 
+ * @author gavinc
+ */
+public class ChildAssociationRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(ChildAssociationRenderer.class);
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+
+      // NOTE: we close off the first <td> generated by the property sheet's grid renderer
+      context.getResponseWriter().write("</td>");
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIChildAssociation association = (UIChildAssociation)component;
+      ResponseWriter out = context.getResponseWriter();
+      
+      // make sure there are exactly 2 child components
+      int count = association.getChildCount();
+      
+      if (count == 2)
+      {
+         // get the label and the control
+         List<UIComponent> kids = association.getChildren();
+         UIComponent label = kids.get(0);
+         UIComponent control = kids.get(1);
+         
+         // place a style class on the label column if necessary
+         String labelStylceClass = (String)association.getParent().getAttributes().get("labelStyleClass");
+         out.write("</td><td");
+         if (labelStylceClass != null)
+         {
+            outputAttribute(out, labelStylceClass, "class");
+         }
+         
+         // close the <td> 
+         out.write(">");
+         // encode the label
+         Utils.encodeRecursive(context, label);
+         // encode the control
+         context.getResponseWriter().write("</td><td>");
+         Utils.encodeRecursive(context, control);
+         
+         // NOTE: we'll allow the property sheet's grid renderer close off the last <td>
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // we don't need to do anything in here
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java
new file mode 100644
index 0000000000..ee3112b78a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/renderer/property/PropertyRenderer.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.renderer.property;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.renderer.BaseRenderer;
+import org.alfresco.web.ui.repo.component.property.UIProperty;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Renderer for the UIProperty component
+ * 
+ * @author gavinc
+ */
+public class PropertyRenderer extends BaseRenderer
+{
+   private static Log logger = LogFactory.getLog(PropertyRenderer.class);
+   
+   /**
+    * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeBegin(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+
+      // NOTE: we close off the first <td> generated by the property sheet's grid renderer
+      context.getResponseWriter().write("</td>");
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeChildren(FacesContext context, UIComponent component) throws IOException
+   {
+      if (component.isRendered() == false)
+      {
+         return;
+      }
+      
+      UIProperty property = (UIProperty)component;
+      ResponseWriter out = context.getResponseWriter();
+      
+      // make sure there are exactly 2 child components
+      int count = property.getChildCount();
+      
+      if (count == 2)
+      {
+         // get the label and the control
+         List<UIComponent> kids = property.getChildren();
+         UIComponent label = kids.get(0);
+         UIComponent control = kids.get(1);
+         
+         // place a style class on the label column if necessary
+         String labelStylceClass = (String)property.getParent().getAttributes().get("labelStyleClass");
+         out.write("</td><td");
+         if (labelStylceClass != null)
+         {
+            outputAttribute(out, labelStylceClass, "class");
+         }
+         
+         // close the <td> 
+         out.write(">");
+         // encode the label
+         Utils.encodeRecursive(context, label);
+         // encode the control
+         out.write("</td><td>");
+         Utils.encodeRecursive(context, control);
+         
+         // NOTE: we'll allow the property sheet's grid renderer close off the last <td>
+      }
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+    */
+   public void encodeEnd(FacesContext context, UIComponent component) throws IOException
+   {
+      // we don't need to do anything in here
+   }
+
+   /**
+    * @see javax.faces.render.Renderer#getRendersChildren()
+    */
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java b/source/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java
new file mode 100644
index 0000000000..1b0284c698
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/CategorySelectorTag.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+
+/**
+ * Tag implementation to allow the category selector component to be placed on a JSP page
+ * 
+ * @author gavinc
+ */
+public class CategorySelectorTag extends ItemSelectorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.CategorySelector";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java b/source/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java
new file mode 100644
index 0000000000..4f3b4f4fac
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/ItemSelectorTag.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+/*
+ * Created on 25-May-2005
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * Base class for the item selector tag
+ * 
+ * @author gavinc
+ */
+public abstract class ItemSelectorTag extends HtmlComponentTag
+{
+   /** the value */
+   private String value;
+
+   /** the label */
+   private String label;
+
+   /** the spacing */
+   private String spacing;
+   
+   /** the node style */
+   private String nodeStyle;
+   
+   /** the node style class */
+   private String nodeStyleClass;
+   
+   /** the id of initial selection */
+   private String initialSelection;
+   
+   /** Whether the component is disabled */
+   private String disabled;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public abstract String getComponentType();
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringBindingProperty(component, "value", this.value);
+      setStringBindingProperty(component, "initialSelection", this.initialSelection);
+      setStringProperty(component, "label", this.label);
+      setStringProperty(component, "nodeStyle", this.nodeStyle);
+      setStringProperty(component, "nodeStyleClass", this.nodeStyleClass);
+      setIntProperty(component, "spacing", this.spacing);
+      setBooleanProperty(component, "disabled", this.disabled);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.value = null;
+      this.label = null;
+      this.spacing = null;
+      this.nodeStyle = null;
+      this.nodeStyleClass = null;
+      this.initialSelection = null;
+      this.disabled = null;
+   }
+   
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * Set the spacing
+    *
+    * @param spacing     the spacing
+    */
+   public void setSpacing(String spacing)
+   {
+      this.spacing = spacing;
+   }
+
+   /**
+    * Set the node style
+    * 
+    * @param nodeStyle  the node style
+    */
+   public void setNodeStyle(String nodeStyle)
+   {
+      this.nodeStyle = nodeStyle;
+   }
+
+   /**
+    * Set the node style class
+    * 
+    * @param nodeStyleClass   the node style class
+    */
+   public void setNodeStyleClass(String nodeStyleClass)
+   {
+      this.nodeStyleClass = nodeStyleClass;
+   }
+   
+   /**
+    * Sets the id of the item to be initially selected, this is overridden
+    * however if a value is supplied
+    * 
+    * @param initialSelection The id of the initial selected item
+    */
+   public void setInitialSelection(String initialSelection)
+   {
+      this.initialSelection = initialSelection;
+   }
+   
+   /**
+    * Sets whether the component should be rendered in a disabled state
+    * 
+    * @param disabled true to render the component in a disabled state
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/LockIconTag.java b/source/java/org/alfresco/web/ui/repo/tag/LockIconTag.java
new file mode 100644
index 0000000000..d8b080f62a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/LockIconTag.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class LockIconTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.LockIcon";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "lockImage", this.lockImage);
+      setStringProperty(component, "lockOwnerImage", this.lockOwnerImage);
+      setStringProperty(component, "align", this.align);
+      setIntProperty(component, "width", this.width);
+      setIntProperty(component, "height", this.height);
+      setStringProperty(component, "lockedOwnerTooltip", this.lockedOwnerTooltip);
+      setStringProperty(component, "lockedUserTooltip", this.lockedUserTooltip);
+      setStringBindingProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.lockImage = null;
+      this.lockOwnerImage = null;
+      this.align = null;
+      this.width = null;
+      this.height = null;
+      this.lockedOwnerTooltip = null;
+      this.lockedUserTooltip = null;
+      this.value = null;
+   }
+   
+   /**
+    * Set the lockImage
+    *
+    * @param lockImage     the lockImage
+    */
+   public void setLockImage(String lockImage)
+   {
+      this.lockImage = lockImage;
+   }
+
+   /**
+    * Set the lockOwnerImage
+    *
+    * @param lockOwnerImage     the lockOwnerImage
+    */
+   public void setLockOwnerImage(String lockOwnerImage)
+   {
+      this.lockOwnerImage = lockOwnerImage;
+   }
+
+   /**
+    * Set the align
+    *
+    * @param align     the align
+    */
+   public void setAlign(String align)
+   {
+      this.align = align;
+   }
+
+   /**
+    * Set the width
+    *
+    * @param width     the width
+    */
+   public void setWidth(String width)
+   {
+      this.width = width;
+   }
+
+   /**
+    * Set the height
+    *
+    * @param height     the height
+    */
+   public void setHeight(String height)
+   {
+      this.height = height;
+   }
+
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the lockedOwnerTooltip
+    *
+    * @param lockedOwnerTooltip     the lockedOwnerTooltip
+    */
+   public void setLockedOwnerTooltip(String lockedOwnerTooltip)
+   {
+      this.lockedOwnerTooltip = lockedOwnerTooltip;
+   }
+
+   /**
+    * Set the lockedUserTooltip
+    *
+    * @param lockedUserTooltip     the lockedUserTooltip
+    */
+   public void setLockedUserTooltip(String lockedUserTooltip)
+   {
+      this.lockedUserTooltip = lockedUserTooltip;
+   }
+
+
+   /** the lockedOwnerTooltip */
+   private String lockedOwnerTooltip;
+
+   /** the lockedUserTooltip */
+   private String lockedUserTooltip;
+   
+   /** the lockImage */
+   private String lockImage;
+
+   /** the lockOwnerImage */
+   private String lockOwnerImage;
+
+   /** the align */
+   private String align;
+
+   /** the width */
+   private String width;
+
+   /** the height */
+   private String height;
+
+   /** the value */
+   private String value;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/MultiValueListEditorTag.java b/source/java/org/alfresco/web/ui/repo/tag/MultiValueListEditorTag.java
new file mode 100644
index 0000000000..228fee545e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/MultiValueListEditorTag.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * Tag to combine the multi value component and list renderer
+ * 
+ * @author gavinc
+ */
+public class MultiValueListEditorTag extends HtmlComponentTag
+{
+   private String value;
+   private String lastItemAdded;
+   private String readOnly;
+   private String selectItemMsg;
+   private String selectedItemsMsg;
+   private String noSelectedItemsMsg;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.MultiValueEditor";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.List";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringBindingProperty(component, "value", this.value);
+      setStringBindingProperty(component, "lastItemAdded", this.lastItemAdded);
+      setStringProperty(component, "selectItemMsg", this.selectItemMsg);
+      setStringProperty(component, "selectedItemsMsg", this.selectedItemsMsg);
+      setStringProperty(component, "noSelectedItemsMsg", this.noSelectedItemsMsg);
+      setBooleanProperty(component, "readOnly", this.readOnly);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      this.value = null;
+      this.lastItemAdded = null;
+      this.readOnly = null;
+      this.selectedItemsMsg = null;
+      this.selectItemMsg = null;
+      this.noSelectedItemsMsg = null;
+      
+      super.release();
+   }
+
+   /**
+    * @param value The value to set.
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   /**
+    * Sets the lastItemAdded value expression binding
+    * 
+    * @param lastItemAdded lastItemAdded binding
+    */
+   public void setLastItemAdded(String lastItemAdded)
+   {
+      this.lastItemAdded = lastItemAdded;
+   }
+
+   /**
+    * Sets the readOnly flag for the component
+    * 
+    * @param readOnly true if the component will be read only
+    */
+   public void setReadOnly(String readOnly)
+   {
+      this.readOnly = readOnly;
+   }
+
+   /**
+    * Sets the message to display for the no selected items
+    * 
+    * @param noSelectedItemsMsg The message
+    */
+   public void setNoSelectedItemsMsg(String noSelectedItemsMsg)
+   {
+      this.noSelectedItemsMsg = noSelectedItemsMsg;
+   }
+   
+   /**
+    * Sets the message to display for the selected items
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectedItemsMsg(String selectedItemsMsg)
+   {
+      this.selectedItemsMsg = selectedItemsMsg;
+   }
+
+   /**
+    * Sets the message to display for inviting the user to select an item
+    * 
+    * @param selectItemMsg The message
+    */
+   public void setSelectItemMsg(String selectItemMsg)
+   {
+      this.selectItemMsg = selectItemMsg;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java b/source/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java
new file mode 100644
index 0000000000..039a7589c4
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/NodeDescendantsTag.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class NodeDescendantsTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.NodeDescendants";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.NodeDescendantsLinkRenderer";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setBooleanProperty(component, "showEllipses", this.showEllipses);
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setIntProperty(component, "maxChildren", this.maxChildren);
+      setStringProperty(component, "separator", this.separator);
+      setStringBindingProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.showEllipses = null;
+      this.maxChildren = null;
+      this.separator = null;
+      this.action = null;
+      this.actionListener = null;
+      this.value = null;
+   }
+   
+   /**
+    * Set the maxChildren
+    *
+    * @param maxChildren     the maxChildren
+    */
+   public void setMaxChildren(String maxChildren)
+   {
+      this.maxChildren = maxChildren;
+   }
+
+   /**
+    * Set the separator
+    *
+    * @param separator     the separator
+    */
+   public void setSeparator(String separator)
+   {
+      this.separator = separator;
+   }
+
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the show ellipses value
+    *
+    * @param showEllipses     true to show ellipses when we have > maxchildren to display
+    */
+   public void setShowEllipses(String showEllipses)
+   {
+      this.showEllipses = showEllipses;
+   }
+
+
+   /** the showEllipses */
+   private String showEllipses;
+
+   /** the maxChildren */
+   private String maxChildren;
+
+   /** the separator */
+   private String separator;
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the value */
+   private String value;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java b/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
new file mode 100644
index 0000000000..b26ffb8de2
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * Tag class for the UINodePath component
+ * 
+ * @author Kevin Roast
+ */
+public class NodePathTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.NodePath";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.NodePathLinkRenderer";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+      setBooleanProperty(component, "breadcrumb", this.breadcrumb);
+      setBooleanProperty(component, "disabled", this.disabled);
+      setBooleanProperty(component, "showLeaf", this.disabled);
+      setStringBindingProperty(component, "value", this.value);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.action = null;
+      this.actionListener = null;
+      this.value = null;
+      this.disabled = null;
+      this.breadcrumb = null;
+      this.showLeaf = null;
+   }
+   
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+   /**
+    * Set the value
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set whether to display the path as a breadcrumb or a single long link (default)
+    *
+    * @param breadcrumb     breadcrumb true|false
+    */
+   public void setBreadcrumb(String breadcrumb)
+   {
+      this.breadcrumb = breadcrumb;
+   }
+   
+   /**
+    * Set whether the component is disabled
+    *
+    * @param disabled     whether the component is disabled
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+   
+   /**
+    * Set whether the final leaf node is shown as part of the path
+    *
+    * @param showLeaf     whether the final leaf node is shown as part of the path
+    */
+   public void setShowLeaf(String showLeaf)
+   {
+      this.showLeaf = showLeaf;
+   }
+
+
+   /** the showLeaf boolean */
+   private String showLeaf;
+
+   /** the disabled boolean */
+   private String disabled;
+
+   /** the breadcrumb boolean */
+   private String breadcrumb;
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+
+   /** the value */
+   private String value;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
new file mode 100644
index 0000000000..f04675f666
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.alfresco.web.app.Application;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A non-JSF tag library that adds the HTML begin and end tags if running in servlet mode
+ * 
+ * @author gavinc
+ */
+public class PageTag extends TagSupport
+{
+   private static final long serialVersionUID = 8142765393181557228L;
+   
+   private final static String SCRIPTS_START = "<script language=\"JavaScript1.2\" src=\"";
+   private final static String SCRIPTS_MENU = "/scripts/menu.js\"></script>\n";
+   private final static String SCRIPTS_WEBDAV = "/scripts/webdav.js\"></script>\n";
+   private final static String STYLES_START  = "<link rel=\"stylesheet\" href=\"";
+   private final static String STYLES_MAIN  = "/css/main.css\" TYPE=\"text/css\">\n";
+   private final static String ALF_URL   = "http://www.alfrescosoftware.com";
+   private final static String ALF_LOGO  = "/images/logo/alfresco_logo.gif";
+   private final static String ALF_TEXT  = "Content managed by Alfresco";
+   private final static String ALF_COPY  = "Alfresco Software Inc. © 2005 All rights reserved.";
+   
+   private static Log logger = LogFactory.getLog(PageTag.class);
+   private static String alfresco = null;
+   private static String loginPage = null;
+   
+   private long startTime = 0;
+   private String title;
+   private String titleId;
+   
+   /**
+    * @return The title for the page
+    */
+   public String getTitle()
+   {
+      return title;
+   }
+
+   /**
+    * @param title Sets the page title
+    */
+   public void setTitle(String title)
+   {
+      this.title = title;
+   }
+   
+   /**
+    * @return The title message Id for the page
+    */
+   public String getTitleId()
+   {
+      return titleId;
+   }
+
+   /**
+    * @param titleId Sets the page title message Id
+    */
+   public void setTitleId(String titleId)
+   {
+      this.titleId = titleId;
+   }
+   
+   public void release()
+   {
+      super.release();
+      title = null;
+      titleId = null;
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
+    */
+   public int doStartTag() throws JspException
+   {
+      if (logger.isDebugEnabled())
+         startTime = System.currentTimeMillis();
+      
+      try
+      {
+         Writer out = pageContext.getOut();
+         
+         if (Application.inPortalServer() == false)
+         {
+            out.write("<html><head><title>");
+            if (this.titleId != null && this.titleId.length() != 0)
+            {
+               out.write(Application.getMessage(pageContext.getSession(), this.titleId));
+            }
+            else if (this.title != null && this.title.length() != 0)
+            {
+               out.write(this.title);
+            }
+            else
+            {
+               out.write("Alfresco Web Client");
+            }
+            out.write("</title></head>");
+            out.write("<body>\n");
+         }
+         
+         String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath();
+         out.write(SCRIPTS_START);
+         out.write(reqPath);
+         out.write(SCRIPTS_MENU);
+         out.write(SCRIPTS_START);
+         out.write(reqPath);
+         out.write(SCRIPTS_WEBDAV);
+         out.write(STYLES_START);
+         out.write(reqPath);
+         out.write(STYLES_MAIN);
+      }
+      catch (IOException ioe)
+      {
+         throw new JspException(ioe.toString());
+      }
+      
+      return EVAL_BODY_INCLUDE;
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.TagSupport#doEndTag()
+    */
+   public int doEndTag() throws JspException
+   {
+      try
+      {
+         HttpServletRequest req = (HttpServletRequest)pageContext.getRequest();
+         if (req.getRequestURI().endsWith(getLoginPage()) == false)
+         {
+            pageContext.getOut().write(getAlfrescoButton());
+         }
+         
+         if (Application.inPortalServer() == false)
+         {
+            pageContext.getOut().write("\n</body></html>");
+         }
+      }
+      catch (IOException ioe)
+      {
+         throw new JspException(ioe.toString());
+      }
+      
+      if (logger.isDebugEnabled())
+      {
+         long endTime = System.currentTimeMillis();
+         logger.debug("Time to generate page: " + (endTime - startTime) + "ms");
+      }
+      
+      return super.doEndTag();
+   }
+   
+   private String getLoginPage()
+   {
+      if (loginPage == null)
+      {
+         loginPage = Application.getLoginPage(pageContext.getServletContext());
+      }
+      
+      return loginPage;
+   }
+
+   private String getAlfrescoButton()
+   {
+      if (alfresco == null)
+      {
+         String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath();
+         alfresco = "<center>" +
+                    "<a href='" + ALF_URL + "'>" +
+                    "<img border=0 alt='' title='" + ALF_TEXT + "' align=absmiddle src='" + reqPath + ALF_LOGO + "'>" +
+                    "</a>&nbsp;" +
+                    "<span style='font-family:Arial,Helvetica,sans-serif;font-size:10px'>" + ALF_COPY +
+                    "</span></center>";
+      }
+      
+      return alfresco;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java b/source/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java
new file mode 100644
index 0000000000..4c04b801d0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/SearchCustomPropertiesTag.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class SearchCustomPropertiesTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.AdvancedSearch";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "bean", this.bean);
+      setStringProperty(component, "var", this.var);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.bean = null;
+      this.var = null;
+   }
+   
+   /**
+    * Set the bean reference
+    *
+    * @param bean     the bean reference
+    */
+   public void setBean(String bean)
+   {
+      this.bean = bean;
+   }
+
+   /**
+    * Set the var
+    *
+    * @param var     the var
+    */
+   public void setVar(String var)
+   {
+      this.var = var;
+   }
+   
+   
+   /** the bean reference */
+   private String bean;
+
+   /** the variable Map reference */
+   private String var;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java b/source/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java
new file mode 100644
index 0000000000..effddc637e
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/SimpleSearchTag.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class SimpleSearchTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.SimpleSearch";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setActionProperty((UICommand)component, this.action);
+      setActionListenerProperty((UICommand)component, this.actionListener);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.action = null;
+      this.actionListener = null;
+   }
+   
+   /**
+    * Set the action
+    *
+    * @param action     the action
+    */
+   public void setAction(String action)
+   {
+      this.action = action;
+   }
+
+   /**
+    * Set the actionListener
+    *
+    * @param actionListener     the actionListener
+    */
+   public void setActionListener(String actionListener)
+   {
+      this.actionListener = actionListener;
+   }
+
+
+   /** the action */
+   private String action;
+
+   /** the actionListener */
+   private String actionListener;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java b/source/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java
new file mode 100644
index 0000000000..223944b6de
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/SpaceSelectorTag.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+/*
+ * Created on 25-May-2005
+ */
+package org.alfresco.web.ui.repo.tag;
+
+
+/**
+ * @author Kevin Roast
+ */
+public class SpaceSelectorTag extends ItemSelectorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.SpaceSelector";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java b/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
new file mode 100644
index 0000000000..7643056646
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ResourceBundle;
+
+import javax.portlet.PortletSession;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.ExternalAccessServlet;
+import org.alfresco.web.bean.ErrorBean;
+
+/**
+ * A non-JSF tag library that displays the currently stored system error
+ * 
+ * @author gavinc
+ */
+public class SystemErrorTag extends TagSupport
+{
+   private static final String MSG_RETURN_TO_APP = "return_to_application";
+   private static final String MSG_HIDE_DETAILS  = "hide_details";
+   private static final String MSG_SHOW_DETAILS  = "show_details";
+   private static final String MSG_LOGOUT        = "logout";
+   
+   private String styleClass;
+   private String detailsStyleClass;
+   private boolean showDetails = false;
+   
+   
+   /**
+    * @return Returns the showDetails.
+    */
+   public boolean isShowDetails()
+   {
+      return showDetails;
+   }
+   
+   /**
+    * @param showDetails The showDetails to set.
+    */
+   public void setShowDetails(boolean showDetails)
+   {
+      this.showDetails = showDetails;
+   }
+   
+   /**
+    * @return Returns the styleClass.
+    */
+   public String getStyleClass()
+   {
+      return styleClass;
+   }
+   
+   /**
+    * @param styleClass The styleClass to set.
+    */
+   public void setStyleClass(String styleClass)
+   {
+      this.styleClass = styleClass;
+   }
+   
+   /**
+    * @return Returns the detailsStyleClass.
+    */
+   public String getDetailsStyleClass()
+   {
+      return detailsStyleClass;
+   }
+
+   /**
+    * @param detailsStyleClass The detailsStyleClass to set.
+    */
+   public void setDetailsStyleClass(String detailsStyleClass)
+   {
+      this.detailsStyleClass = detailsStyleClass;
+   }
+
+   /**
+    * @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
+    */
+   public int doStartTag() throws JspException
+   {
+      String errorMessage = "No error currently stored";
+      String errorDetails = "No details";
+      
+      // get the error details from the bean, this may be in a portlet
+      // session or a normal servlet session.
+      ErrorBean errorBean = null;
+      RenderRequest renderReq  = (RenderRequest)pageContext.getRequest().
+                                   getAttribute("javax.portlet.request");
+      if (renderReq != null)
+      {
+         PortletSession session = renderReq.getPortletSession();
+         errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME);
+      }
+      else
+      {
+         errorBean = (ErrorBean)pageContext.getSession().
+                        getAttribute(ErrorBean.ERROR_BEAN_NAME);
+      }
+
+      if (errorBean != null)
+      {
+         errorMessage = errorBean.getLastErrorMessage();
+         errorDetails = errorBean.getStackTrace();
+      }
+      
+      try
+      {
+         Writer out = pageContext.getOut();
+         
+         ResourceBundle bundle = Application.getBundle(pageContext.getSession());
+         
+         out.write("<div");
+         
+         if (this.styleClass != null)
+         {
+            out.write(" class='");
+            out.write(this.styleClass);
+            out.write("'");
+         }
+         
+         out.write(">");
+         out.write(errorMessage);
+         out.write("</div>");
+         
+         // work out initial state
+         boolean hidden = !this.showDetails; 
+         String display = "inline";
+         String toggleTitle = "Hide";
+         if (hidden)
+         {
+            display = "none";
+            toggleTitle = "Show";
+         }
+         
+         // output the script to handle toggling of details
+         out.write("<script language='JavaScript'>\n");
+         out.write("var hidden = ");
+         out.write(Boolean.toString(hidden));
+         out.write(";\n");   
+         out.write("function toggleDetails() {\n");
+         out.write("if (hidden) {\n");
+         out.write("document.getElementById('detailsTitle').innerHTML = '");
+         out.write(bundle.getString(MSG_HIDE_DETAILS));
+         out.write("<br/><br/>';\n");
+         out.write("document.getElementById('details').style.display = 'inline';\n");
+         out.write("hidden = false;\n");
+         out.write("} else {\n");
+         out.write("document.getElementById('detailsTitle').innerHTML = '");
+         out.write(bundle.getString(MSG_SHOW_DETAILS));
+         out.write(")';\n");
+         out.write("document.getElementById('details').style.display = 'none';\n");
+         out.write("hidden = true;\n");
+         out.write("} } </script>\n");
+         
+         // output the initial toggle state
+         out.write("<br/>");
+         out.write("<a id='detailsTitle' href='javascript:toggleDetails();'>");
+         out.write(toggleTitle);
+         out.write(" Details</a>");
+         
+         out.write("<div style='padding-top:5px;display:");
+         out.write(display);
+         out.write("' id='details'");
+         
+         if (this.detailsStyleClass != null)
+         {
+            out.write(" class='");
+            out.write(this.detailsStyleClass);
+            out.write("'");
+         }
+         
+         out.write(">");
+         out.write(errorDetails);
+         out.write("</div>");
+         
+         // output a link to return to the application
+         out.write("\n<div style='padding-top:16px;'><a href='");
+      
+         if (Application.inPortalServer())
+         {
+            RenderResponse renderResp  = (RenderResponse)pageContext.getRequest().getAttribute(
+                  "javax.portlet.response");
+            if (renderResp == null)
+            {
+               throw new IllegalStateException("RenderResponse object is null");
+            }
+            
+            PortletURL url = renderResp.createRenderURL();
+            // NOTE: we don't have to specify the page for the portlet, just the VIEW_ID parameter
+            //       being present will cause the current JSF view to be re-displayed
+            url.setParameter("org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID", "current-view");
+            out.write(url.toString());
+         }
+         else
+         {
+            String returnPage = null;
+            
+            if (errorBean != null)
+            {
+               returnPage = errorBean.getReturnPage();
+            }
+            
+            if (returnPage == null)
+            {
+               out.write("javascript:history.back();");
+            }
+            else
+            {
+               out.write(returnPage);
+            }
+         }
+         
+         out.write("'>");
+         out.write(bundle.getString(MSG_RETURN_TO_APP));
+         out.write("</a></div>");
+                   
+         // use External Access Servlet to generate a URL to relogin again
+         // this can be used by the user if the app has got into a total mess
+         if (Application.inPortalServer() == false)
+         {
+            out.write("\n<div style='padding-top:16px;'><a href='");
+            out.write(((HttpServletRequest)pageContext.getRequest()).getContextPath());
+            out.write(ExternalAccessServlet.generateExternalURL("browse", null));
+            out.write("'>");
+            out.write(bundle.getString(MSG_LOGOUT));
+            out.write("</a></div>");
+         }
+      }
+      catch (IOException ioe)
+      {
+         throw new JspException(ioe);
+      }
+      
+      return SKIP_BODY;
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.TagSupport#release()
+    */
+   public void release()
+   {
+      this.styleClass = null;
+      
+      super.release();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java b/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
new file mode 100644
index 0000000000..a86cff0a95
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/TemplateTag.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class TemplateTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Template";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "engine", this.engine);
+      setStringProperty(component, "template", this.template);
+      setStringBindingProperty(component, "model", this.model);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.engine = null;
+      this.template = null;
+      this.model = null;
+   }
+   
+   /**
+    * Set the engine name
+    *
+    * @param engine     the engine
+    */
+   public void setEngine(String engine)
+   {
+      this.engine = engine;
+   }
+
+   /**
+    * Set the template name
+    *
+    * @param template     the template
+    */
+   public void setTemplate(String template)
+   {
+      this.template = template;
+   }
+
+   /**
+    * Set the data model
+    *
+    * @param model     the model
+    */
+   public void setModel(String model)
+   {
+      this.model = model;
+   }
+
+
+   /** the engine name */
+   private String engine;
+
+   /** the template */
+   private String template;
+
+   /** the data model */
+   private String model;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java b/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
new file mode 100644
index 0000000000..0c5ca2eb8b
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.portlet.RenderResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.alfresco.web.app.Application;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A non-JSF tag library that outputs the form tag for uploading files, this tag
+ * is sensitive to whether the application is running in servlet or portlet mode
+ * 
+ * @author gavinc
+ */
+public class UploadFormTag extends TagSupport
+{
+   private static final long serialVersionUID = 4064734856565167835L;
+    
+   private static Log logger = LogFactory.getLog(UploadFormTag.class);
+   
+   /**
+    * @see javax.servlet.jsp.tagext.TagSupport#doStartTag()
+    */
+   public int doStartTag() throws JspException
+   {
+      try
+      {
+         Writer out = pageContext.getOut();
+         
+         out.write("<form name='upload-form' method='post' enctype='multipart/form-data' action='");
+         
+         if (Application.inPortalServer())
+         {
+            RenderResponse renderResp  = (RenderResponse)pageContext.getRequest().
+                                   getAttribute("javax.portlet.response");
+            if (renderResp == null)
+            {
+               throw new IllegalStateException("RenderResponse object is null. The web application is not executing within a portal server!");
+            }
+            
+            out.write(renderResp.createActionURL().toString());
+            out.write("'>");
+         }
+         else
+         {
+            HttpServletRequest req = (HttpServletRequest)pageContext.getRequest(); 
+            out.write(req.getContextPath());
+            out.write("/uploadFileServlet'>\n");
+            out.write("<input type='hidden' name='return-page' value='");
+            out.write(req.getContextPath() + "/faces" + req.getServletPath());
+            out.write("'>\n");
+         }
+      }
+      catch (IOException ioe)
+      {
+         throw new JspException(ioe.toString());
+      }
+      
+      return EVAL_BODY_INCLUDE;
+   }
+
+   public int doEndTag() throws JspException
+   {
+      try
+      {
+         pageContext.getOut().write("\n</form>");
+      }
+      catch (IOException ioe)
+      {
+         throw new JspException(ioe.toString());
+      }
+      
+      return super.doEndTag();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java b/source/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java
new file mode 100644
index 0000000000..2b8b211d84
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/evaluator/PermissionEvaluatorTag.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.evaluator;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.evaluator.GenericEvaluatorTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class PermissionEvaluatorTag extends GenericEvaluatorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.PermissionEvaluator";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringProperty(component, "allow", this.allow);
+      setStringProperty(component, "deny", this.deny);
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      this.allow = null;
+      this.deny = null;
+   }
+   
+   /**
+    * Set the allow permissions
+    *
+    * @param allow     the allow permissions
+    */
+   public void setAllow(String allow)
+   {
+      this.allow = allow;
+   }
+
+   /**
+    * Set the deny permissions
+    *
+    * @param deny     the deny permissions
+    */
+   public void setDeny(String deny)
+   {
+      this.deny = deny;
+   }
+
+
+   /** the allow permissions */
+   private String allow;
+
+   /** the deny permissions */
+   private String deny;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java
new file mode 100644
index 0000000000..6b7670a2ec
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/AssociationEditorTag.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+/**
+ * Allows the AssociationEditor component to be added to a JSP page
+ * 
+ * @author gavinc
+ */
+public class AssociationEditorTag extends BaseAssociationEditorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.AssociationEditor";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java
new file mode 100644
index 0000000000..5eac77941f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/AssociationTag.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+/**
+ * Allows associations to be displayed as part of a property sheet component on a JSP page
+ * 
+ * @author gavinc
+ */
+public class AssociationTag extends PropertySheetItemTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.AssociationRenderer";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Association";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
new file mode 100644
index 0000000000..276852ebfb
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/BaseAssociationEditorTag.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Base class for all association editor tag implementations
+ * 
+ * @author gavinc
+ */
+public abstract class BaseAssociationEditorTag extends BaseComponentTag
+{
+   private String associationName;
+   private String availableOptionsSize;
+   private String selectItemMsg;
+   private String selectItemsMsg;
+   private String selectedItemsMsg;
+   private String noSelectedItemsMsg;
+   private String disabled;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringStaticProperty(component, "availableOptionsSize", this.availableOptionsSize);
+      setStringProperty(component, "associationName", this.associationName);
+      setStringProperty(component, "selectItemMsg", this.selectItemMsg);
+      setStringProperty(component, "selectItemsMsg", this.selectItemsMsg);
+      setStringProperty(component, "selectedItemsMsg", this.selectedItemsMsg);
+      setStringProperty(component, "noSelectedItemsMsg", this.noSelectedItemsMsg);
+      setBooleanProperty(component, "disabled", this.disabled);
+   }
+   
+   /**
+    * Sets the association name
+    * 
+    * @param associationName The association name
+    */
+   public void setAssociationName(String associationName)
+   {
+      this.associationName = associationName;
+   }
+   
+   /**
+    * @param availableOptionsSize Sets the size of the available options size when 
+    *        multiple items can be selected
+    */
+   public void setAvailableOptionsSize(String availableOptionsSize)
+   {
+      this.availableOptionsSize = availableOptionsSize;
+   }
+   
+   /**
+    * Sets the message to display for the no selected items
+    * 
+    * @param noSelectedItemsMsg The message
+    */
+   public void setNoSelectedItemsMsg(String noSelectedItemsMsg)
+   {
+      this.noSelectedItemsMsg = noSelectedItemsMsg;
+   }
+   
+   /**
+    * Sets the message to display for the selected items
+    * 
+    * @param selectedItemsMsg The message
+    */
+   public void setSelectedItemsMsg(String selectedItemsMsg)
+   {
+      this.selectedItemsMsg = selectedItemsMsg;
+   }
+
+   /**
+    * Sets the message to display for inviting the user to select an item
+    * 
+    * @param selectItemMsg The message
+    */
+   public void setSelectItemMsg(String selectItemMsg)
+   {
+      this.selectItemMsg = selectItemMsg;
+   }
+   
+   /**
+    * Sets the message to display for inviting the user to select items
+    * 
+    * @param selectItemsMsg The message
+    */
+   public void setSelectItemsMsg(String selectItemsMsg)
+   {
+      this.selectItemsMsg = selectItemsMsg;
+   }
+   
+   /**
+    * Sets whether the component should be rendered in a disabled state
+    * 
+    * @param disabled true to render the component in a disabled state
+    */
+   public void setDisabled(String disabled)
+   {
+      this.disabled = disabled;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#release()
+    */
+   public void release()
+   {
+      this.associationName = null;
+      this.availableOptionsSize = null;
+      this.selectItemMsg = null;
+      this.selectItemsMsg = null;
+      this.selectedItemsMsg = null;
+      this.noSelectedItemsMsg = null;
+      this.disabled = null;
+
+      super.release();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java
new file mode 100644
index 0000000000..0197b05c49
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationEditorTag.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+/**
+ * Allows the ChildAssociationEditor component to be added to a JSP page
+ * 
+ * @author gavinc
+ */
+public class ChildAssociationEditorTag extends BaseAssociationEditorTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ChildAssociationEditor";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java
new file mode 100644
index 0000000000..ad784265dd
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/ChildAssociationTag.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+/**
+ * Allows child associations to be displayed as part of a property sheet component on a JSP page
+ * 
+ * @author gavinc
+ */
+public class ChildAssociationTag extends PropertySheetItemTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.ChildAssociationRenderer";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ChildAssociation";
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
new file mode 100644
index 0000000000..5b08761ed0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetGridTag.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+import javax.faces.component.UIComponent;
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Tag to represent the combination of a PropertySheet component
+ * and a Grid renderer
+ * 
+ * @author gavinc
+ */
+public class PropertySheetGridTag extends BaseComponentTag
+{
+   private String value;
+   private String var;
+   private String columns;
+   private String externalConfig;
+   private String configArea;
+   private String readOnly;
+   private String mode;
+   private String labelStyleClass;
+   private String cellpadding;
+   private String cellspacing;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.PropertySheet";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "javax.faces.Grid";
+   }
+   
+   /**
+    * @param value The value to set.
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * @param var The var to set.
+    */
+   public void setVar(String var)
+   {
+      this.var = var;
+   }
+
+   /**
+    * @param columns The columns to set.
+    */
+   public void setColumns(String columns)
+   {
+      this.columns = columns;
+   }
+
+   /**
+    * @param externalConfig The externalConfig to set.
+    */
+   public void setExternalConfig(String externalConfig)
+   {
+      this.externalConfig = externalConfig;
+   }
+   
+   /**
+    * @param configArea Sets the named config area to use
+    */
+   public void setConfigArea(String configArea)
+   {
+      this.configArea = configArea;
+   }
+
+   /**
+    * @param mode The mode, either "edit" or "view"
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+
+   /**
+    * @param readOnly The readOnly to set.
+    */
+   public void setReadOnly(String readOnly)
+   {
+      this.readOnly = readOnly;
+   }
+   
+   /**
+    * @param labelStyleClass Sets the style class for the label column
+    */
+   public void setLabelStyleClass(String labelStyleClass)
+   {
+      this.labelStyleClass = labelStyleClass;
+   }
+
+   /**
+    * @param cellpadding Sets the cellpadding for the grid
+    */
+   public void setCellpadding(String cellpadding)
+   {
+      this.cellpadding = cellpadding;
+   }
+
+   /**
+    * @param cellspacing Sets the cellspacing for the grid
+    */
+   public void setCellspacing(String cellspacing)
+   {
+      this.cellspacing = cellspacing;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "value", this.value);
+      setStringProperty(component, "mode", this.mode);
+      setStringProperty(component, "configArea", this.configArea);
+      setStringStaticProperty(component, "var", this.var);
+      setIntProperty(component, "columns", this.columns);
+      setStringStaticProperty(component, "labelStyleClass", this.labelStyleClass);
+      setBooleanProperty(component, "externalConfig", this.externalConfig);
+      setBooleanProperty(component, "readOnly", this.readOnly);
+      setStringStaticProperty(component, "cellpadding", this.cellpadding);
+      setStringStaticProperty(component, "cellspacing", this.cellspacing);
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#release()
+    */
+   public void release()
+   {
+      this.value = null;
+      this.var = null;
+      this.columns = null;
+      this.externalConfig = null;
+      this.configArea = null;
+      this.readOnly = null;
+      this.mode = null;
+      this.labelStyleClass = null;
+      this.cellpadding = null;
+      this.cellspacing = null;
+      
+      super.release();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
new file mode 100644
index 0000000000..1cf9fd2700
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertySheetItemTag.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * Base class for all property sheet items that need to be placed on a JSP page 
+ * 
+ * @author gavinc
+ */
+public abstract class PropertySheetItemTag extends BaseComponentTag
+{
+   private String name;
+   private String displayLabel;
+   private String readOnly;
+   private String mode;
+   private String converter;
+
+   /**
+    * @param displayLabel Sets the display label
+    */
+   public void setDisplayLabel(String displayLabel)
+   {
+      this.displayLabel = displayLabel;
+   }
+
+   /**
+    * @param name Sets the name
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   /**
+    * @param readOnly Sets whether the property is read only
+    */
+   public void setReadOnly(String readOnly)
+   {
+      this.readOnly = readOnly;
+   }
+   
+   /**
+    * @param mode The mode, either "edit" or "view"
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * @param converter Sets the id of the converter
+    */
+   public void setConverter(String converter)
+   {
+      this.converter = converter;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "name", this.name);
+      setStringProperty(component, "displayLabel", this.displayLabel);
+      setStringProperty(component, "mode", this.mode);
+      setStringProperty(component, "converter", this.converter);
+      setBooleanProperty(component, "readOnly", this.readOnly);
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#release()
+    */
+   public void release()
+   {
+      this.name = null;
+      this.displayLabel = null;
+      this.mode = null;
+      this.converter = null;
+      this.readOnly = null;
+      
+      super.release();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java b/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
new file mode 100644
index 0000000000..b7c92ad6e0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/property/PropertyTag.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.property;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+
+/**
+ * @author gavinc
+ */
+public class PropertyTag extends BaseComponentTag
+{
+   private String name;
+   private String displayLabel;
+   private String readOnly;
+   private String mode;
+   private String converter;
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return "org.alfresco.faces.PropertyRenderer";
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Property";
+   }
+
+   /**
+    * @param displayLabel Sets the display label
+    */
+   public void setDisplayLabel(String displayLabel)
+   {
+      this.displayLabel = displayLabel;
+   }
+
+   /**
+    * @param name Sets the name
+    */
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   /**
+    * @param readOnly Sets whether the property is read only
+    */
+   public void setReadOnly(String readOnly)
+   {
+      this.readOnly = readOnly;
+   }
+   
+   /**
+    * @param mode The mode, either "edit" or "view"
+    */
+   public void setMode(String mode)
+   {
+      this.mode = mode;
+   }
+   
+   /**
+    * @param converter Sets the id of the converter
+    */
+   public void setConverter(String converter)
+   {
+      this.converter = converter;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "name", this.name);
+      setStringProperty(component, "displayLabel", this.displayLabel);
+      setStringProperty(component, "mode", this.mode);
+      setStringProperty(component, "converter", this.converter);
+      setBooleanProperty(component, "readOnly", this.readOnly);
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#release()
+    */
+   public void release()
+   {
+      this.name = null;
+      this.displayLabel = null;
+      this.mode = null;
+      this.converter = null;
+      this.readOnly = null;
+      
+      super.release();
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
new file mode 100644
index 0000000000..a16e2482fd
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ClipboardShelfItemTag.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.alfresco.web.ui.repo.component.shelf.UIClipboardShelfItem;
+
+/**
+ * @author Kevin Roast
+ */
+public class ClipboardShelfItemTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ClipboardShelfItem";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringBindingProperty(component, "collections", this.collections);
+      if (isValueReference(this.pasteActionListener))
+      {
+         MethodBinding vb = getFacesContext().getApplication().createMethodBinding(this.pasteActionListener, ACTION_CLASS_ARGS);
+         ((UIClipboardShelfItem)component).setPasteActionListener(vb);
+      }
+      else
+      {
+         throw new FacesException("Paste Action listener method binding incorrectly specified: " + this.pasteActionListener);
+      }
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.collections = null;
+      this.pasteActionListener = null;
+   }
+   
+   /**
+    * Set the clipboard collections to show
+    *
+    * @param collections     the clipboard collections to show
+    */
+   public void setCollections(String collections)
+   {
+      this.collections = collections;
+   }
+   
+   /**
+    * Set the pasteActionListener
+    *
+    * @param pasteActionListener     the pasteActionListener
+    */
+   public void setPasteActionListener(String pasteActionListener)
+   {
+      this.pasteActionListener = pasteActionListener;
+   }
+
+
+   /** the pasteActionListener */
+   private String pasteActionListener;
+
+   /** the clipboard collections reference */
+   private String collections;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
new file mode 100644
index 0000000000..2579aed37a
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/RecentSpacesShelfItemTag.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.alfresco.web.ui.repo.component.shelf.UIRecentSpacesShelfItem;
+
+/**
+ * @author Kevin Roast
+ */
+public class RecentSpacesShelfItemTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.RecentSpacesShelfItem";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringBindingProperty(component, "value", this.value);
+      if (isValueReference(this.navigateActionListener))
+      {
+         MethodBinding vb = getFacesContext().getApplication().createMethodBinding(this.navigateActionListener, ACTION_CLASS_ARGS);
+         ((UIRecentSpacesShelfItem)component).setNavigateActionListener(vb);
+      }
+      else
+      {
+         throw new FacesException("Navigate Action listener method binding incorrectly specified: " + this.navigateActionListener);
+      }
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.value = null;
+      this.navigateActionListener = null;
+   }
+   
+   /**
+    * Set the value used to bind the recent spaces list to the component
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the navigateActionListener
+    *
+    * @param navigateActionListener     the navigateActionListener
+    */
+   public void setNavigateActionListener(String navigateActionListener)
+   {
+      this.navigateActionListener = navigateActionListener;
+   }
+
+
+   /** the navigateActionListener */
+   private String navigateActionListener;
+   
+   /** the value */
+   private String value;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java
new file mode 100644
index 0000000000..97584b074f
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfGroupTag.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class ShelfGroupTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ShelfGroup";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "label", this.label);
+      setBooleanProperty(component, "expanded", this.expanded);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.label = null;
+      this.expanded = null;
+   }
+   
+   /**
+    * Set the label
+    *
+    * @param label     the label
+    */
+   public void setLabel(String label)
+   {
+      this.label = label;
+   }
+
+   /**
+    * Set the expanded flag
+    *
+    * @param expanded     the expanded flag
+    */
+   public void setExpanded(String expanded)
+   {
+      this.expanded = expanded;
+   }
+
+
+   /** the label */
+   private String label;
+
+   /** the expanded */
+   private String expanded;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java
new file mode 100644
index 0000000000..6c82b29cef
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfItemTag.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+/**
+ * @author Kevin Roast
+ */
+public class ShelfItemTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ShelfItem";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
new file mode 100644
index 0000000000..87c86a0e7d
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShelfTag.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.alfresco.web.ui.repo.component.shelf.UIShelf;
+
+/**
+ * @author Kevin Roast
+ */
+public class ShelfTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.Shelf";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      
+      setStringProperty(component, "groupPanel", this.groupPanel);
+      setStringProperty(component, "groupBgcolor", this.groupBgcolor);
+      setStringProperty(component, "selectedGroupPanel", this.selectedGroupPanel);
+      setStringProperty(component, "selectedGroupBgcolor", this.selectedGroupBgcolor);
+      setStringProperty(component, "innerGroupPanel", this.innerGroupPanel);
+      setStringProperty(component, "innerGroupBgcolor", this.innerGroupBgcolor);
+      if (this.groupExpandedActionListener != null)
+      {
+         if (isValueReference(this.groupExpandedActionListener))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(this.groupExpandedActionListener, ACTION_CLASS_ARGS);
+            ((UIShelf)component).setGroupExpandedActionListener(vb);
+         }
+         else
+         {
+            throw new FacesException("Shelf Group Expanded Action listener method binding incorrectly specified: " + this.groupExpandedActionListener);
+         }
+      }
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.groupPanel = null;
+      this.groupBgcolor = null;
+      this.selectedGroupPanel = null;
+      this.selectedGroupBgcolor = null;
+      this.innerGroupPanel = null;
+      this.innerGroupBgcolor = null;
+      this.groupExpandedActionListener = null;
+   }
+   
+   /**
+    * Set the groupPanel
+    *
+    * @param groupPanel     the groupPanel
+    */
+   public void setGroupPanel(String groupPanel)
+   {
+      this.groupPanel = groupPanel;
+   }
+
+   /**
+    * Set the groupBgcolor
+    *
+    * @param groupBgcolor     the groupBgcolor
+    */
+   public void setGroupBgcolor(String groupBgcolor)
+   {
+      this.groupBgcolor = groupBgcolor;
+   }
+
+   /**
+    * Set the selectedGroupPanel
+    *
+    * @param selectedGroupPanel     the selectedGroupPanel
+    */
+   public void setSelectedGroupPanel(String selectedGroupPanel)
+   {
+      this.selectedGroupPanel = selectedGroupPanel;
+   }
+
+   /**
+    * Set the selectedGroupBgcolor
+    *
+    * @param selectedGroupBgcolor     the selectedGroupBgcolor
+    */
+   public void setSelectedGroupBgcolor(String selectedGroupBgcolor)
+   {
+      this.selectedGroupBgcolor = selectedGroupBgcolor;
+   }
+
+   /**
+    * Set the innerGroupPanel
+    *
+    * @param innerGroupPanel     the innerGroupPanel
+    */
+   public void setInnerGroupPanel(String innerGroupPanel)
+   {
+      this.innerGroupPanel = innerGroupPanel;
+   }
+
+   /**
+    * Set the innerGroupBgcolor
+    *
+    * @param innerGroupBgcolor     the innerGroupBgcolor
+    */
+   public void setInnerGroupBgcolor(String innerGroupBgcolor)
+   {
+      this.innerGroupBgcolor = innerGroupBgcolor;
+   }
+   
+   /**
+    * Set the groupExpandedActionListener
+    *
+    * @param groupExpandedActionListener     the groupExpandedActionListener
+    */
+   public void setGroupExpandedActionListener(String groupExpandedActionListener)
+   {
+      this.groupExpandedActionListener = groupExpandedActionListener;
+   }
+
+
+   /** the groupExpandedActionListener */
+   private String groupExpandedActionListener;
+
+   /** the groupPanel */
+   private String groupPanel;
+
+   /** the groupBgcolor */
+   private String groupBgcolor;
+
+   /** the selectedGroupPanel */
+   private String selectedGroupPanel;
+
+   /** the selectedGroupBgcolor */
+   private String selectedGroupBgcolor;
+
+   /** the innerGroupPanel */
+   private String innerGroupPanel;
+
+   /** the innerGroupBgcolor */
+   private String innerGroupBgcolor;
+}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
new file mode 100644
index 0000000000..0237cc52f0
--- /dev/null
+++ b/source/java/org/alfresco/web/ui/repo/tag/shelf/ShortcutsShelfItemTag.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.ui.repo.tag.shelf;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+
+import org.alfresco.web.ui.common.tag.BaseComponentTag;
+import org.alfresco.web.ui.repo.component.shelf.UIShortcutsShelfItem;
+
+/**
+ * @author Kevin Roast
+ */
+public class ShortcutsShelfItemTag extends BaseComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getComponentType()
+    */
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.ShortcutsShelfItem";
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      // self rendering component
+      return null;
+   }
+   
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+      setStringBindingProperty(component, "value", this.value);
+      if (isValueReference(this.clickActionListener))
+      {
+         MethodBinding vb = getFacesContext().getApplication().createMethodBinding(this.clickActionListener, ACTION_CLASS_ARGS);
+         ((UIShortcutsShelfItem)component).setClickActionListener(vb);
+      }
+      else
+      {
+         throw new FacesException("Click Action listener method binding incorrectly specified: " + this.clickActionListener);
+      }
+      if (isValueReference(this.removeActionListener))
+      {
+         MethodBinding vb = getFacesContext().getApplication().createMethodBinding(this.removeActionListener, ACTION_CLASS_ARGS);
+         ((UIShortcutsShelfItem)component).setRemoveActionListener(vb);
+      }
+      else
+      {
+         throw new FacesException("Remove Action listener method binding incorrectly specified: " + this.clickActionListener);
+      }
+   }
+   
+   /**
+    * @see javax.servlet.jsp.tagext.Tag#release()
+    */
+   public void release()
+   {
+      super.release();
+      
+      this.value = null;
+      this.clickActionListener = null;
+      this.removeActionListener = null;
+   }
+   
+   /**
+    * Set the value used to bind the shortcuts list to the component
+    *
+    * @param value     the value
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+   
+   /**
+    * Set the clickActionListener
+    *
+    * @param clickActionListener     the clickActionListener
+    */
+   public void setClickActionListener(String clickActionListener)
+   {
+      this.clickActionListener = clickActionListener;
+   }
+   
+   /**
+    * Set the removeActionListener
+    *
+    * @param removeActionListener     the removeActionListener
+    */
+   public void setRemoveActionListener(String removeActionListener)
+   {
+      this.removeActionListener = removeActionListener;
+   }
+
+
+   /** the clickActionListener */
+   private String clickActionListener;
+   
+   /** the removeActionListener */
+   private String removeActionListener;
+   
+   /** the value */
+   private String value;
+}
diff --git a/source/meta-inf/application.xml b/source/meta-inf/application.xml
new file mode 100644
index 0000000000..32e70b7097
--- /dev/null
+++ b/source/meta-inf/application.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+   <display-name>Alfresco</display-name>
+   <module>
+     <web>
+         <web-uri>alfresco.war</web-uri>
+         <context-root>/alfresco</context-root>
+     </web>
+   </module>
+</application>
diff --git a/source/meta-inf/manifest.mf b/source/meta-inf/manifest.mf
new file mode 100644
index 0000000000..fb56593e14
--- /dev/null
+++ b/source/meta-inf/manifest.mf
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Class-Path: core.jar repository.jar
\ No newline at end of file
diff --git a/source/test-resources/test-config.xml b/source/test-resources/test-config.xml
new file mode 100644
index 0000000000..f7de382a03
--- /dev/null
+++ b/source/test-resources/test-config.xml
@@ -0,0 +1,106 @@
+<alfresco-config>
+   
+   <plug-ins>
+      <element-readers>
+         <element-reader element-name="property-sheet" class="org.alfresco.web.config.PropertySheetElementReader"/>
+         <element-reader element-name="server" class="org.alfresco.web.config.ServerElementReader"/>
+         <element-reader element-name="client" class="org.alfresco.web.config.ClientElementReader"/>
+         <element-reader element-name="navigation" class="org.alfresco.web.config.NavigationElementReader" />
+      </element-readers>
+   </plug-ins>
+
+   <config>
+      <property-sheet>
+         <show-property name="name" />
+      </property-sheet>
+      <server>
+         <mode>servlet</mode>
+         <error-page>/jsp/error.jsp</error-page>
+      </server>
+      <client>
+         <!-- the views available in the client -->
+         <views>
+            <view>org.alfresco.web.ui.common.renderer.data.RichListRenderer.DetailsViewRenderer</view>
+            <view>org.alfresco.web.ui.common.renderer.data.RichListRenderer.IconViewRenderer</view>
+         </views>
+         
+         <!-- default values for the views available in the client -->
+         <view-defaults>
+            <browse>
+               <!-- allowable values: list|details|icons -->
+               <view>icons</view>
+               <sort-descending>false</sort-descending>
+               <page-size>
+                  <list>10</list>
+                  <details>10</details>
+                  <icons>9</icons>
+               </page-size>
+            </browse>
+            <forums>
+               <!-- allowable values: list|details|icons -->
+               <view>list</view>
+               <page-size>
+                  <list>20</list>
+                  <details>20</details>
+                  <icons>20</icons>
+               </page-size>
+            </forums>
+            <forum>
+               <!-- allowable values: details -->
+               <view>details</view>
+               <page-size>
+                  <details>20</details>
+               </page-size>
+            </forum>
+            <topic>
+               <!-- allowable values: details|bubble -->
+               <view>bubble</view>
+               <sort-column>created</sort-column>
+               <sort-descending>true</sort-descending>
+               <page-size>
+                  <bubble>5</bubble>
+                  <details>20</details>
+               </page-size>
+            </topic>
+         </view-defaults>
+      </client>
+   </config>
+   
+   <config evaluator="string-compare" condition="space-aspect">
+      <property-sheet>
+         <show-property name="createddate" readOnly="true" />
+         <show-property name="modifieddate" readOnly="true" />
+         <show-property name="description" displayLabel="Description" readOnly="false" />
+         <show-property name="icon" />
+      </property-sheet>
+   </config>
+   
+   <config evaluator="object-type" condition="org.alfresco.web.ui.common.component.data.UIRichList">
+      <renderers>
+         <renderer mode="details">org.alfresco.web.ui.common.renderer.data.RichListRenderer.DetailsViewRenderer</renderer>
+      </renderers>
+   </config>
+   
+   <config evaluator="string-compare" condition="viewid-navigation-result">
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forums.jsp" />
+         <override from-outcome="browse" to-view-id="/jsp/forums/topics.jsp" />
+      </navigation>
+   </config>
+   
+   <config evaluator="string-compare" condition="outcome-navigation-result">
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-outcome="showSomethingElse" />
+         <override from-outcome="browse" to-outcome="showSomethingElse"  />
+      </navigation>
+   </config>
+   
+   <config evaluator="string-compare" condition="duplicate-navigation-overrides">
+      <navigation>
+         <override from-view-id="/jsp/browse/browse.jsp" to-view-id="/jsp/forums/forums.jsp" />
+         <override from-outcome="browse" to-outcome="showSomethingElse"  />
+         <override from-outcome="browse" to-outcome="newOutcome"  />
+      </navigation>
+   </config>
+   
+</alfresco-config>
\ No newline at end of file
diff --git a/source/web/WEB-INF/alfresco-pages.xml b/source/web/WEB-INF/alfresco-pages.xml
new file mode 100644
index 0000000000..abc9efd5c4
--- /dev/null
+++ b/source/web/WEB-INF/alfresco-pages.xml
@@ -0,0 +1,13 @@
+<pages>
+   <portal-name>default</portal-name>
+   <page>
+      <page-name>Alfresco</page-name>
+      <window>
+         <window-name>AlfrescoClientWindow</window-name>
+         <instance-ref>/alfresco.AlfrescoClient.AlfrescoClientInstance</instance-ref>
+         <default>true</default>
+         <region>center</region>
+         <height>0</height>
+      </window>
+   </page>
+</pages>
diff --git a/source/web/WEB-INF/alfresco.tld b/source/web/WEB-INF/alfresco.tld
new file mode 100644
index 0000000000..eb2da41822
--- /dev/null
+++ b/source/web/WEB-INF/alfresco.tld
@@ -0,0 +1,1686 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+
+<!-- Alfresco common JSF UI components tag library -->
+<taglib>
+   <tlib-version>1.0</tlib-version>
+   <jsp-version>1.2</jsp-version>
+   <short-name>a</short-name>
+   <display-name>Alfresco Common JSF Components</display-name>
+   <description>
+      Tag library consisting of Alfresco common JSF components i.e. those that 
+      can be used in non-Alfresco projects
+   </description>
+   
+   <tag>
+      <name>inputDatePicker</name>
+      <tag-class>org.alfresco.web.ui.common.tag.InputDatePickerTag</tag-class>
+      <body-content>JSP</body-content>
+      <display-name>Date Picker</display-name>
+      <description>
+         Provides a custom renderer to display an input component with year, month, day drop-downs
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The component identifier for this component</description>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The current value of this component</description>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description> The value binding expression linking this component to a property in a backing bean</description>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>startYear</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The year to appear first in the list</description>
+      </attribute>
+      
+      <attribute>
+         <name>yearCount</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The number of years to display in the list</description>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>richList</name>
+      <tag-class>org.alfresco.web.ui.common.tag.data.RichListTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The RichList component is capable of rendering a list of java bean objects in multiple rendering
+         modes. A List of objects is bound to the component through the value attribute and components
+         within the list can bind to specific fields (columns) through getter methods for each bean object
+         within the list. The component provides mechanism to page and sort data through additional
+         components
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>headerStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rowStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>altRowStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>width</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>var</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>initialSortColumn</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>initialSortDescending</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>listConfig</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>viewMode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   
+      <attribute>
+         <name>pageSize</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>column</name>
+      <tag-class>org.alfresco.web.ui.common.tag.data.ColumnTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The column component is a child of a data container component such as the RichList. It should
+         always be contained within such a component. A column is simply a container for other components
+         which are themselves bound to values from the current row supplied when the parent data container
+         iterates over its content. The column has several well known facet components which can be used to
+         specify child components used for specific purposes during the list rendering process.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>primary</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>actions</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>width</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>sortLink</name>
+      <tag-class>org.alfresco.web.ui.common.tag.data.SortLinkTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The sortLink component enables the user to sort a dataset by clicking an HTML link. The component
+         must be a child of a data component. It is generally contained inside a header facet component
+         within a column component. It automatically handles sorting of the appropriate data type for the
+         column bean getter method it is bound too. The control displays a small clickable icon to indicate
+         sorting direction and the direction of sorting can be toggled by clicking the icon. The component
+         does not require any developer intervention and therefore does not provide action command listeners.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>mode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>label</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+
+   <tag>
+      <name>dataPager</name>
+      <tag-class>org.alfresco.web.ui.common.tag.data.DataPagerTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The dataPager component enables a user to page through a large dataset. The component must be a
+         child of a data component. It is generally contained within the footer area of a richList component
+         or similar. The component keeps track of the current page and displays it to the user. The
+         component does not require any developer intervention and therefore does not provide action
+         command listeners.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>panel</name>
+      <tag-class>org.alfresco.web.ui.common.tag.PanelTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The progressive panel component enables the user to hide/show areas of the UI to progressive
+         display more complex areas of the UI as required. It also allows the developer to surround an
+         area of the UI with an attractive graphical border and title label. The component tags can
+         contain any combination of HTML or child JSF components. IMPORTANT NOTE: Currently there is an
+         issue in the SunRI and MyFaces impl of JSF whereby all child components of the panel must have an
+         id attribute specified if a progressive style panel is used - else an exception will occur when the
+         panel visibility is toggled by the user!
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>border</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>bgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>progressive</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>label</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>titleBorder</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>titleBgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+            
+      <attribute>
+         <name>expanded</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>expandedActionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>facetsId</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+
+   <tag>
+      <name>breadcrumb</name>
+      <tag-class>org.alfresco.web.ui.common.tag.BreadcrumbTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The breadcrumb component enables the manipulation and display of a separated path string. It
+         displays HTML links to enable the user to immediately select any part of the breadcrumb path.
+         The breadcrumb provides standard action and actionListener command properties for developers to
+         handle user interaction with the component.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>separator</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>showRoot</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>actionLink</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ActionLinkTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The actionLink component provides the user with a clickable link, image or both to represent an
+         action in the UI. The component provides standard action and actionListener command properties
+         for developers to handle user interaction.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>href</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>target</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>image</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>verticalAlign</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>showLink</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>padding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>onclick</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>booleanEvaluator</name>
+      <tag-class>org.alfresco.web.ui.common.tag.evaluator.BooleanEvaluatorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>valueSetEvaluator</name>
+      <tag-class>org.alfresco.web.ui.common.tag.evaluator.ValueSetEvaluatorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>stringEqualsEvaluator</name>
+      <tag-class>org.alfresco.web.ui.common.tag.evaluator.StringEqualsEvaluatorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>condition</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>menu</name>
+      <tag-class>org.alfresco.web.ui.common.tag.MenuTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The menu component displays a pop-up DHTML menu containing multiple ActionLink components.
+         A simple link and/or image is displayed to the user, which when clicked will pop-up a menu of
+         items. Each item is an ActionLink component with the image part rendered as the icon for the menu
+         item. Evaluators can be used to wrap ActionLink components or simply use the rendered attribute
+         directly to hide/show items as needed.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>menuStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>menuStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>itemSpacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>label</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>image</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>modeList</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ModeListTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The ModeList component displays a graphical list of items, each with a label and optional icon
+         image. Only one of the items can be selected at any time. The currently selected item is shown in
+         a different style. When the selection is changed by the user, the component updates and fires a
+         standard actionListener event. Each item in the ModeList is represented by a ModeListItem
+         component. This component supplies the label, optional icon and also a value which is set as the
+         current value of the ModeList component when it becomes the selected item. The value can be
+         retrieved from the component during the actionListener event handler.
+         This component can be optionally rendered horizontally to display a toolbar like UI element. It
+         also features a large number of configurable CSS style elements to make it highly flexible in
+         rendering style. 
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>labelStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>labelStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>itemStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>itemStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>disabledStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>disabledStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>itemLinkStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>itemLinkStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedLinkStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedLinkStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectedImage</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>itemSpacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>horizontal</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>iconColumnWidth</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>width</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>label</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>disabled</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>listItem</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ListItemTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Represents a single item within the ModeList component.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>label</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>image</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>disabled</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>listItems</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ListItemsTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>Represents listItem components held in a Map or List object</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+
+   <tag>
+      <name>imagePickerRadio</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ImagePickerRadioTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The image picker component displays a list of images, of which one can be selected via radio
+         buttons. The list can be configured to display the images in any number of columns. Each item
+         in the list is represented by the modeListItem tag defined by the ModeList component.
+         A spacing (between the elements in the list) can be configured as well as the inline style or
+         CSS class for the list 
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>spacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>columns</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+            
+      <attribute>
+         <name>onclick</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>convertXMLDate</name>
+      <tag-class>org.alfresco.web.ui.common.tag.XMLDateConverterTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Allows the XMLDateConverter to be used on a page
+      </description>
+      
+      <attribute>
+         <name>dateStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>locale</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>pattern</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>timeStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>timeZone</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>type</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>convertSize</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ByteSizeConverterTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Allows the ByteSizeConverter to be used on a page
+      </description>
+   </tag>
+   
+   <tag>
+      <name>convertBoolean</name>
+      <tag-class>org.alfresco.web.ui.common.tag.BooleanLabelConverterTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Allows the BooleanLabelConverter to be used on a page
+      </description>
+   </tag>
+
+   <tag>
+      <name>dynamicDescription</name>
+      <tag-class>org.alfresco.web.ui.common.tag.description.DynamicDescriptionTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Displays a description that dynamically changes when another input
+         control on the page changes state
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selected</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>functionName</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>description</name>
+      <tag-class>org.alfresco.web.ui.common.tag.description.DescriptionTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>Represents a description option</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>controlValue</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>text</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>      
+   </tag>
+   
+   <tag>
+      <name>descriptions</name>
+      <tag-class>org.alfresco.web.ui.common.tag.description.DescriptionsTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>Represents description options held in a Map object</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>errors</name>
+      <tag-class>org.alfresco.web.ui.common.tag.ErrorsTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>Displays global errors within a gradient panel</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>message</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>httpSessionState</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.HttpSessionStateTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the current HTTP Session state in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>httpRequestState</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.HttpRequestStateTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the current HTTP request state in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>httpRequestParams</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.HttpRequestParamsTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the current HTTP request parameters in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>httpRequestHeaders</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.HttpRequestHeadersTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the current HTTP request headers in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>httpApplicationState</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.HttpApplicationStateTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the current HTTP Application state in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>systemProperties</name>
+      <tag-class>org.alfresco.web.ui.common.tag.debug.SystemPropertiesTag</tag-class>
+      <body-content>JSP</body-content>
+      <description>Displays the system properties of the VM in a table</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>genericPicker</name>
+      <tag-class>org.alfresco.web.ui.common.tag.GenericPickerTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>showFilter</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>showContains</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>showAddButton</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>filterRefresh</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>addButtonLabel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>width</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>height</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>filters</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>queryCallback</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>outputText</name>
+      <tag-class>org.alfresco.web.ui.common.tag.OutputTextTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>statusMessage</name>
+      <tag-class>org.alfresco.web.ui.common.tag.StatusMessageTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         The Status Message component collects and displays the last N JSF messages with a well
+         known message Id of "status". The last message collected is display, the messages can be
+         paged through by the user. The last N messages are stored in a stack for display.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>border</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>bgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>label</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+</taglib>
diff --git a/source/web/WEB-INF/faces-config-common.xml b/source/web/WEB-INF/faces-config-common.xml
new file mode 100644
index 0000000000..9b580b0ebe
--- /dev/null
+++ b/source/web/WEB-INF/faces-config-common.xml
@@ -0,0 +1,210 @@
+<?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.RichList</component-type>
+      <component-class>org.alfresco.web.ui.common.component.data.UIRichList</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.RichListColumn</component-type>
+      <component-class>org.alfresco.web.ui.common.component.data.UIColumn</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.SortLink</component-type>
+      <component-class>org.alfresco.web.ui.common.component.data.UISortLink</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.DataPager</component-type>
+      <component-class>org.alfresco.web.ui.common.component.data.UIDataPager</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.Panel</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIPanel</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.Breadcrumb</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIBreadcrumb</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ActionLink</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIActionLink</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.Menu</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIMenu</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ModeList</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIModeList</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ListItem</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIListItem</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ListItems</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIListItems</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ImagePicker</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIImagePicker</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.BooleanEvaluator</component-type>
+      <component-class>org.alfresco.web.ui.common.component.evaluator.BooleanEvaluator</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.ValueSetEvaluator</component-type>
+      <component-class>org.alfresco.web.ui.common.component.evaluator.ValueSetEvaluator</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.StringEqualsEvaluator</component-type>
+      <component-class>org.alfresco.web.ui.common.component.evaluator.StringEqualsEvaluator</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.DynamicDescription</component-type>
+      <component-class>org.alfresco.web.ui.common.component.description.UIDynamicDescription</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.Description</component-type>
+      <component-class>org.alfresco.web.ui.common.component.description.UIDescription</component-class>
+   </component>
+
+   <component>
+      <component-type>org.alfresco.faces.Descriptions</component-type>
+      <component-class>org.alfresco.web.ui.common.component.description.UIDescriptions</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.HttpSessionState</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UIHttpSessionState</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.HttpRequestState</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UIHttpRequestState</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.HttpRequestParams</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UIHttpRequestParams</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.HttpRequestHeaders</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UIHttpRequestHeaders</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.HttpApplicationState</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UIHttpApplicationState</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.debug.SystemProperties</component-type>
+      <component-class>org.alfresco.web.ui.common.component.debug.UISystemProperties</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.GenericPicker</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIGenericPicker</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.OutputText</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIOutputText</component-class>
+   </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.StatusMessage</component-type>
+      <component-class>org.alfresco.web.ui.common.component.UIStatusMessage</component-class>
+   </component>
+   
+   
+   <!-- ==================== CONVERTERS ==================== -->
+   <converter>
+      <converter-id>org.alfresco.faces.XMLDataConverter</converter-id>
+      <converter-class>org.alfresco.web.ui.common.converter.XMLDateConverter</converter-class>
+   </converter>
+   
+   <converter>
+      <converter-id>org.alfresco.faces.BooleanLabelConverter</converter-id>
+      <converter-class>org.alfresco.web.ui.common.converter.BooleanLabelConverter</converter-class>
+   </converter>
+   
+   <converter>
+      <converter-id>org.alfresco.faces.ByteSizeConverter</converter-id>
+      <converter-class>org.alfresco.web.ui.common.converter.ByteSizeConverter</converter-class>
+   </converter>
+   
+   
+   <!-- ==================== RENDERERS ==================== -->
+   <render-kit>
+      <!-- custom Data Picker renderer for a UI Input component -->
+      <renderer>
+         <!-- the component family is a convention name -->
+         <component-family>javax.faces.Input</component-family>
+         <!-- the renderer type is a convention name - not an actual class -->
+         <renderer-type>org.alfresco.faces.DatePickerRenderer</renderer-type>
+         <!-- the actual renderer class type -->
+         <renderer-class>org.alfresco.web.ui.common.renderer.DatePickerRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.Data</component-family>
+         <renderer-type>org.alfresco.faces.RichListRenderer</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.data.RichListRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.Controls</component-family>
+         <renderer-type>org.alfresco.faces.BreadcrumbRenderer</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.BreadcrumbRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.Controls</component-family>
+         <renderer-type>org.alfresco.faces.ActionLinkRenderer</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.ActionLinkRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.Controls</component-family>
+         <renderer-type>org.alfresco.faces.ModeListRenderer</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.ModeListRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>org.alfresco.faces.ImagePicker</component-family>
+         <renderer-type>org.alfresco.faces.Radio</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.ImagePickerRadioRenderer</renderer-class>
+      </renderer>
+      
+      <renderer>
+         <component-family>javax.faces.Messages</component-family>
+         <renderer-type>org.alfresco.faces.Errors</renderer-type>
+         <renderer-class>org.alfresco.web.ui.common.renderer.ErrorsRenderer</renderer-class>
+      </renderer>
+      
+   </render-kit>
+      
+</faces-config>
diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
new file mode 100644
index 0000000000..83672f49b7
--- /dev/null
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -0,0 +1,1069 @@
+<?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>
+
+   <!-- ==================== NAVIGATION ==================== -->
+   <!-- navigation rules describe the navigation cases between views using the -->
+   <!-- outcomes from action methods or the outcome from a default action impl -->
+   <navigation-rule>
+      <description>
+         The decision rule used by the NavigationHandler to
+         determine which view must be displayed after the
+         current view, login.jsp is processed.
+      </description>
+      <from-view-id>/jsp/login.jsp</from-view-id>
+      <navigation-case>
+         <description>
+             Indicates to the NavigationHandler that the browse.jsp
+             view must be displayed if the Action referenced by a 
+             UICommand component on the login.jsp view returns 
+             the outcome "success".
+         </description>
+         <from-outcome>success</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rule to get back to the Browse page from anywhere (e.g. breadcrumb click, finish on dialog) -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>about</from-outcome>
+         <to-view-id>/jsp/dialog/about.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rules to the Details pages from anywhere (e.g. shelf components etc.) -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>showDocDetails</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showSpaceDetails</from-outcome>
+         <to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>dashboard</from-outcome>
+         <to-view-id>/jsp/browse/dashboard.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rule to get to the Advanced Search page from anywhere -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>advSearch</from-outcome>
+         <to-view-id>/jsp/dialog/advanced-search.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rule to get back to the login page from anywhere -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>logout</from-outcome>
+         <to-view-id>/jsp/login.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>relogin</from-outcome>
+         <to-view-id>/jsp/relogin.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rule to get back to the Admin Console from anywhere -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+         <navigation-case>
+         <from-outcome>adminConsole</from-outcome>
+         <to-view-id>/jsp/admin/admin-console.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- Browse screen action outcomes -->
+   <navigation-rule>
+      <from-view-id>/jsp/browse/browse.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>createSpace</from-outcome>
+         <to-view-id>/jsp/dialog/new-space.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createAdvancedSpace</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/create-from.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteSpace</from-outcome>
+         <to-view-id>/jsp/dialog/delete-space.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteFile</from-outcome>
+         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>addContent</from-outcome>
+         <to-view-id>/jsp/wizard/add-content/upload.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createContent</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/select-type.jsp</to-view-id>
+      </navigation-case>
+      <!-- showDocDetails and showSpaceDetails moved to /jsp/* above -->
+      <navigation-case>
+         <from-outcome>checkoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>checkinFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>undoCheckoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>updateFile</from-outcome>
+         <to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editFile</from-outcome>
+         <to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editHtmlInline</from-outcome>
+         <to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editTextInline</from-outcome>
+         <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>manageInvitedUsers</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>manageRules</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>previewContent</from-outcome>
+         <to-view-id>/jsp/dialog/preview-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>previewSpace</from-outcome>
+         <to-view-id>/jsp/dialog/preview-space.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- Admin Console rules -->
+   <navigation-rule>
+      <from-view-id>/jsp/admin/admin-console.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>manageCategories</from-outcome>
+         <to-view-id>/jsp/categories/categories.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>manageUsers</from-outcome>
+         <to-view-id>/jsp/users/users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showSystemInfo</from-outcome>
+         <to-view-id>/jsp/dialog/system-info.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showNodeBrowser</from-outcome>
+         <to-view-id>/jsp/admin/store-browser.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>import</from-outcome>
+         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>export</from-outcome>
+         <to-view-id>/jsp/dialog/export.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-file.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>checkoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-text-inline.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>checkoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-html-inline.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>checkoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/checkout-file.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>checkoutFileLink</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file-link.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/space-details.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>editSpaceProperties</from-outcome>
+         <to-view-id>/jsp/dialog/edit-space.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>manageInvitedUsers</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>manageRules</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteSpace</from-outcome>
+         <to-view-id>/jsp/dialog/delete-space.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>nextItem</from-outcome>
+         <to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>previousItem</from-outcome>
+         <to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>import</from-outcome>
+         <to-view-id>/jsp/dialog/import.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>export</from-outcome>
+         <to-view-id>/jsp/dialog/export.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>applyTemplate</from-outcome>
+         <to-view-id>/jsp/dialog/apply-template.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-space.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/document-details.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>editDocProperties</from-outcome>
+         <to-view-id>/jsp/dialog/edit-document-properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>checkoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>checkinFile</from-outcome>
+         <to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>undoCheckoutFile</from-outcome>
+         <to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>updateFile</from-outcome>
+         <to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteFile</from-outcome>
+         <to-view-id>/jsp/dialog/delete-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editFile</from-outcome>
+         <to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editHtmlInline</from-outcome>
+         <to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editTextInline</from-outcome>
+         <to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editSimpleWorkflow</from-outcome>
+         <to-view-id>/jsp/dialog/edit-simple-workflow.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editCategories</from-outcome>
+         <to-view-id>/jsp/dialog/edit-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createAction</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>nextItem</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>previousItem</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-document-properties.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-simple-workflow.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/edit-category.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/rules.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>createRule</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editRule</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteRule</from-outcome>
+         <to-view-id>/jsp/dialog/delete-rule.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/delete-rule.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>manageRules</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- Manage Invited Users navigation -->
+   <navigation-rule>
+      <from-view-id>/jsp/roles/*</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+      
+   <navigation-rule>
+      <from-view-id>/jsp/roles/manage-invited-users.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>inviteUsers</from-outcome>
+         <to-view-id>/jsp/wizard/invite-users/invite.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editRoles</from-outcome>
+         <to-view-id>/jsp/roles/edit-user-roles.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>removeUser</from-outcome>
+         <to-view-id>/jsp/roles/remove-invited-user.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the Invite Users wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/invite-users/*</from-view-id>
+      <navigation-case>
+         <from-outcome>invite</from-outcome>
+         <to-view-id>/jsp/wizard/invite-users/invite.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>notify</from-outcome>
+         <to-view-id>/jsp/wizard/invite-users/notify.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- System User Management navigation -->
+   <navigation-rule>
+      <from-view-id>/jsp/users/*</from-view-id>
+      <navigation-case>
+         <from-outcome>manageUsers</from-outcome>
+         <to-view-id>/jsp/users/users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/users/users.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/users/users.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>createUser</from-outcome>
+         <to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editUser</from-outcome>
+         <to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteUser</from-outcome>
+         <to-view-id>/jsp/users/delete-user.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>changePassword</from-outcome>
+         <to-view-id>/jsp/users/change-password.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the New User wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/new-user/*</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/users/users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/users/users.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>person-properties</from-outcome>
+         <to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>user-properties</from-outcome>
+         <to-view-id>/jsp/wizard/new-user/user-properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/new-user/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- Categories screen action outcomes -->
+   <navigation-rule>
+      <from-view-id>/jsp/categories/*</from-view-id>
+      <navigation-case>
+         <from-outcome>addCategory</from-outcome>
+         <to-view-id>/jsp/categories/new-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>editCategory</from-outcome>
+         <to-view-id>/jsp/categories/edit-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteCategory</from-outcome>
+         <to-view-id>/jsp/categories/delete-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/categories/categories.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/categories/categories.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rule for the new space dialog -->
+   <navigation-rule>
+      <from-view-id>/jsp/dialog/new-space.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rule to cancel and finish from any wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/*</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the advanced space wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/new-space/*</from-view-id>
+      <navigation-case>
+         <from-outcome>create-from</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/create-from.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>from-scratch</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/from-scratch.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>from-existing</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/from-existing.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>from-template</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/from-template.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>details</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/new-space/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the add in-line content wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/create-content/*</from-view-id>
+      <navigation-case>
+         <from-outcome>select</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/select-type.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>create-html</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/create-html.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>create-text</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/create-text.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>properties</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/create-content/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the add content wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/add-content/*</from-view-id>
+      <navigation-case>
+         <from-outcome>upload</from-outcome>
+         <to-view-id>/jsp/wizard/add-content/upload.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>properties</from-outcome>
+         <to-view-id>/jsp/wizard/add-content/properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/add-content/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the new rule wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/new-rule/*</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/rules.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>details</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>condition</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>in-category</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition-in-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>is-subtype</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition-is-subtype.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>compare-mime-type</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition-has-mimetype.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>has-aspect</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition-has-aspect.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>compare-property-value</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition-contains-text.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>action</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>simple-workflow</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-simple-workflow.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>link-category</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-link-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>add-features</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-add-features.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>copy</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-copy.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>move</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-move.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>transform</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-transform.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>transform-image</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-transform-image.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>mail</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-email.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>check-in</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-check-in.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>check-out</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-check-out.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>import</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-import.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>specialise-type</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action-specialise-type.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/new-rule/condition.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>no-condition</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/action.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/new-rule/action.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>no-condition</from-outcome>
+         <to-view-id>/jsp/wizard/new-rule/condition.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- navigation rules for the New Action Wizard -->
+   <navigation-rule>
+      <from-view-id>/jsp/wizard/create-action/*</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>action</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>simple-workflow</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-simple-workflow.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>link-category</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-link-category.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>add-features</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-add-features.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>copy</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-copy.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>move</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-move.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>transform</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-transform.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>transform-image</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-transform-image.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>mail</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-email.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>check-in</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-check-in.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>check-out</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-check-out.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>import</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-import.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>specialise-type</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/action-specialise-type.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>summary</from-outcome>
+         <to-view-id>/jsp/wizard/create-action/summary.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+
+
+   <!-- Navigation for Admin Node Browser -->
+   <navigation-rule>
+       <from-view-id>/jsp/admin/*</from-view-id>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectStores}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/store-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-outcome>nodeBrowser</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+       <from-view-id>/jsp/admin/store-browser.jsp</from-view-id>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectStore}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+   </navigation-rule>
+
+   <navigation-rule>
+       <from-view-id>/jsp/admin/node-browser.jsp</from-view-id>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectChild}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectPrimaryPath}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectPrimaryParent}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectParent}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectToNode}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectNodeProperty}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
+           <from-outcome>error</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
+           <from-outcome>node</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
+           <from-outcome>search</from-outcome>
+           <to-view-id>/jsp/admin/search-results.jsp</to-view-id>
+       </navigation-case>
+   </navigation-rule>
+
+   <navigation-rule>
+       <from-view-id>/jsp/admin/search-results.jsp</from-view-id>
+       <navigation-case>
+           <from-action>#{AdminNodeBrowseBean.selectResultNode}</from-action>
+           <from-outcome>success</from-outcome>
+           <to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
+       </navigation-case>
+   </navigation-rule>
+   
+   <!-- Forums screen action outcomes -->
+   <navigation-rule>
+      <from-view-id>/jsp/forums/*</from-view-id>
+      <!-- NOTE: we can't have a case for browse in here otherwise you can -->
+      <!--       never navigate back to the main browse screen             -->
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createForums</from-outcome>
+         <to-view-id>/jsp/forums/create-forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showForumsDetails</from-outcome>
+         <to-view-id>/jsp/forums/forums-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteForums</from-outcome>
+         <to-view-id>/jsp/forums/delete-forums.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createForum</from-outcome>
+         <to-view-id>/jsp/forums/create-forum.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteForum</from-outcome>
+         <to-view-id>/jsp/forums/delete-forum.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showForumDetails</from-outcome>
+         <to-view-id>/jsp/forums/forum-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createTopic</from-outcome>
+         <to-view-id>/jsp/forums/create-topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteTopic</from-outcome>
+         <to-view-id>/jsp/forums/delete-topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showTopicDetails</from-outcome>
+         <to-view-id>/jsp/forums/topic-details.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createPost</from-outcome>
+         <to-view-id>/jsp/forums/create-post.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>createReply</from-outcome>
+         <to-view-id>/jsp/forums/create-reply.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deletePost</from-outcome>
+         <to-view-id>/jsp/forums/delete-post.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/forums-details.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/forum-details.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/delete-forum.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/forums.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/create-topic.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/delete-topic.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/topic-details.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/create-post.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/create-reply.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/forums/delete-post.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>browse</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>finish</from-outcome>
+         <to-view-id>/jsp/forums/topic.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+
+</faces-config>
diff --git a/source/web/WEB-INF/faces-config-repo.xml b/source/web/WEB-INF/faces-config-repo.xml
new file mode 100644
index 0000000000..f65c21fbed
--- /dev/null
+++ b/source/web/WEB-INF/faces-config-repo.xml
@@ -0,0 +1,162 @@
+<?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.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.CategorySelector</component-type>
+      <component-class>org.alfresco.web.ui.repo.component.UICategorySelector</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>
+   
+   <!-- ==================== 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>
+
+   <!-- ==================== 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.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.List</renderer-type>
+         <renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueListEditorRenderer</renderer-class>
+      </renderer>
+   </render-kit>
+      
+</faces-config>
diff --git a/source/web/WEB-INF/faces-config-zoo.xml b/source/web/WEB-INF/faces-config-zoo.xml
new file mode 100644
index 0000000000..f7508506ca
--- /dev/null
+++ b/source/web/WEB-INF/faces-config-zoo.xml
@@ -0,0 +1,124 @@
+<?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>
+
+   <!-- ==================== MANAGED BEANS ==================== -->
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the jsf-test webapp User List screen
+      </description>
+      <managed-bean-name>UserListBean</managed-bean-name>
+      <managed-bean-class>jsftest.UserListBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Bean for component testing
+      </description>
+      <managed-bean-name>TestList</managed-bean-name>
+      <managed-bean-class>jsftest.TestList</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that acts as the Data Dictionary Service
+      </description>
+      <managed-bean-name>MockDDService</managed-bean-name>
+      <managed-bean-class>jsftest.repository.DataDictionary</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         A bean that components in the zoo can use
+      </description>
+      <managed-bean-name>DummyBean</managed-bean-name>
+      <managed-bean-class>jsftest.DummyBean</managed-bean-class>
+      <managed-bean-scope>request</managed-bean-scope>
+   </managed-bean>
+   
+   <!-- ==================== NAVIGATION ==================== -->   
+   <!-- Zoo page links -->
+   <navigation-rule>
+      <from-view-id>/jsp/zoo/zoo.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>showUserlist</from-outcome>
+         <to-view-id>/jsp/test/userlist.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showRichListZoo</from-outcome>
+         <to-view-id>/jsp/zoo/components.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showPropertyZoo</from-outcome>
+         <to-view-id>/jsp/zoo/properties.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showAutoPropertyZoo</from-outcome>
+         <to-view-id>/jsp/zoo/properties-auto.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showImagePickerZoo</from-outcome>
+         <to-view-id>/jsp/zoo/image-picker.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showDynaDescZoo</from-outcome>
+         <to-view-id>/jsp/zoo/dynamic-description.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showWebClient</from-outcome>
+         <to-view-id>/jsp/browse/browse.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- rule to get back to the zoo page from anywhere -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>showZoo</from-outcome>
+         <to-view-id>/jsp/zoo/zoo.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <!-- test page navigation rules -->
+   <navigation-rule>
+      <from-view-id>/jsp/test/userlist.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>edituser</from-outcome>
+         <to-view-id>/jsp/test/edituser.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>adduser</from-outcome>
+         <to-view-id>/jsp/test/adduser.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/test/adduser.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>success</from-outcome>
+         <to-view-id>/jsp/test/userlist.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/test/userlist.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+   <navigation-rule>
+      <from-view-id>/jsp/test/edituser.jsp</from-view-id>
+      <navigation-case>
+         <from-outcome>success</from-outcome>
+         <to-view-id>/jsp/test/userlist.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>cancel</from-outcome>
+         <to-view-id>/jsp/test/userlist.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
+</faces-config>
diff --git a/source/web/WEB-INF/faces-config.xml b/source/web/WEB-INF/faces-config.xml
new file mode 100644
index 0000000000..7e507e5b66
--- /dev/null
+++ b/source/web/WEB-INF/faces-config.xml
@@ -0,0 +1,1182 @@
+<?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>
+
+   <!-- ==================== APPLICATION ==================== -->
+   <application>
+      <navigation-handler>org.alfresco.web.app.AlfrescoNavigationHandler</navigation-handler>
+      <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
+      <locale-config>
+         <default-locale>en</default-locale>
+      </locale-config>
+   </application>
+   
+   
+   <!-- ==================== MANAGED BEANS ==================== -->
+   <managed-bean>
+      <description>
+         The bean that backs up the Login screen
+      </description>
+      <managed-bean-name>LoginBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.LoginBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authenticationService</property-name>
+         <value>#{authenticationService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>personService</property-name>
+         <value>#{personService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>configService</property-name>
+         <value>#{configService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds navigation state.
+      </description>
+      <managed-bean-name>NavigationBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.NavigationBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>cifsServer</property-name>
+         <value>#{cifsServer}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>configService</property-name>
+         <value>#{configService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds folder browse state.
+      </description>
+      <managed-bean-name>BrowseBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.BrowseBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>lockService</property-name>
+         <value>#{LockService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+   </managed-bean>
+
+   <managed-bean>
+      <description>
+         The bean that holds a users Clipboard state.
+      </description>
+      <managed-bean-name>ClipboardBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.clipboard.ClipboardBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeOperationsService</property-name>
+         <value>#{CopyService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that manages the state for the Recent Spaces Shelf component.
+      </description>
+      <managed-bean-name>RecentSpacesBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.RecentSpacesBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>configService</property-name>
+         <value>#{configService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that manages the state for the User Shortcuts Shelf component.
+      </description>
+      <managed-bean-name>UserShortcutsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.UserShortcutsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds a state for the Advanced Search screen.
+      </description>
+      <managed-bean-name>AdvancedSearchBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.AdvancedSearchBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds state for the Users screen.
+      </description>
+      <managed-bean-name>UsersBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.users.UsersBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authenticationService</property-name>
+         <value>#{authenticationService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds state for the Category Management screens.
+      </description>
+      <managed-bean-name>CategoriesBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.CategoriesBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>categoryService</property-name>
+         <value>#{CategoryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the New Space Wizard
+      </description>
+      <managed-bean-name>NewSpaceWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewSpaceWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the New Space Dialog
+      </description>
+      <managed-bean-name>NewSpaceDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewSpaceWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit Space Dialog
+      </description>
+      <managed-bean-name>EditSpaceDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewSpaceWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Add Content Wizard
+      </description>
+      <managed-bean-name>AddContentWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.AddContentWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Content Wizard
+      </description>
+      <managed-bean-name>CreateContentWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.CreateContentWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit Document Properties Dialog
+      </description>
+      <managed-bean-name>EditDocPropsDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.DocumentPropertiesBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the New Rule Wizard
+      </description>
+      <managed-bean-name>NewRuleWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewRuleWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>ruleService</property-name>
+         <value>#{RuleService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>actionService</property-name>
+         <value>#{ActionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>mimetypeService</property-name>
+         <value>#{MimetypeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>rulesBean</property-name>
+         <value>#{RulesBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the New Action Wizard
+      </description>
+      <managed-bean-name>NewActionWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewActionWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>actionService</property-name>
+         <value>#{ActionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>mimetypeService</property-name>
+         <value>#{MimetypeService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the New User Wizard
+      </description>
+      <managed-bean-name>NewUserWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewUserWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authenticationService</property-name>
+         <value>#{authenticationService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>personService</property-name>
+         <value>#{personService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>ownableService</property-name>
+         <value>#{OwnableService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>configService</property-name>
+         <value>#{configService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Manage Invited Users screens
+      </description>
+      <managed-bean-name>UserMembersBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.users.UserMembersBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>ownableService</property-name>
+         <value>#{OwnableService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>personService</property-name>
+         <value>#{personService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Invite Users Wizard
+      </description>
+      <managed-bean-name>InviteUsersWizard</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.InviteUsersWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>personService</property-name>
+         <value>#{personService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>mailSender</property-name>
+         <value>#{mailService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>authorityService</property-name>
+         <value>#{AuthorityService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Checkin and Checkout pages.
+      </description>
+      <managed-bean-name>CheckinCheckoutBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.CheckinCheckoutBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>versionOperationsService</property-name>
+         <value>#{CheckoutCheckinService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that holds manage content rules state
+      </description>
+      <managed-bean-name>RulesBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.RulesBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>ruleService</property-name>
+         <value>#{RuleService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the document details dialog
+      </description>
+      <managed-bean-name>DocumentDetailsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.DocumentDetailsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>lockService</property-name>
+         <value>#{LockService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>versionService</property-name>
+         <value>#{VersionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>copyService</property-name>
+         <value>#{CopyService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>ownableService</property-name>
+         <value>#{OwnableService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the Space details dialog
+      </description>
+      <managed-bean-name>SpaceDetailsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.SpaceDetailsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the document preview dialog
+      </description>
+      <managed-bean-name>DocumentPreviewBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.preview.DocumentPreviewBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         Backing bean used by the document preview dialog
+      </description>
+      <managed-bean-name>SpacePreviewBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.preview.SpacePreviewBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>Backing bean used for administration purposes</description>
+      <managed-bean-name>AdminBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.AdminBean</managed-bean-class>
+      <managed-bean-scope>application</managed-bean-scope>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>Backing bean used for the Export dialog</description>
+      <managed-bean-name>ExportDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.ExportBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>actionService</property-name>
+         <value>#{ActionService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>Backing bean used for the Import dialog</description>
+      <managed-bean-name>ImportDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.ImportBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>actionService</property-name>
+         <value>#{ActionService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+   </managed-bean>
+
+   <!-- Admin Node Browser Beans -->
+   <managed-bean>
+      <description>Backing bean used for the low-level Node Browser</description>
+      <managed-bean-name>AdminNodeBrowseBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.AdminNodeBrowseBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <!-- Forums managed beans -->
+   <managed-bean>
+      <description>
+         The bean that holds forums state.
+      </description>
+      <managed-bean-name>ForumsBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.ForumsBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>namespaceService</property-name>
+         <value>#{NamespaceService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Forums Dialog
+      </description>
+      <managed-bean-name>CreateForumsDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewForumsWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit Forums Dialog
+      </description>
+      <managed-bean-name>EditForumsDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewForumsWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Forum Dialog
+      </description>
+      <managed-bean-name>CreateForumDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewForumWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit Forum Dialog
+      </description>
+      <managed-bean-name>EditForumDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewForumWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Topic Dialog
+      </description>
+      <managed-bean-name>CreateTopicDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewTopicWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Edit Topic Dialog
+      </description>
+      <managed-bean-name>EditTopicDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewTopicWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Post Dialog
+      </description>
+      <managed-bean-name>CreatePostDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewPostWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <description>
+         The bean that backs up the Create Reply Dialog
+      </description>
+      <managed-bean-name>CreateReplyDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wizard.NewReplyWizard</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>fileFolderService</property-name>
+         <value>#{FileFolderService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>navigator</property-name>
+         <value>#{NavigationBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>contentService</property-name>
+         <value>#{ContentService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>dictionaryService</property-name>
+         <value>#{DictionaryService}</value>
+      </managed-property>
+   </managed-bean>
+
+   <!-- ==================== LIFECYCLE ==================== -->
+
+   <!-- 
+   <lifecycle>
+      <phase-listener>org.alfresco.web.app.DebugPhaseListener</phase-listener>
+   </lifecycle>
+   -->
+   
+</faces-config>
diff --git a/source/web/WEB-INF/jboss-portlet.xml b/source/web/WEB-INF/jboss-portlet.xml
new file mode 100644
index 0000000000..2d69fb1484
--- /dev/null
+++ b/source/web/WEB-INF/jboss-portlet.xml
@@ -0,0 +1,2 @@
+<portlet-app>
+</portlet-app>
\ No newline at end of file
diff --git a/source/web/WEB-INF/jboss-service.xml b/source/web/WEB-INF/jboss-service.xml
new file mode 100644
index 0000000000..f982fc0d08
--- /dev/null
+++ b/source/web/WEB-INF/jboss-service.xml
@@ -0,0 +1,2 @@
+<server>
+</server>
diff --git a/source/web/WEB-INF/jboss-web.xml b/source/web/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000000..9d9c645cc6
--- /dev/null
+++ b/source/web/WEB-INF/jboss-web.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<jboss-web>
+</jboss-web>
diff --git a/source/web/WEB-INF/portlet-instances.xml b/source/web/WEB-INF/portlet-instances.xml
new file mode 100644
index 0000000000..7dc3f1b891
--- /dev/null
+++ b/source/web/WEB-INF/portlet-instances.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="yes"?>
+<instances>
+   <instance>
+      <instance-name>AlfrescoClientInstance</instance-name>
+      <component-ref>AlfrescoClient</component-ref>
+   </instance>
+</instances>
diff --git a/source/web/WEB-INF/portlet.xml b/source/web/WEB-INF/portlet.xml
new file mode 100644
index 0000000000..f98624315c
--- /dev/null
+++ b/source/web/WEB-INF/portlet.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+    <portlet>
+        <description>Alfresco Client Portlet</description>
+        <portlet-name>AlfrescoClient</portlet-name>
+        <display-name>Alfresco Portlet</display-name>
+        <portlet-class>org.alfresco.web.app.portlet.AlfrescoFacesPortlet</portlet-class>
+        
+        <init-param>
+           <name>default-view</name>
+           <value>/jsp/login.jsp</value>
+        </init-param>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <portlet-info>
+            <title>Alfresco Client Portlet</title>
+            <short-title>alfresco-client-portlet</short-title>
+        </portlet-info>
+    </portlet>
+</portlet-app>
diff --git a/source/web/WEB-INF/repo.tld b/source/web/WEB-INF/repo.tld
new file mode 100644
index 0000000000..b1a7b40864
--- /dev/null
+++ b/source/web/WEB-INF/repo.tld
@@ -0,0 +1,1324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+
+   <tlib-version>1.0</tlib-version>
+   <jsp-version>1.2</jsp-version>
+   <short-name>r</short-name>
+   <display-name>Alfresco Repository JSF Components</display-name>
+   <description>Tag library consisting of Alfresco repository JSF components i.e. those that can only be used in Alfresco based projects</description>
+
+   <tag>
+      <name>propertySheetGrid</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.property.PropertySheetGridTag</tag-class>
+      <body-content>JSP</body-content>
+      <display-name>Property Sheet</display-name>
+      <description>Displays the current properties for a node in the repository</description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The component identifier for this component</description>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>A NodeRef object representing the node to show the properties of</description>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>The value binding expression linking this component to a property in a backing bean</description>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>var</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>columns</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>mode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>Whether the property sheet is in read-only mode or edit mode, values can be "view" or "edit"</description>
+      </attribute>
+      
+      <attribute>
+         <name>labelStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>cellpadding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>cellspacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>externalConfig</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>configArea</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>property</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.property.PropertyTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>displayLabel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>mode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>converter</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>association</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.property.AssociationTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>displayLabel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>mode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>converter</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>associationEditor</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.AssociationEditorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>assocationName</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>availableOptionsSize</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>noSelectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>childAssociation</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.property.ChildAssociationTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>displayLabel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>mode</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>converter</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>childAssociationEditor</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.ChildAssociationEditorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>assocationName</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>availableOptionsSize</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>noSelectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>nodeDescendants</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.NodeDescendantsTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>maxChildren</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>separator</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>showEllipses</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>nodePath</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.NodePathTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>disabled</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>showLeaf</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>breadcrumb</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>simpleSearch</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.SimpleSearchTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <description>
+         Displays controls and icons as the simple search controls needed for the repo client UI.
+      </description>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>action</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>actionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>systemError</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.SystemErrorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>detailsStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>showDetails</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>page</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.PageTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>title</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>titleId</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>uploadForm</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.UploadFormTag</tag-class>
+      <body-content>JSP</body-content>
+   </tag>
+   
+   <tag>
+      <name>spaceSelector</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.SpaceSelectorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>nodeStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>nodeStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>label</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>spacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>initialSelection</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>categorySelector</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.CategorySelectorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>nodeStyle</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>nodeStyleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>label</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>spacing</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>initialSelection</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>shelf</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.ShelfTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>groupPanel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>groupBgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedGroupPanel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>selectedGroupBgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>innerGroupPanel</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>innerGroupBgcolor</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>groupExpandedActionListener</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>shelfGroup</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.ShelfGroupTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>label</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>expanded</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>shelfItem</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.ShelfItemTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>tooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>clipboardShelfItem</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.ClipboardShelfItemTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>collections</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>pasteActionListener</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>recentSpacesShelfItem</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.RecentSpacesShelfItemTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>navigateActionListener</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>shortcutsShelfItem</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.shelf.ShortcutsShelfItemTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>clickActionListener</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>removeActionListener</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>lockIcon</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.LockIconTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>lockImage</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>lockOwnerImage</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>align</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>width</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>height</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>lockedOwnerTooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>lockedUserTooltip</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>template</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.TemplateTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>engine</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>template</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+
+      <attribute>
+         <name>model</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>permissionEvaluator</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.evaluator.PermissionEvaluatorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>allow</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>deny</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>multiValueListEditor</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.MultiValueListEditorTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>lastItemAdded</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>readOnly</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectItemMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>selectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>noSelectedItemsMsg</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+   <tag>
+      <name>searchCustomProperties</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.SearchCustomPropertiesTag</tag-class>
+      <body-content>JSP</body-content>
+      
+      <attribute>
+         <name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>binding</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>bean</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>var</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
+</taglib>
diff --git a/source/web/WEB-INF/web_TEMPLATE.xml b/source/web/WEB-INF/web_TEMPLATE.xml
new file mode 100644
index 0000000000..e6d1729378
--- /dev/null
+++ b/source/web/WEB-INF/web_TEMPLATE.xml
@@ -0,0 +1,212 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE web-app PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+  "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <display-name>Alfresco Web Client</display-name>
+    
+   <description>Alfresco Web Client</description>
+   
+   <context-param>
+      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+      <param-value>server</param-value>
+   </context-param>
+
+   <context-param>
+      <param-name>javax.faces.CONFIG_FILES</param-name>
+      <param-value>@facesconfig@</param-value>
+   </context-param>
+
+   <context-param>
+      <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+      <param-value>true</param-value>
+   </context-param>
+    
+   <context-param>
+      <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+      <param-value>false</param-value>
+      <description>This is an EXPERIMENTAL feature, so leave it off for now!</description>
+    </context-param>
+
+    <!-- TODO: Change this to false for production -->
+    <context-param>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+        <description>
+            If true, rendered HTML code will be formatted, so that it is "human readable".
+            i.e. additional line separators and whitespace will be written, that do not
+            influence the HTML code.
+            Default: "true"
+        </description>
+    </context-param>
+
+    <context-param>
+        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+        <param-value>false</param-value>
+        <description>
+            If true, a javascript function will be rendered that is able to restore the
+            former vertical scroll on every request. Convenient feature if you have pages
+            with long lists and you do not want the browser page to always jump to the top
+            if you trigger a link or button action that stays on the same page.
+            Default: "false"
+        </description>
+    </context-param>
+
+   <context-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>
+         classpath:alfresco/application-context.xml 
+         classpath:alfresco/web-client-application-context.xml
+         classpath:web-services-application-context.xml
+      </param-value>
+      <description>Spring config file locations</description>
+   </context-param>
+
+   <filter>
+      <filter-name>Authentication Filter</filter-name>
+      <filter-class>org.alfresco.web.app.servlet.AuthenticationFilter</filter-class>
+      
+      <!-- For NTLM authentication support use the following filter -->
+      <!-- (Enterprise version only)                                -->
+      <!--
+        <filter-class>org.alfresco.web.app.servlet.NTLMAuthenticationFilter</filter-class>
+      -->
+   </filter>
+
+   <filter>
+      <filter-name>Mode Detection Filter</filter-name>
+      <filter-class>org.alfresco.web.app.servlet.ModeDetectionFilter</filter-class>
+   </filter>
+
+   <filter>
+      <filter-name>WebDAV Authentication Filter</filter-name>
+      <filter-class>org.alfresco.repo.webdav.auth.AuthenticationFilter</filter-class>
+      
+      <!-- For NTLM authentication support use the following filter -->
+      <!-- (Enterprise version only)                                -->
+      <!--
+        <filter-class>org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter</filter-class>
+      -->
+   </filter>
+
+   <filter-mapping>
+      <filter-name>Authentication Filter</filter-name>
+      <url-pattern>/faces/*</url-pattern>
+   </filter-mapping>
+   
+   <!-- For NTLM authentication support enable the following mapping -->
+   <!-- (Enterprise version only)                                    -->
+   <!--
+   <filter-mapping>
+      <filter-name>Authentication Filter</filter-name>
+      <url-pattern>/navigate/*</url-pattern>
+   </filter-mapping>
+   -->
+         
+   <filter-mapping>
+      <filter-name>Mode Detection Filter</filter-name>
+      <url-pattern>/faces/*</url-pattern>
+   </filter-mapping>
+   
+   <filter-mapping>
+      <filter-name>WebDAV Authentication Filter</filter-name>
+      <url-pattern>/webdav/*</url-pattern>
+   </filter-mapping>
+   
+   <listener>
+      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+   </listener>
+   
+   <listener>
+      <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+   </listener>
+   
+   <listener>
+      <listener-class>org.alfresco.web.app.ContextListener</listener-class>
+   </listener>
+   
+   <!-- Faces Servlet -->
+   <servlet>
+      <servlet-name>Faces Servlet</servlet-name>
+      <servlet-class>org.alfresco.web.app.servlet.AlfrescoFacesServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>uploadFile</servlet-name>
+      <servlet-class>org.alfresco.web.app.servlet.UploadFileServlet</servlet-class>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>downloadContent</servlet-name>
+      <servlet-class>org.alfresco.web.app.servlet.DownloadContentServlet</servlet-class>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>externalAccess</servlet-name>
+      <servlet-class>org.alfresco.web.app.servlet.ExternalAccessServlet</servlet-class>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>templateContent</servlet-name>
+      <servlet-class>org.alfresco.web.app.servlet.TemplateContentServlet</servlet-class>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>axis</servlet-name>
+      <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
+      <load-on-startup>5</load-on-startup>
+   </servlet>
+   
+   <servlet>
+      <servlet-name>WebDAV</servlet-name>
+      <servlet-class>org.alfresco.repo.webdav.WebDAVServlet</servlet-class>
+      <load-on-startup>5</load-on-startup>
+   </servlet>
+   
+   <servlet-mapping>
+      <servlet-name>Faces Servlet</servlet-name>
+      <url-pattern>/faces/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>uploadFile</servlet-name>
+      <url-pattern>/uploadFileServlet</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>downloadContent</servlet-name>
+      <url-pattern>/download/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>externalAccess</servlet-name>
+      <url-pattern>/navigate/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>templateContent</servlet-name>
+      <url-pattern>/template/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>axis</servlet-name>
+      <url-pattern>/api/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+		<servlet-name>WebDAV</servlet-name>
+		<url-pattern>/webdav/*</url-pattern>
+   </servlet-mapping>
+   
+   <session-config>
+      <session-timeout>60</session-timeout>
+   </session-config>
+   
+   <welcome-file-list>
+      <welcome-file>index.jsp</welcome-file>
+   </welcome-file-list>
+
+</web-app>
diff --git a/source/web/css/main.css b/source/web/css/main.css
new file mode 100644
index 0000000000..7320d922a3
--- /dev/null
+++ b/source/web/css/main.css
@@ -0,0 +1,431 @@
+body 
+{
+   font-family: Tahoma, Arial, Helvetica, sans-serif;
+   background-color: white;
+}
+
+p
+{
+   font-family: Tahoma, Arial, Helvetica, sans-serif;
+}
+
+table.moduletable td
+{
+	font-family: Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight: normal;
+}
+
+td,tr,p,div
+{
+   color: #003366;
+	font-family: Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+
+th
+{
+   vertical-align: top;
+   padding-left: 1px;
+   padding-right: 1px;
+}
+
+p.status
+{
+   margin:0px;
+   padding-left:0px;
+   padding-top:4px;
+   padding-bottom:4px;
+}
+
+a:link, a:visited
+{
+	font-size: 11px;
+	color: #003366;
+	text-decoration: none;
+	font-family: Tahoma, Arial, Helvetica, sans-serif;
+	font-weight: normal;
+}
+
+a:hover
+{
+	color: #4272B4;
+	text-decoration: underline;
+	font-weight: normal;
+}
+
+a.path:link, a.path:visited
+{
+	font-size: 14px;
+	color: #003366;
+	text-decoration: none;
+	font-weight: normal;
+}
+
+a.path:hover
+{
+   font-size: 14px;
+	color: #4272B4;
+	text-decoration: underline;
+	font-weight: normal;
+}
+
+a.header:link, a.header:visited
+{
+	font-weight: bold;
+}
+
+a.header:hover
+{
+	font-weight: bold;
+}
+
+a.title:link, a.title:visited
+{
+   font-size: 12px;
+	font-weight: bold;
+}
+
+a.title:hover
+{
+   font-size: 12px;
+	font-weight: bold;
+}
+
+a.moreactions:link, a.moreactions:visited
+{
+   vertical-align: 30%;
+	font-size: 10px;
+}
+
+a.moreactions:hover
+{
+   vertical-align: 30%;
+	font-size: 10px;
+}
+
+a.small:link, a.small:visited
+{
+   font-size: 11px;
+   font-weight: normal;
+   color: #003366;
+}
+
+a.small:hover
+{
+   font-size: 11px;
+   font-weight: normal;
+   color: #4272B4;
+}
+
+.pageTitle
+{
+   color: #003366;
+   font-size: 14px;
+}
+
+.main
+{
+   color: #003366;
+   font-size: 11px;
+}
+
+.mainTitle
+{
+   color: #003366;
+   font-family: Arial, Helvetica, sans-serif;
+   font-size: 16px;
+   font-weight: bold;
+   vertical-align: middle;
+}
+
+.mainSubTitle
+{
+   color: #003366;
+   font-size: 11px;
+   font-weight: bold;
+   padding: 2px;
+}
+
+.mainSubText
+{
+   color: #003366;
+   font-size: 11px;
+   padding: 2px;
+}
+
+.summary
+{
+   color: #003366;
+   font-size: 11px;
+   padding-left: 8px;
+   padding-right: 8px;
+   margin-top: 4px;
+   border: 1px solid #dddddd;
+}
+
+a.headbarLink
+{
+   color: #003366;
+   font-size: 11px;
+   font-weight: normal;
+}
+
+.headbarTitle
+{
+   color: #003366;
+   font-size: 11px;
+   font-weight: bold;
+   margin-bottom: 5px;
+}
+
+.mainSubTextSmall
+{
+   color: #003366;
+   font-size: 10px;
+}
+
+.moreActionsMenu
+{
+   background-color: #eeeeee;
+   border-top: thin solid #FFFFFF;
+   border-left: thin solid #FFFFFF;
+   border-right: thin solid #444444;
+   border-bottom: thin solid #444444;
+}
+
+.welcomeHeader
+{
+   background-color: #eeeeee;
+   border-top: thin solid #666666;
+   border-bottom: thin solid #cccccc;
+}
+
+.headerTopActions
+{
+   background-color: #CCCCCC;
+   border-top: thin solid #FFFFFF;
+   border-bottom: thin solid #999999;
+}
+
+.headerMainActions
+{
+   background-color: #CCCCCC;
+   border-top: thin solid #FFFFFF;
+   border-bottom: thin solid #999999;
+}
+
+.headerTopDetail
+{
+   background-color: #EEEEEE;
+   border-top: thin solid #FFFFFF;
+   border-bottom: thin solid #999999;
+}
+
+.headerTopDetailNoActions
+{
+   background-color: #EEEEEE;
+   border-top: thin solid #FFFFFF;
+   border-bottom: thin solid #999999;
+}
+
+.contentsListActions
+{
+   background-color: #FFFFFF;
+   font-size: 11px;
+}
+
+.infoText
+{
+   background-color: #FFFFCC;
+   color: #1B3557;
+}
+
+.statusInfoText
+{
+   font-size: 11px;
+}
+
+.statusWarningText
+{
+   font-size: 11px;
+   color: #4272B4;
+}
+
+.statusErrorText
+{
+   font-size: 11px;
+   color: #e00028;
+}
+
+.recordSet
+{
+   padding: 2px;
+   border-spacing: 1px;
+}
+
+.recordSetRow
+{
+   background-color: #FFFFFF;
+}
+
+.recordSetRowAlt
+{
+   background-color: #DEE5EC;
+}
+
+.recordSetHeader
+{
+   background-color: #C6D8EB;
+   color: #1B3557;
+   font-weight: bold;
+}
+
+.errorMessage
+{
+   font-size: 11px;
+   color: #e00028;
+   padding: 4px;
+}
+
+.statusMessage
+{
+   font-size: 11px;
+   color: #4272B4;
+   padding-top: 6px;
+   display: block;
+}
+
+input,textarea,select
+{
+   font-family: Tahoma, Arial, Helvetica, sans-serif;
+   font-size: 11px;
+}
+
+.dialogControls
+{
+   font-size: 11px;
+}
+
+.dialogButtonSpacing
+{
+	height: 5px;
+}
+
+.topToolbar
+{
+   background-color:#465F7D;
+}
+
+.topToolbarTitle
+{
+   background-color:#5D747F;
+   color: #ffffff;
+   font-weight: bold;
+   padding-left: 5px;
+}
+
+a.topToolbarLink, a.topToolbarLink:link, a.topToolbarLink:visited
+{
+   color: white;
+   font-weight: bold;
+}
+
+.topToolbarHighlight
+{
+   background-color:#FFFFFF;
+   border:solid #5D6B71;
+   border-width:1px;
+}
+
+a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighlight:visited
+{
+   color:#5D747F;
+   font-weight: bold;
+}
+
+.statusListHighlight
+{
+   background-color:#FFFFFF;
+   border:solid #71828A;
+   border-width:1px;
+}
+
+.statusListDisabled
+{
+   color: #93a8b2;
+}
+
+.inlineAction
+{
+   padding-right:3px;
+}
+
+.paddingRow
+{
+   padding-top: 3px;
+}
+
+.wizardSectionHeading
+{
+   padding: 2px;
+   background-color: #cddbe8;
+   font-weight: bold;
+}
+
+.wizardButton
+{
+   font-size: 11px;
+}
+
+.wizardButtonSpacing
+{
+	height: 5px;
+}
+
+.propertiesLabel
+{
+   padding-right: 20px;
+   color: #93a8b2;
+}
+
+.selector
+{
+   border: 1px dashed #cccccc;
+   padding: 4px;
+}
+
+.selectedItems
+{
+   border: 1px solid #DEE5EC;
+}
+
+.selectedItemsHeader
+{
+   padding: 4px;
+   background-color: #c6d8eb;
+   font-weight: bold;
+   text-align: left;
+}
+
+.selectedItemsRow
+{
+   padding: 4px;
+}
+
+.selectedItemsRowAlt
+{
+   padding: 4px;
+   background-color: #e9f0f4;
+}
+
+.pager
+{
+   padding: 3px;
+   border: 1px dashed #cccccc;
+}
+
+.pager img
+{
+   vertical-align: -20%;
+}
diff --git a/source/web/images/filetypes/_default.gif b/source/web/images/filetypes/_default.gif
new file mode 100644
index 0000000000..ac51964908
Binary files /dev/null and b/source/web/images/filetypes/_default.gif differ
diff --git a/source/web/images/filetypes/acp.gif b/source/web/images/filetypes/acp.gif
new file mode 100644
index 0000000000..41d8af8b2d
Binary files /dev/null and b/source/web/images/filetypes/acp.gif differ
diff --git a/source/web/images/filetypes/asf.gif b/source/web/images/filetypes/asf.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/asf.gif differ
diff --git a/source/web/images/filetypes/avi.gif b/source/web/images/filetypes/avi.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/avi.gif differ
diff --git a/source/web/images/filetypes/bmp.gif b/source/web/images/filetypes/bmp.gif
new file mode 100644
index 0000000000..43981c01e0
Binary files /dev/null and b/source/web/images/filetypes/bmp.gif differ
diff --git a/source/web/images/filetypes/csv.gif b/source/web/images/filetypes/csv.gif
new file mode 100644
index 0000000000..d15f9d330e
Binary files /dev/null and b/source/web/images/filetypes/csv.gif differ
diff --git a/source/web/images/filetypes/doc.gif b/source/web/images/filetypes/doc.gif
new file mode 100644
index 0000000000..6b26a26c60
Binary files /dev/null and b/source/web/images/filetypes/doc.gif differ
diff --git a/source/web/images/filetypes/exe.gif b/source/web/images/filetypes/exe.gif
new file mode 100644
index 0000000000..14e4a417a0
Binary files /dev/null and b/source/web/images/filetypes/exe.gif differ
diff --git a/source/web/images/filetypes/ftl.gif b/source/web/images/filetypes/ftl.gif
new file mode 100644
index 0000000000..42b7262341
Binary files /dev/null and b/source/web/images/filetypes/ftl.gif differ
diff --git a/source/web/images/filetypes/gif.gif b/source/web/images/filetypes/gif.gif
new file mode 100644
index 0000000000..fc060dbe4c
Binary files /dev/null and b/source/web/images/filetypes/gif.gif differ
diff --git a/source/web/images/filetypes/htm.gif b/source/web/images/filetypes/htm.gif
new file mode 100644
index 0000000000..43e8dc54a1
Binary files /dev/null and b/source/web/images/filetypes/htm.gif differ
diff --git a/source/web/images/filetypes/html.gif b/source/web/images/filetypes/html.gif
new file mode 100644
index 0000000000..43e8dc54a1
Binary files /dev/null and b/source/web/images/filetypes/html.gif differ
diff --git a/source/web/images/filetypes/jpg.gif b/source/web/images/filetypes/jpg.gif
new file mode 100644
index 0000000000..0330bcb339
Binary files /dev/null and b/source/web/images/filetypes/jpg.gif differ
diff --git a/source/web/images/filetypes/mp2.gif b/source/web/images/filetypes/mp2.gif
new file mode 100644
index 0000000000..1b34108240
Binary files /dev/null and b/source/web/images/filetypes/mp2.gif differ
diff --git a/source/web/images/filetypes/mp3.gif b/source/web/images/filetypes/mp3.gif
new file mode 100644
index 0000000000..1b34108240
Binary files /dev/null and b/source/web/images/filetypes/mp3.gif differ
diff --git a/source/web/images/filetypes/mp4.gif b/source/web/images/filetypes/mp4.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/mp4.gif differ
diff --git a/source/web/images/filetypes/mpeg.gif b/source/web/images/filetypes/mpeg.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/mpeg.gif differ
diff --git a/source/web/images/filetypes/mpg.gif b/source/web/images/filetypes/mpg.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/mpg.gif differ
diff --git a/source/web/images/filetypes/odt.gif b/source/web/images/filetypes/odt.gif
new file mode 100644
index 0000000000..0371d01493
Binary files /dev/null and b/source/web/images/filetypes/odt.gif differ
diff --git a/source/web/images/filetypes/pdf.gif b/source/web/images/filetypes/pdf.gif
new file mode 100644
index 0000000000..8834ab0143
Binary files /dev/null and b/source/web/images/filetypes/pdf.gif differ
diff --git a/source/web/images/filetypes/png.gif b/source/web/images/filetypes/png.gif
new file mode 100644
index 0000000000..0330bcb339
Binary files /dev/null and b/source/web/images/filetypes/png.gif differ
diff --git a/source/web/images/filetypes/ppt.gif b/source/web/images/filetypes/ppt.gif
new file mode 100644
index 0000000000..59b0b472bd
Binary files /dev/null and b/source/web/images/filetypes/ppt.gif differ
diff --git a/source/web/images/filetypes/rtf.gif b/source/web/images/filetypes/rtf.gif
new file mode 100644
index 0000000000..6b26a26c60
Binary files /dev/null and b/source/web/images/filetypes/rtf.gif differ
diff --git a/source/web/images/filetypes/shtml.gif b/source/web/images/filetypes/shtml.gif
new file mode 100644
index 0000000000..43e8dc54a1
Binary files /dev/null and b/source/web/images/filetypes/shtml.gif differ
diff --git a/source/web/images/filetypes/swf.gif b/source/web/images/filetypes/swf.gif
new file mode 100644
index 0000000000..bbb4ec787a
Binary files /dev/null and b/source/web/images/filetypes/swf.gif differ
diff --git a/source/web/images/filetypes/txt.gif b/source/web/images/filetypes/txt.gif
new file mode 100644
index 0000000000..3353e2e4f4
Binary files /dev/null and b/source/web/images/filetypes/txt.gif differ
diff --git a/source/web/images/filetypes/wmv.gif b/source/web/images/filetypes/wmv.gif
new file mode 100644
index 0000000000..cd17a87a64
Binary files /dev/null and b/source/web/images/filetypes/wmv.gif differ
diff --git a/source/web/images/filetypes/xls.gif b/source/web/images/filetypes/xls.gif
new file mode 100644
index 0000000000..d15f9d330e
Binary files /dev/null and b/source/web/images/filetypes/xls.gif differ
diff --git a/source/web/images/filetypes/xml.gif b/source/web/images/filetypes/xml.gif
new file mode 100644
index 0000000000..83e971c6ee
Binary files /dev/null and b/source/web/images/filetypes/xml.gif differ
diff --git a/source/web/images/filetypes/zip.gif b/source/web/images/filetypes/zip.gif
new file mode 100644
index 0000000000..ae60670a3e
Binary files /dev/null and b/source/web/images/filetypes/zip.gif differ
diff --git a/source/web/images/filetypes32/_default.gif b/source/web/images/filetypes32/_default.gif
new file mode 100644
index 0000000000..a23183507b
Binary files /dev/null and b/source/web/images/filetypes32/_default.gif differ
diff --git a/source/web/images/filetypes32/acp.gif b/source/web/images/filetypes32/acp.gif
new file mode 100644
index 0000000000..440dcc20b3
Binary files /dev/null and b/source/web/images/filetypes32/acp.gif differ
diff --git a/source/web/images/filetypes32/asf.gif b/source/web/images/filetypes32/asf.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/asf.gif differ
diff --git a/source/web/images/filetypes32/avi.gif b/source/web/images/filetypes32/avi.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/avi.gif differ
diff --git a/source/web/images/filetypes32/bmp.gif b/source/web/images/filetypes32/bmp.gif
new file mode 100644
index 0000000000..4ddd2402f3
Binary files /dev/null and b/source/web/images/filetypes32/bmp.gif differ
diff --git a/source/web/images/filetypes32/csv.gif b/source/web/images/filetypes32/csv.gif
new file mode 100644
index 0000000000..10eaf3404c
Binary files /dev/null and b/source/web/images/filetypes32/csv.gif differ
diff --git a/source/web/images/filetypes32/doc.gif b/source/web/images/filetypes32/doc.gif
new file mode 100644
index 0000000000..eb38a1d3e3
Binary files /dev/null and b/source/web/images/filetypes32/doc.gif differ
diff --git a/source/web/images/filetypes32/exe.gif b/source/web/images/filetypes32/exe.gif
new file mode 100644
index 0000000000..37687981e4
Binary files /dev/null and b/source/web/images/filetypes32/exe.gif differ
diff --git a/source/web/images/filetypes32/ftl.gif b/source/web/images/filetypes32/ftl.gif
new file mode 100644
index 0000000000..def3c84410
Binary files /dev/null and b/source/web/images/filetypes32/ftl.gif differ
diff --git a/source/web/images/filetypes32/gif.gif b/source/web/images/filetypes32/gif.gif
new file mode 100644
index 0000000000..dbeae05ed8
Binary files /dev/null and b/source/web/images/filetypes32/gif.gif differ
diff --git a/source/web/images/filetypes32/htm.gif b/source/web/images/filetypes32/htm.gif
new file mode 100644
index 0000000000..37c1e4ab79
Binary files /dev/null and b/source/web/images/filetypes32/htm.gif differ
diff --git a/source/web/images/filetypes32/html.gif b/source/web/images/filetypes32/html.gif
new file mode 100644
index 0000000000..37c1e4ab79
Binary files /dev/null and b/source/web/images/filetypes32/html.gif differ
diff --git a/source/web/images/filetypes32/jpg.gif b/source/web/images/filetypes32/jpg.gif
new file mode 100644
index 0000000000..6de22869e4
Binary files /dev/null and b/source/web/images/filetypes32/jpg.gif differ
diff --git a/source/web/images/filetypes32/mp2.gif b/source/web/images/filetypes32/mp2.gif
new file mode 100644
index 0000000000..3a76f78d2f
Binary files /dev/null and b/source/web/images/filetypes32/mp2.gif differ
diff --git a/source/web/images/filetypes32/mp3.gif b/source/web/images/filetypes32/mp3.gif
new file mode 100644
index 0000000000..ab2ecaa92f
Binary files /dev/null and b/source/web/images/filetypes32/mp3.gif differ
diff --git a/source/web/images/filetypes32/mp4.gif b/source/web/images/filetypes32/mp4.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/mp4.gif differ
diff --git a/source/web/images/filetypes32/mpeg.gif b/source/web/images/filetypes32/mpeg.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/mpeg.gif differ
diff --git a/source/web/images/filetypes32/mpg.gif b/source/web/images/filetypes32/mpg.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/mpg.gif differ
diff --git a/source/web/images/filetypes32/odt.gif b/source/web/images/filetypes32/odt.gif
new file mode 100644
index 0000000000..34e0bea33d
Binary files /dev/null and b/source/web/images/filetypes32/odt.gif differ
diff --git a/source/web/images/filetypes32/pdf.gif b/source/web/images/filetypes32/pdf.gif
new file mode 100644
index 0000000000..593335f489
Binary files /dev/null and b/source/web/images/filetypes32/pdf.gif differ
diff --git a/source/web/images/filetypes32/png.gif b/source/web/images/filetypes32/png.gif
new file mode 100644
index 0000000000..6de22869e4
Binary files /dev/null and b/source/web/images/filetypes32/png.gif differ
diff --git a/source/web/images/filetypes32/ppt.gif b/source/web/images/filetypes32/ppt.gif
new file mode 100644
index 0000000000..b7197bcc0b
Binary files /dev/null and b/source/web/images/filetypes32/ppt.gif differ
diff --git a/source/web/images/filetypes32/rtf.gif b/source/web/images/filetypes32/rtf.gif
new file mode 100644
index 0000000000..eb38a1d3e3
Binary files /dev/null and b/source/web/images/filetypes32/rtf.gif differ
diff --git a/source/web/images/filetypes32/shtml.gif b/source/web/images/filetypes32/shtml.gif
new file mode 100644
index 0000000000..37c1e4ab79
Binary files /dev/null and b/source/web/images/filetypes32/shtml.gif differ
diff --git a/source/web/images/filetypes32/swf.gif b/source/web/images/filetypes32/swf.gif
new file mode 100644
index 0000000000..c5e8d5f2ac
Binary files /dev/null and b/source/web/images/filetypes32/swf.gif differ
diff --git a/source/web/images/filetypes32/txt.gif b/source/web/images/filetypes32/txt.gif
new file mode 100644
index 0000000000..31b1a96749
Binary files /dev/null and b/source/web/images/filetypes32/txt.gif differ
diff --git a/source/web/images/filetypes32/wmv.gif b/source/web/images/filetypes32/wmv.gif
new file mode 100644
index 0000000000..5257ef5d45
Binary files /dev/null and b/source/web/images/filetypes32/wmv.gif differ
diff --git a/source/web/images/filetypes32/xls.gif b/source/web/images/filetypes32/xls.gif
new file mode 100644
index 0000000000..10eaf3404c
Binary files /dev/null and b/source/web/images/filetypes32/xls.gif differ
diff --git a/source/web/images/filetypes32/xml.gif b/source/web/images/filetypes32/xml.gif
new file mode 100644
index 0000000000..474c4b8bba
Binary files /dev/null and b/source/web/images/filetypes32/xml.gif differ
diff --git a/source/web/images/filetypes32/zip.gif b/source/web/images/filetypes32/zip.gif
new file mode 100644
index 0000000000..65223e1b84
Binary files /dev/null and b/source/web/images/filetypes32/zip.gif differ
diff --git a/source/web/images/icons/BlueArrow.gif b/source/web/images/icons/BlueArrow.gif
new file mode 100644
index 0000000000..baea0330cc
Binary files /dev/null and b/source/web/images/icons/BlueArrow.gif differ
diff --git a/source/web/images/icons/Change_details.gif b/source/web/images/icons/Change_details.gif
new file mode 100644
index 0000000000..374f787193
Binary files /dev/null and b/source/web/images/icons/Change_details.gif differ
diff --git a/source/web/images/icons/CheckIn_icon.gif b/source/web/images/icons/CheckIn_icon.gif
new file mode 100644
index 0000000000..d21fc50826
Binary files /dev/null and b/source/web/images/icons/CheckIn_icon.gif differ
diff --git a/source/web/images/icons/CheckOut_icon.gif b/source/web/images/icons/CheckOut_icon.gif
new file mode 100644
index 0000000000..0122b92048
Binary files /dev/null and b/source/web/images/icons/CheckOut_icon.gif differ
diff --git a/source/web/images/icons/Details.gif b/source/web/images/icons/Details.gif
new file mode 100644
index 0000000000..2d5b2a022c
Binary files /dev/null and b/source/web/images/icons/Details.gif differ
diff --git a/source/web/images/icons/FileActions_small.gif b/source/web/images/icons/FileActions_small.gif
new file mode 100644
index 0000000000..59b11ac866
Binary files /dev/null and b/source/web/images/icons/FileActions_small.gif differ
diff --git a/source/web/images/icons/FirstPage.gif b/source/web/images/icons/FirstPage.gif
new file mode 100644
index 0000000000..e3b74d83bc
Binary files /dev/null and b/source/web/images/icons/FirstPage.gif differ
diff --git a/source/web/images/icons/FirstPage_unavailable.gif b/source/web/images/icons/FirstPage_unavailable.gif
new file mode 100644
index 0000000000..cf91b77df1
Binary files /dev/null and b/source/web/images/icons/FirstPage_unavailable.gif differ
diff --git a/source/web/images/icons/Help.gif b/source/web/images/icons/Help.gif
new file mode 100644
index 0000000000..477f0bec12
Binary files /dev/null and b/source/web/images/icons/Help.gif differ
diff --git a/source/web/images/icons/Help_icon.gif b/source/web/images/icons/Help_icon.gif
new file mode 100644
index 0000000000..d40834ee57
Binary files /dev/null and b/source/web/images/icons/Help_icon.gif differ
diff --git a/source/web/images/icons/LastPage.gif b/source/web/images/icons/LastPage.gif
new file mode 100644
index 0000000000..b30349d494
Binary files /dev/null and b/source/web/images/icons/LastPage.gif differ
diff --git a/source/web/images/icons/LastPage_unavailable.gif b/source/web/images/icons/LastPage_unavailable.gif
new file mode 100644
index 0000000000..5ef9633860
Binary files /dev/null and b/source/web/images/icons/LastPage_unavailable.gif differ
diff --git a/source/web/images/icons/LinkMaster_small.gif b/source/web/images/icons/LinkMaster_small.gif
new file mode 100644
index 0000000000..5f92a961dc
Binary files /dev/null and b/source/web/images/icons/LinkMaster_small.gif differ
diff --git a/source/web/images/icons/LinkRelated_small.gif b/source/web/images/icons/LinkRelated_small.gif
new file mode 100644
index 0000000000..3afe01daf9
Binary files /dev/null and b/source/web/images/icons/LinkRelated_small.gif differ
diff --git a/source/web/images/icons/NextItem.gif b/source/web/images/icons/NextItem.gif
new file mode 100644
index 0000000000..9a9464de7f
Binary files /dev/null and b/source/web/images/icons/NextItem.gif differ
diff --git a/source/web/images/icons/NextPage.gif b/source/web/images/icons/NextPage.gif
new file mode 100644
index 0000000000..784fbe91c4
Binary files /dev/null and b/source/web/images/icons/NextPage.gif differ
diff --git a/source/web/images/icons/NextPage_unavailable.gif b/source/web/images/icons/NextPage_unavailable.gif
new file mode 100644
index 0000000000..12c6a5c154
Binary files /dev/null and b/source/web/images/icons/NextPage_unavailable.gif differ
diff --git a/source/web/images/icons/PreviousItem.gif b/source/web/images/icons/PreviousItem.gif
new file mode 100644
index 0000000000..04b692e6c0
Binary files /dev/null and b/source/web/images/icons/PreviousItem.gif differ
diff --git a/source/web/images/icons/PreviousPage.gif b/source/web/images/icons/PreviousPage.gif
new file mode 100644
index 0000000000..96ff132f0a
Binary files /dev/null and b/source/web/images/icons/PreviousPage.gif differ
diff --git a/source/web/images/icons/PreviousPage_unavailable.gif b/source/web/images/icons/PreviousPage_unavailable.gif
new file mode 100644
index 0000000000..05f9588d96
Binary files /dev/null and b/source/web/images/icons/PreviousPage_unavailable.gif differ
diff --git a/source/web/images/icons/PublishFile_Icon.gif b/source/web/images/icons/PublishFile_Icon.gif
new file mode 100644
index 0000000000..d4f73870e6
Binary files /dev/null and b/source/web/images/icons/PublishFile_Icon.gif differ
diff --git a/source/web/images/icons/VersionHistory_small.gif b/source/web/images/icons/VersionHistory_small.gif
new file mode 100644
index 0000000000..8993cea86c
Binary files /dev/null and b/source/web/images/icons/VersionHistory_small.gif differ
diff --git a/source/web/images/icons/View_details.gif b/source/web/images/icons/View_details.gif
new file mode 100644
index 0000000000..bca4d76267
Binary files /dev/null and b/source/web/images/icons/View_details.gif differ
diff --git a/source/web/images/icons/action.gif b/source/web/images/icons/action.gif
new file mode 100644
index 0000000000..a4653cdca1
Binary files /dev/null and b/source/web/images/icons/action.gif differ
diff --git a/source/web/images/icons/add.gif b/source/web/images/icons/add.gif
new file mode 100644
index 0000000000..b58c9ad07d
Binary files /dev/null and b/source/web/images/icons/add.gif differ
diff --git a/source/web/images/icons/add_attachment.gif b/source/web/images/icons/add_attachment.gif
new file mode 100644
index 0000000000..e7d0da9053
Binary files /dev/null and b/source/web/images/icons/add_attachment.gif differ
diff --git a/source/web/images/icons/add_category.gif b/source/web/images/icons/add_category.gif
new file mode 100644
index 0000000000..82d406cf31
Binary files /dev/null and b/source/web/images/icons/add_category.gif differ
diff --git a/source/web/images/icons/add_content_large.gif b/source/web/images/icons/add_content_large.gif
new file mode 100644
index 0000000000..efd729dc46
Binary files /dev/null and b/source/web/images/icons/add_content_large.gif differ
diff --git a/source/web/images/icons/add_group.gif b/source/web/images/icons/add_group.gif
new file mode 100644
index 0000000000..2183b0b7a8
Binary files /dev/null and b/source/web/images/icons/add_group.gif differ
diff --git a/source/web/images/icons/add_group_large.gif b/source/web/images/icons/add_group_large.gif
new file mode 100644
index 0000000000..a523770945
Binary files /dev/null and b/source/web/images/icons/add_group_large.gif differ
diff --git a/source/web/images/icons/add_user.gif b/source/web/images/icons/add_user.gif
new file mode 100644
index 0000000000..1dbbaa6276
Binary files /dev/null and b/source/web/images/icons/add_user.gif differ
diff --git a/source/web/images/icons/add_user_large.gif b/source/web/images/icons/add_user_large.gif
new file mode 100644
index 0000000000..350846fa11
Binary files /dev/null and b/source/web/images/icons/add_user_large.gif differ
diff --git a/source/web/images/icons/admin_console.gif b/source/web/images/icons/admin_console.gif
new file mode 100644
index 0000000000..9f38aa4d8c
Binary files /dev/null and b/source/web/images/icons/admin_console.gif differ
diff --git a/source/web/images/icons/admin_console_large.gif b/source/web/images/icons/admin_console_large.gif
new file mode 100644
index 0000000000..5ba075d42e
Binary files /dev/null and b/source/web/images/icons/admin_console_large.gif differ
diff --git a/source/web/images/icons/approve.gif b/source/web/images/icons/approve.gif
new file mode 100644
index 0000000000..862efc17fc
Binary files /dev/null and b/source/web/images/icons/approve.gif differ
diff --git a/source/web/images/icons/attachment.gif b/source/web/images/icons/attachment.gif
new file mode 100644
index 0000000000..a82a4ba922
Binary files /dev/null and b/source/web/images/icons/attachment.gif differ
diff --git a/source/web/images/icons/cancel_checkout_large.gif b/source/web/images/icons/cancel_checkout_large.gif
new file mode 100644
index 0000000000..bec0134e1b
Binary files /dev/null and b/source/web/images/icons/cancel_checkout_large.gif differ
diff --git a/source/web/images/icons/categories.gif b/source/web/images/icons/categories.gif
new file mode 100644
index 0000000000..7a81fc603a
Binary files /dev/null and b/source/web/images/icons/categories.gif differ
diff --git a/source/web/images/icons/category.gif b/source/web/images/icons/category.gif
new file mode 100644
index 0000000000..0c795dd3e0
Binary files /dev/null and b/source/web/images/icons/category.gif differ
diff --git a/source/web/images/icons/category_small.gif b/source/web/images/icons/category_small.gif
new file mode 100644
index 0000000000..7a81fc603a
Binary files /dev/null and b/source/web/images/icons/category_small.gif differ
diff --git a/source/web/images/icons/change_password.gif b/source/web/images/icons/change_password.gif
new file mode 100644
index 0000000000..85714847b7
Binary files /dev/null and b/source/web/images/icons/change_password.gif differ
diff --git a/source/web/images/icons/change_rule.gif b/source/web/images/icons/change_rule.gif
new file mode 100644
index 0000000000..b34beb08f6
Binary files /dev/null and b/source/web/images/icons/change_rule.gif differ
diff --git a/source/web/images/icons/check_in_large.gif b/source/web/images/icons/check_in_large.gif
new file mode 100644
index 0000000000..1f8229f993
Binary files /dev/null and b/source/web/images/icons/check_in_large.gif differ
diff --git a/source/web/images/icons/check_out_large.gif b/source/web/images/icons/check_out_large.gif
new file mode 100644
index 0000000000..ed530285f7
Binary files /dev/null and b/source/web/images/icons/check_out_large.gif differ
diff --git a/source/web/images/icons/collapsed.gif b/source/web/images/icons/collapsed.gif
new file mode 100644
index 0000000000..8a1c103965
Binary files /dev/null and b/source/web/images/icons/collapsed.gif differ
diff --git a/source/web/images/icons/copy.gif b/source/web/images/icons/copy.gif
new file mode 100644
index 0000000000..7fb9847055
Binary files /dev/null and b/source/web/images/icons/copy.gif differ
diff --git a/source/web/images/icons/create_category_large.gif b/source/web/images/icons/create_category_large.gif
new file mode 100644
index 0000000000..ae65a64fe6
Binary files /dev/null and b/source/web/images/icons/create_category_large.gif differ
diff --git a/source/web/images/icons/create_forum.gif b/source/web/images/icons/create_forum.gif
new file mode 100644
index 0000000000..fb8e08588b
Binary files /dev/null and b/source/web/images/icons/create_forum.gif differ
diff --git a/source/web/images/icons/create_forum_large.gif b/source/web/images/icons/create_forum_large.gif
new file mode 100644
index 0000000000..95334651dd
Binary files /dev/null and b/source/web/images/icons/create_forum_large.gif differ
diff --git a/source/web/images/icons/create_forums.gif b/source/web/images/icons/create_forums.gif
new file mode 100644
index 0000000000..f2e52f9d45
Binary files /dev/null and b/source/web/images/icons/create_forums.gif differ
diff --git a/source/web/images/icons/create_group.gif b/source/web/images/icons/create_group.gif
new file mode 100644
index 0000000000..eeab223884
Binary files /dev/null and b/source/web/images/icons/create_group.gif differ
diff --git a/source/web/images/icons/create_group_large.gif b/source/web/images/icons/create_group_large.gif
new file mode 100644
index 0000000000..67b6810a0d
Binary files /dev/null and b/source/web/images/icons/create_group_large.gif differ
diff --git a/source/web/images/icons/create_post.gif b/source/web/images/icons/create_post.gif
new file mode 100644
index 0000000000..e38a2b413e
Binary files /dev/null and b/source/web/images/icons/create_post.gif differ
diff --git a/source/web/images/icons/create_space.gif b/source/web/images/icons/create_space.gif
new file mode 100644
index 0000000000..acb4beac34
Binary files /dev/null and b/source/web/images/icons/create_space.gif differ
diff --git a/source/web/images/icons/create_space_large.gif b/source/web/images/icons/create_space_large.gif
new file mode 100644
index 0000000000..60dfc1d99a
Binary files /dev/null and b/source/web/images/icons/create_space_large.gif differ
diff --git a/source/web/images/icons/create_topic.gif b/source/web/images/icons/create_topic.gif
new file mode 100644
index 0000000000..ec62095a67
Binary files /dev/null and b/source/web/images/icons/create_topic.gif differ
diff --git a/source/web/images/icons/create_topic_large.gif b/source/web/images/icons/create_topic_large.gif
new file mode 100644
index 0000000000..652754cbac
Binary files /dev/null and b/source/web/images/icons/create_topic_large.gif differ
diff --git a/source/web/images/icons/create_user.gif b/source/web/images/icons/create_user.gif
new file mode 100644
index 0000000000..c82f15dacb
Binary files /dev/null and b/source/web/images/icons/create_user.gif differ
diff --git a/source/web/images/icons/cut.gif b/source/web/images/icons/cut.gif
new file mode 100644
index 0000000000..c2599bc7ac
Binary files /dev/null and b/source/web/images/icons/cut.gif differ
diff --git a/source/web/images/icons/delete.gif b/source/web/images/icons/delete.gif
new file mode 100644
index 0000000000..4ee6ccfce4
Binary files /dev/null and b/source/web/images/icons/delete.gif differ
diff --git a/source/web/images/icons/delete_category.gif b/source/web/images/icons/delete_category.gif
new file mode 100644
index 0000000000..d8545a0194
Binary files /dev/null and b/source/web/images/icons/delete_category.gif differ
diff --git a/source/web/images/icons/delete_category_large.gif b/source/web/images/icons/delete_category_large.gif
new file mode 100644
index 0000000000..47a018ca77
Binary files /dev/null and b/source/web/images/icons/delete_category_large.gif differ
diff --git a/source/web/images/icons/delete_group.gif b/source/web/images/icons/delete_group.gif
new file mode 100644
index 0000000000..89444c13b6
Binary files /dev/null and b/source/web/images/icons/delete_group.gif differ
diff --git a/source/web/images/icons/delete_group_large.gif b/source/web/images/icons/delete_group_large.gif
new file mode 100644
index 0000000000..3c39420661
Binary files /dev/null and b/source/web/images/icons/delete_group_large.gif differ
diff --git a/source/web/images/icons/delete_large.gif b/source/web/images/icons/delete_large.gif
new file mode 100644
index 0000000000..cfe75d348b
Binary files /dev/null and b/source/web/images/icons/delete_large.gif differ
diff --git a/source/web/images/icons/delete_person.gif b/source/web/images/icons/delete_person.gif
new file mode 100644
index 0000000000..0749706afc
Binary files /dev/null and b/source/web/images/icons/delete_person.gif differ
diff --git a/source/web/images/icons/details_large.gif b/source/web/images/icons/details_large.gif
new file mode 100644
index 0000000000..e8a16d91d1
Binary files /dev/null and b/source/web/images/icons/details_large.gif differ
diff --git a/source/web/images/icons/edit_category.gif b/source/web/images/icons/edit_category.gif
new file mode 100644
index 0000000000..4f1c647c27
Binary files /dev/null and b/source/web/images/icons/edit_category.gif differ
diff --git a/source/web/images/icons/edit_category_large.gif b/source/web/images/icons/edit_category_large.gif
new file mode 100644
index 0000000000..88c122702d
Binary files /dev/null and b/source/web/images/icons/edit_category_large.gif differ
diff --git a/source/web/images/icons/edit_group.gif b/source/web/images/icons/edit_group.gif
new file mode 100644
index 0000000000..45704b50bd
Binary files /dev/null and b/source/web/images/icons/edit_group.gif differ
diff --git a/source/web/images/icons/edit_group_large.gif b/source/web/images/icons/edit_group_large.gif
new file mode 100644
index 0000000000..7c4bfea41b
Binary files /dev/null and b/source/web/images/icons/edit_group_large.gif differ
diff --git a/source/web/images/icons/edit_icon.gif b/source/web/images/icons/edit_icon.gif
new file mode 100644
index 0000000000..7dfebb7d8e
Binary files /dev/null and b/source/web/images/icons/edit_icon.gif differ
diff --git a/source/web/images/icons/edit_large.gif b/source/web/images/icons/edit_large.gif
new file mode 100644
index 0000000000..7d4df20a69
Binary files /dev/null and b/source/web/images/icons/edit_large.gif differ
diff --git a/source/web/images/icons/edit_rule_large.gif b/source/web/images/icons/edit_rule_large.gif
new file mode 100644
index 0000000000..8f51155f19
Binary files /dev/null and b/source/web/images/icons/edit_rule_large.gif differ
diff --git a/source/web/images/icons/edituser.gif b/source/web/images/icons/edituser.gif
new file mode 100644
index 0000000000..45704b50bd
Binary files /dev/null and b/source/web/images/icons/edituser.gif differ
diff --git a/source/web/images/icons/edituser_large.gif b/source/web/images/icons/edituser_large.gif
new file mode 100644
index 0000000000..7c4bfea41b
Binary files /dev/null and b/source/web/images/icons/edituser_large.gif differ
diff --git a/source/web/images/icons/expanded.gif b/source/web/images/icons/expanded.gif
new file mode 100644
index 0000000000..6ba2446727
Binary files /dev/null and b/source/web/images/icons/expanded.gif differ
diff --git a/source/web/images/icons/export.gif b/source/web/images/icons/export.gif
new file mode 100644
index 0000000000..5e65544fc2
Binary files /dev/null and b/source/web/images/icons/export.gif differ
diff --git a/source/web/images/icons/export_large.gif b/source/web/images/icons/export_large.gif
new file mode 100644
index 0000000000..2c0d18644b
Binary files /dev/null and b/source/web/images/icons/export_large.gif differ
diff --git a/source/web/images/icons/file_large.gif b/source/web/images/icons/file_large.gif
new file mode 100644
index 0000000000..c75660597b
Binary files /dev/null and b/source/web/images/icons/file_large.gif differ
diff --git a/source/web/images/icons/folder.gif b/source/web/images/icons/folder.gif
new file mode 100644
index 0000000000..25f3f06670
Binary files /dev/null and b/source/web/images/icons/folder.gif differ
diff --git a/source/web/images/icons/folder_large.png b/source/web/images/icons/folder_large.png
new file mode 100644
index 0000000000..b5bcaf67e2
Binary files /dev/null and b/source/web/images/icons/folder_large.png differ
diff --git a/source/web/images/icons/forum.gif b/source/web/images/icons/forum.gif
new file mode 100644
index 0000000000..c7a167b47d
Binary files /dev/null and b/source/web/images/icons/forum.gif differ
diff --git a/source/web/images/icons/forum_large.gif b/source/web/images/icons/forum_large.gif
new file mode 100644
index 0000000000..d025642a8c
Binary files /dev/null and b/source/web/images/icons/forum_large.gif differ
diff --git a/source/web/images/icons/forums.gif b/source/web/images/icons/forums.gif
new file mode 100644
index 0000000000..9038f31650
Binary files /dev/null and b/source/web/images/icons/forums.gif differ
diff --git a/source/web/images/icons/forums_large.gif b/source/web/images/icons/forums_large.gif
new file mode 100644
index 0000000000..900dfd7dff
Binary files /dev/null and b/source/web/images/icons/forums_large.gif differ
diff --git a/source/web/images/icons/group.gif b/source/web/images/icons/group.gif
new file mode 100644
index 0000000000..b9de4325b3
Binary files /dev/null and b/source/web/images/icons/group.gif differ
diff --git a/source/web/images/icons/group_large.gif b/source/web/images/icons/group_large.gif
new file mode 100644
index 0000000000..1cbbd1d726
Binary files /dev/null and b/source/web/images/icons/group_large.gif differ
diff --git a/source/web/images/icons/import.gif b/source/web/images/icons/import.gif
new file mode 100644
index 0000000000..79d0c44add
Binary files /dev/null and b/source/web/images/icons/import.gif differ
diff --git a/source/web/images/icons/import_large.gif b/source/web/images/icons/import_large.gif
new file mode 100644
index 0000000000..fbea39bdc4
Binary files /dev/null and b/source/web/images/icons/import_large.gif differ
diff --git a/source/web/images/icons/info_icon.gif b/source/web/images/icons/info_icon.gif
new file mode 100644
index 0000000000..7697b05332
Binary files /dev/null and b/source/web/images/icons/info_icon.gif differ
diff --git a/source/web/images/icons/invite.gif b/source/web/images/icons/invite.gif
new file mode 100644
index 0000000000..c82f15dacb
Binary files /dev/null and b/source/web/images/icons/invite.gif differ
diff --git a/source/web/images/icons/large_newFile.gif b/source/web/images/icons/large_newFile.gif
new file mode 100644
index 0000000000..93106a1a61
Binary files /dev/null and b/source/web/images/icons/large_newFile.gif differ
diff --git a/source/web/images/icons/link_small.gif b/source/web/images/icons/link_small.gif
new file mode 100644
index 0000000000..71efa49506
Binary files /dev/null and b/source/web/images/icons/link_small.gif differ
diff --git a/source/web/images/icons/locked.gif b/source/web/images/icons/locked.gif
new file mode 100644
index 0000000000..fc6f3a4921
Binary files /dev/null and b/source/web/images/icons/locked.gif differ
diff --git a/source/web/images/icons/locked_owner.gif b/source/web/images/icons/locked_owner.gif
new file mode 100644
index 0000000000..cd76529c55
Binary files /dev/null and b/source/web/images/icons/locked_owner.gif differ
diff --git a/source/web/images/icons/more.gif b/source/web/images/icons/more.gif
new file mode 100644
index 0000000000..3681bff70e
Binary files /dev/null and b/source/web/images/icons/more.gif differ
diff --git a/source/web/images/icons/move_left.gif b/source/web/images/icons/move_left.gif
new file mode 100644
index 0000000000..b58096233f
Binary files /dev/null and b/source/web/images/icons/move_left.gif differ
diff --git a/source/web/images/icons/move_right.gif b/source/web/images/icons/move_right.gif
new file mode 100644
index 0000000000..b4001ae67f
Binary files /dev/null and b/source/web/images/icons/move_right.gif differ
diff --git a/source/web/images/icons/new_content.gif b/source/web/images/icons/new_content.gif
new file mode 100644
index 0000000000..e38a2b413e
Binary files /dev/null and b/source/web/images/icons/new_content.gif differ
diff --git a/source/web/images/icons/new_content_large.gif b/source/web/images/icons/new_content_large.gif
new file mode 100644
index 0000000000..7e20f01644
Binary files /dev/null and b/source/web/images/icons/new_content_large.gif differ
diff --git a/source/web/images/icons/new_rule.gif b/source/web/images/icons/new_rule.gif
new file mode 100644
index 0000000000..305daae711
Binary files /dev/null and b/source/web/images/icons/new_rule.gif differ
diff --git a/source/web/images/icons/new_rule_large.gif b/source/web/images/icons/new_rule_large.gif
new file mode 100644
index 0000000000..e6b52454c8
Binary files /dev/null and b/source/web/images/icons/new_rule_large.gif differ
diff --git a/source/web/images/icons/new_user_large.gif b/source/web/images/icons/new_user_large.gif
new file mode 100644
index 0000000000..9e24787b60
Binary files /dev/null and b/source/web/images/icons/new_user_large.gif differ
diff --git a/source/web/images/icons/node_browser.gif b/source/web/images/icons/node_browser.gif
new file mode 100644
index 0000000000..7697b05332
Binary files /dev/null and b/source/web/images/icons/node_browser.gif differ
diff --git a/source/web/images/icons/opennetwork.gif b/source/web/images/icons/opennetwork.gif
new file mode 100644
index 0000000000..845c696436
Binary files /dev/null and b/source/web/images/icons/opennetwork.gif differ
diff --git a/source/web/images/icons/paste.gif b/source/web/images/icons/paste.gif
new file mode 100644
index 0000000000..fdfd81a722
Binary files /dev/null and b/source/web/images/icons/paste.gif differ
diff --git a/source/web/images/icons/person.gif b/source/web/images/icons/person.gif
new file mode 100644
index 0000000000..2a7c40d394
Binary files /dev/null and b/source/web/images/icons/person.gif differ
diff --git a/source/web/images/icons/post.gif b/source/web/images/icons/post.gif
new file mode 100644
index 0000000000..ac51964908
Binary files /dev/null and b/source/web/images/icons/post.gif differ
diff --git a/source/web/images/icons/post_large.gif b/source/web/images/icons/post_large.gif
new file mode 100644
index 0000000000..efd729dc46
Binary files /dev/null and b/source/web/images/icons/post_large.gif differ
diff --git a/source/web/images/icons/post_reply.gif b/source/web/images/icons/post_reply.gif
new file mode 100644
index 0000000000..0122b92048
Binary files /dev/null and b/source/web/images/icons/post_reply.gif differ
diff --git a/source/web/images/icons/preview.gif b/source/web/images/icons/preview.gif
new file mode 100644
index 0000000000..000a101b11
Binary files /dev/null and b/source/web/images/icons/preview.gif differ
diff --git a/source/web/images/icons/preview_large.gif b/source/web/images/icons/preview_large.gif
new file mode 100644
index 0000000000..e935f19d14
Binary files /dev/null and b/source/web/images/icons/preview_large.gif differ
diff --git a/source/web/images/icons/reapply_rule.gif b/source/web/images/icons/reapply_rule.gif
new file mode 100644
index 0000000000..c4fb75ad9c
Binary files /dev/null and b/source/web/images/icons/reapply_rule.gif differ
diff --git a/source/web/images/icons/reject.gif b/source/web/images/icons/reject.gif
new file mode 100644
index 0000000000..ddb7da6edf
Binary files /dev/null and b/source/web/images/icons/reject.gif differ
diff --git a/source/web/images/icons/remove_user.gif b/source/web/images/icons/remove_user.gif
new file mode 100644
index 0000000000..d1b64e9f7e
Binary files /dev/null and b/source/web/images/icons/remove_user.gif differ
diff --git a/source/web/images/icons/remove_user_large.gif b/source/web/images/icons/remove_user_large.gif
new file mode 100644
index 0000000000..5bfdb396a9
Binary files /dev/null and b/source/web/images/icons/remove_user_large.gif differ
diff --git a/source/web/images/icons/rule.gif b/source/web/images/icons/rule.gif
new file mode 100644
index 0000000000..285ad7d2d6
Binary files /dev/null and b/source/web/images/icons/rule.gif differ
diff --git a/source/web/images/icons/rule_large.gif b/source/web/images/icons/rule_large.gif
new file mode 100644
index 0000000000..01ed0b0e41
Binary files /dev/null and b/source/web/images/icons/rule_large.gif differ
diff --git a/source/web/images/icons/search_controls.gif b/source/web/images/icons/search_controls.gif
new file mode 100644
index 0000000000..7a402cc143
Binary files /dev/null and b/source/web/images/icons/search_controls.gif differ
diff --git a/source/web/images/icons/search_icon.gif b/source/web/images/icons/search_icon.gif
new file mode 100644
index 0000000000..c7b550bad5
Binary files /dev/null and b/source/web/images/icons/search_icon.gif differ
diff --git a/source/web/images/icons/search_large.gif b/source/web/images/icons/search_large.gif
new file mode 100644
index 0000000000..aa702fd8ad
Binary files /dev/null and b/source/web/images/icons/search_large.gif differ
diff --git a/source/web/images/icons/search_results_large.gif b/source/web/images/icons/search_results_large.gif
new file mode 100644
index 0000000000..d4760e6b3f
Binary files /dev/null and b/source/web/images/icons/search_results_large.gif differ
diff --git a/source/web/images/icons/shelf.gif b/source/web/images/icons/shelf.gif
new file mode 100644
index 0000000000..20a6e172da
Binary files /dev/null and b/source/web/images/icons/shelf.gif differ
diff --git a/source/web/images/icons/shortcut.gif b/source/web/images/icons/shortcut.gif
new file mode 100644
index 0000000000..c5102fee84
Binary files /dev/null and b/source/web/images/icons/shortcut.gif differ
diff --git a/source/web/images/icons/sort_down.gif b/source/web/images/icons/sort_down.gif
new file mode 100644
index 0000000000..f8684a4ae2
Binary files /dev/null and b/source/web/images/icons/sort_down.gif differ
diff --git a/source/web/images/icons/sort_flat.gif b/source/web/images/icons/sort_flat.gif
new file mode 100644
index 0000000000..1aa8dd2496
Binary files /dev/null and b/source/web/images/icons/sort_flat.gif differ
diff --git a/source/web/images/icons/sort_up.gif b/source/web/images/icons/sort_up.gif
new file mode 100644
index 0000000000..8c2cc0e63f
Binary files /dev/null and b/source/web/images/icons/sort_up.gif differ
diff --git a/source/web/images/icons/space-icon-cd.gif b/source/web/images/icons/space-icon-cd.gif
new file mode 100644
index 0000000000..118ba3a33b
Binary files /dev/null and b/source/web/images/icons/space-icon-cd.gif differ
diff --git a/source/web/images/icons/space-icon-default.gif b/source/web/images/icons/space-icon-default.gif
new file mode 100644
index 0000000000..e22c27a06d
Binary files /dev/null and b/source/web/images/icons/space-icon-default.gif differ
diff --git a/source/web/images/icons/space-icon-doc.gif b/source/web/images/icons/space-icon-doc.gif
new file mode 100644
index 0000000000..d06e171403
Binary files /dev/null and b/source/web/images/icons/space-icon-doc.gif differ
diff --git a/source/web/images/icons/space-icon-image.gif b/source/web/images/icons/space-icon-image.gif
new file mode 100644
index 0000000000..b918854488
Binary files /dev/null and b/source/web/images/icons/space-icon-image.gif differ
diff --git a/source/web/images/icons/space-icon-pen.gif b/source/web/images/icons/space-icon-pen.gif
new file mode 100644
index 0000000000..a5e5c0e69b
Binary files /dev/null and b/source/web/images/icons/space-icon-pen.gif differ
diff --git a/source/web/images/icons/space-icon-star.gif b/source/web/images/icons/space-icon-star.gif
new file mode 100644
index 0000000000..60dfc1d99a
Binary files /dev/null and b/source/web/images/icons/space-icon-star.gif differ
diff --git a/source/web/images/icons/space.gif b/source/web/images/icons/space.gif
new file mode 100644
index 0000000000..e22c27a06d
Binary files /dev/null and b/source/web/images/icons/space.gif differ
diff --git a/source/web/images/icons/space_small.gif b/source/web/images/icons/space_small.gif
new file mode 100644
index 0000000000..25f3f06670
Binary files /dev/null and b/source/web/images/icons/space_small.gif differ
diff --git a/source/web/images/icons/take_ownership.gif b/source/web/images/icons/take_ownership.gif
new file mode 100644
index 0000000000..9fcbef61d6
Binary files /dev/null and b/source/web/images/icons/take_ownership.gif differ
diff --git a/source/web/images/icons/topic.gif b/source/web/images/icons/topic.gif
new file mode 100644
index 0000000000..c04487d448
Binary files /dev/null and b/source/web/images/icons/topic.gif differ
diff --git a/source/web/images/icons/topic_large.gif b/source/web/images/icons/topic_large.gif
new file mode 100644
index 0000000000..08b2d3507e
Binary files /dev/null and b/source/web/images/icons/topic_large.gif differ
diff --git a/source/web/images/icons/undo_checkout.gif b/source/web/images/icons/undo_checkout.gif
new file mode 100644
index 0000000000..aa523b84e4
Binary files /dev/null and b/source/web/images/icons/undo_checkout.gif differ
diff --git a/source/web/images/icons/unlock.gif b/source/web/images/icons/unlock.gif
new file mode 100644
index 0000000000..d8c2e48a7c
Binary files /dev/null and b/source/web/images/icons/unlock.gif differ
diff --git a/source/web/images/icons/up.gif b/source/web/images/icons/up.gif
new file mode 100644
index 0000000000..773da13f6c
Binary files /dev/null and b/source/web/images/icons/up.gif differ
diff --git a/source/web/images/icons/update.gif b/source/web/images/icons/update.gif
new file mode 100644
index 0000000000..9d2f5a177a
Binary files /dev/null and b/source/web/images/icons/update.gif differ
diff --git a/source/web/images/icons/update_large.gif b/source/web/images/icons/update_large.gif
new file mode 100644
index 0000000000..b4a735373e
Binary files /dev/null and b/source/web/images/icons/update_large.gif differ
diff --git a/source/web/images/icons/user_large.gif b/source/web/images/icons/user_large.gif
new file mode 100644
index 0000000000..d40362c29a
Binary files /dev/null and b/source/web/images/icons/user_large.gif differ
diff --git a/source/web/images/icons/users.gif b/source/web/images/icons/users.gif
new file mode 100644
index 0000000000..34ad0901fd
Binary files /dev/null and b/source/web/images/icons/users.gif differ
diff --git a/source/web/images/icons/users_large.gif b/source/web/images/icons/users_large.gif
new file mode 100644
index 0000000000..eff11c3720
Binary files /dev/null and b/source/web/images/icons/users_large.gif differ
diff --git a/source/web/images/icons/versionHistory_icon.gif b/source/web/images/icons/versionHistory_icon.gif
new file mode 100644
index 0000000000..401a1b4060
Binary files /dev/null and b/source/web/images/icons/versionHistory_icon.gif differ
diff --git a/source/web/images/icons/web_icon.gif b/source/web/images/icons/web_icon.gif
new file mode 100644
index 0000000000..0a55432118
Binary files /dev/null and b/source/web/images/icons/web_icon.gif differ
diff --git a/source/web/images/icons/wiki.gif b/source/web/images/icons/wiki.gif
new file mode 100644
index 0000000000..1d1c87eb73
Binary files /dev/null and b/source/web/images/icons/wiki.gif differ
diff --git a/source/web/images/logo/AlfrescoFadedBG.png b/source/web/images/logo/AlfrescoFadedBG.png
new file mode 100644
index 0000000000..6aa3258f24
Binary files /dev/null and b/source/web/images/logo/AlfrescoFadedBG.png differ
diff --git a/source/web/images/logo/AlfrescoLogo200.png b/source/web/images/logo/AlfrescoLogo200.png
new file mode 100644
index 0000000000..496a68e814
Binary files /dev/null and b/source/web/images/logo/AlfrescoLogo200.png differ
diff --git a/source/web/images/logo/AlfrescoLogo32.gif b/source/web/images/logo/AlfrescoLogo32.gif
new file mode 100644
index 0000000000..5a09ca0072
Binary files /dev/null and b/source/web/images/logo/AlfrescoLogo32.gif differ
diff --git a/source/web/images/logo/AlfrescoLogo32.png b/source/web/images/logo/AlfrescoLogo32.png
new file mode 100644
index 0000000000..a65ce4667e
Binary files /dev/null and b/source/web/images/logo/AlfrescoLogo32.png differ
diff --git a/source/web/images/logo/alfresco3d.jpg b/source/web/images/logo/alfresco3d.jpg
new file mode 100644
index 0000000000..3acae26579
Binary files /dev/null and b/source/web/images/logo/alfresco3d.jpg differ
diff --git a/source/web/images/logo/alfresco_logo.gif b/source/web/images/logo/alfresco_logo.gif
new file mode 100644
index 0000000000..5bcd518d9e
Binary files /dev/null and b/source/web/images/logo/alfresco_logo.gif differ
diff --git a/source/web/images/logo/asf_logo_wide.gif b/source/web/images/logo/asf_logo_wide.gif
new file mode 100644
index 0000000000..b2403286d5
Binary files /dev/null and b/source/web/images/logo/asf_logo_wide.gif differ
diff --git a/source/web/images/logo/cglib.png b/source/web/images/logo/cglib.png
new file mode 100644
index 0000000000..efe68c2d18
Binary files /dev/null and b/source/web/images/logo/cglib.png differ
diff --git a/source/web/images/logo/eclipse_logo.jpg b/source/web/images/logo/eclipse_logo.jpg
new file mode 100644
index 0000000000..e3a3e8f25f
Binary files /dev/null and b/source/web/images/logo/eclipse_logo.jpg differ
diff --git a/source/web/images/logo/freemarker.png b/source/web/images/logo/freemarker.png
new file mode 100644
index 0000000000..36b1a3b44c
Binary files /dev/null and b/source/web/images/logo/freemarker.png differ
diff --git a/source/web/images/logo/hibernate_logo.gif b/source/web/images/logo/hibernate_logo.gif
new file mode 100644
index 0000000000..52b21c1d1e
Binary files /dev/null and b/source/web/images/logo/hibernate_logo.gif differ
diff --git a/source/web/images/logo/jakarta-logo.gif b/source/web/images/logo/jakarta-logo.gif
new file mode 100644
index 0000000000..049cf82295
Binary files /dev/null and b/source/web/images/logo/jakarta-logo.gif differ
diff --git a/source/web/images/logo/java.gif b/source/web/images/logo/java.gif
new file mode 100644
index 0000000000..e88f047d11
Binary files /dev/null and b/source/web/images/logo/java.gif differ
diff --git a/source/web/images/logo/jbosslogo.gif b/source/web/images/logo/jbosslogo.gif
new file mode 100644
index 0000000000..2cea616699
Binary files /dev/null and b/source/web/images/logo/jbosslogo.gif differ
diff --git a/source/web/images/logo/lucene.gif b/source/web/images/logo/lucene.gif
new file mode 100644
index 0000000000..7c822986af
Binary files /dev/null and b/source/web/images/logo/lucene.gif differ
diff --git a/source/web/images/logo/myfaces.png b/source/web/images/logo/myfaces.png
new file mode 100644
index 0000000000..52c42a8128
Binary files /dev/null and b/source/web/images/logo/myfaces.png differ
diff --git a/source/web/images/logo/open-office.gif b/source/web/images/logo/open-office.gif
new file mode 100644
index 0000000000..fc44c00680
Binary files /dev/null and b/source/web/images/logo/open-office.gif differ
diff --git a/source/web/images/logo/pdfbox.gif b/source/web/images/logo/pdfbox.gif
new file mode 100644
index 0000000000..36d6a66fbf
Binary files /dev/null and b/source/web/images/logo/pdfbox.gif differ
diff --git a/source/web/images/logo/spring_logo.jpg b/source/web/images/logo/spring_logo.jpg
new file mode 100644
index 0000000000..ff036cb6b0
Binary files /dev/null and b/source/web/images/logo/spring_logo.jpg differ
diff --git a/source/web/images/logo/subversion_logo.png b/source/web/images/logo/subversion_logo.png
new file mode 100644
index 0000000000..2690b655db
Binary files /dev/null and b/source/web/images/logo/subversion_logo.png differ
diff --git a/source/web/images/logo/tinymce.png b/source/web/images/logo/tinymce.png
new file mode 100644
index 0000000000..89aa38be8d
Binary files /dev/null and b/source/web/images/logo/tinymce.png differ
diff --git a/source/web/images/parts/ballongrey_01.gif b/source/web/images/parts/ballongrey_01.gif
new file mode 100644
index 0000000000..274929f526
Binary files /dev/null and b/source/web/images/parts/ballongrey_01.gif differ
diff --git a/source/web/images/parts/ballongrey_02.gif b/source/web/images/parts/ballongrey_02.gif
new file mode 100644
index 0000000000..9ccc3959d4
Binary files /dev/null and b/source/web/images/parts/ballongrey_02.gif differ
diff --git a/source/web/images/parts/ballongrey_03.gif b/source/web/images/parts/ballongrey_03.gif
new file mode 100644
index 0000000000..65b0812511
Binary files /dev/null and b/source/web/images/parts/ballongrey_03.gif differ
diff --git a/source/web/images/parts/ballongrey_04.gif b/source/web/images/parts/ballongrey_04.gif
new file mode 100644
index 0000000000..f3dafc237b
Binary files /dev/null and b/source/web/images/parts/ballongrey_04.gif differ
diff --git a/source/web/images/parts/ballongrey_06.gif b/source/web/images/parts/ballongrey_06.gif
new file mode 100644
index 0000000000..f1026ac5d4
Binary files /dev/null and b/source/web/images/parts/ballongrey_06.gif differ
diff --git a/source/web/images/parts/ballongrey_07.gif b/source/web/images/parts/ballongrey_07.gif
new file mode 100644
index 0000000000..8f2852d2f2
Binary files /dev/null and b/source/web/images/parts/ballongrey_07.gif differ
diff --git a/source/web/images/parts/ballongrey_08.gif b/source/web/images/parts/ballongrey_08.gif
new file mode 100644
index 0000000000..1da2eedd3e
Binary files /dev/null and b/source/web/images/parts/ballongrey_08.gif differ
diff --git a/source/web/images/parts/ballongrey_09.gif b/source/web/images/parts/ballongrey_09.gif
new file mode 100644
index 0000000000..8b078b37e4
Binary files /dev/null and b/source/web/images/parts/ballongrey_09.gif differ
diff --git a/source/web/images/parts/ballonwhite_01.gif b/source/web/images/parts/ballonwhite_01.gif
new file mode 100644
index 0000000000..d607c45168
Binary files /dev/null and b/source/web/images/parts/ballonwhite_01.gif differ
diff --git a/source/web/images/parts/ballonwhite_02.gif b/source/web/images/parts/ballonwhite_02.gif
new file mode 100644
index 0000000000..064f8b05aa
Binary files /dev/null and b/source/web/images/parts/ballonwhite_02.gif differ
diff --git a/source/web/images/parts/ballonwhite_03.gif b/source/web/images/parts/ballonwhite_03.gif
new file mode 100644
index 0000000000..c9f9b23242
Binary files /dev/null and b/source/web/images/parts/ballonwhite_03.gif differ
diff --git a/source/web/images/parts/ballonwhite_04.gif b/source/web/images/parts/ballonwhite_04.gif
new file mode 100644
index 0000000000..a7ee42824e
Binary files /dev/null and b/source/web/images/parts/ballonwhite_04.gif differ
diff --git a/source/web/images/parts/ballonwhite_06.gif b/source/web/images/parts/ballonwhite_06.gif
new file mode 100644
index 0000000000..c0e7b458e7
Binary files /dev/null and b/source/web/images/parts/ballonwhite_06.gif differ
diff --git a/source/web/images/parts/ballonwhite_07.gif b/source/web/images/parts/ballonwhite_07.gif
new file mode 100644
index 0000000000..90081cd544
Binary files /dev/null and b/source/web/images/parts/ballonwhite_07.gif differ
diff --git a/source/web/images/parts/ballonwhite_08.gif b/source/web/images/parts/ballonwhite_08.gif
new file mode 100644
index 0000000000..07ee974621
Binary files /dev/null and b/source/web/images/parts/ballonwhite_08.gif differ
diff --git a/source/web/images/parts/ballonwhite_09.gif b/source/web/images/parts/ballonwhite_09.gif
new file mode 100644
index 0000000000..a5a0e99ac3
Binary files /dev/null and b/source/web/images/parts/ballonwhite_09.gif differ
diff --git a/source/web/images/parts/blue_01.gif b/source/web/images/parts/blue_01.gif
new file mode 100644
index 0000000000..a86e4e9f32
Binary files /dev/null and b/source/web/images/parts/blue_01.gif differ
diff --git a/source/web/images/parts/blue_02.gif b/source/web/images/parts/blue_02.gif
new file mode 100644
index 0000000000..d0a18c0daa
Binary files /dev/null and b/source/web/images/parts/blue_02.gif differ
diff --git a/source/web/images/parts/blue_03.gif b/source/web/images/parts/blue_03.gif
new file mode 100644
index 0000000000..46e85f8578
Binary files /dev/null and b/source/web/images/parts/blue_03.gif differ
diff --git a/source/web/images/parts/blue_04.gif b/source/web/images/parts/blue_04.gif
new file mode 100644
index 0000000000..41faa805c2
Binary files /dev/null and b/source/web/images/parts/blue_04.gif differ
diff --git a/source/web/images/parts/blue_06.gif b/source/web/images/parts/blue_06.gif
new file mode 100644
index 0000000000..76f213d5f4
Binary files /dev/null and b/source/web/images/parts/blue_06.gif differ
diff --git a/source/web/images/parts/blue_07.gif b/source/web/images/parts/blue_07.gif
new file mode 100644
index 0000000000..b235ba4880
Binary files /dev/null and b/source/web/images/parts/blue_07.gif differ
diff --git a/source/web/images/parts/blue_08.gif b/source/web/images/parts/blue_08.gif
new file mode 100644
index 0000000000..739f5a65c9
Binary files /dev/null and b/source/web/images/parts/blue_08.gif differ
diff --git a/source/web/images/parts/blue_09.gif b/source/web/images/parts/blue_09.gif
new file mode 100644
index 0000000000..8837757a4c
Binary files /dev/null and b/source/web/images/parts/blue_09.gif differ
diff --git a/source/web/images/parts/blue_white_07.gif b/source/web/images/parts/blue_white_07.gif
new file mode 100644
index 0000000000..c73ce95b24
Binary files /dev/null and b/source/web/images/parts/blue_white_07.gif differ
diff --git a/source/web/images/parts/blue_white_09.gif b/source/web/images/parts/blue_white_09.gif
new file mode 100644
index 0000000000..c4b594f1ed
Binary files /dev/null and b/source/web/images/parts/blue_white_09.gif differ
diff --git a/source/web/images/parts/bluetoolbar_01.gif b/source/web/images/parts/bluetoolbar_01.gif
new file mode 100644
index 0000000000..896ed2882d
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_01.gif differ
diff --git a/source/web/images/parts/bluetoolbar_02.gif b/source/web/images/parts/bluetoolbar_02.gif
new file mode 100644
index 0000000000..f2d7cc46ae
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_02.gif differ
diff --git a/source/web/images/parts/bluetoolbar_03.gif b/source/web/images/parts/bluetoolbar_03.gif
new file mode 100644
index 0000000000..1b5d32e4e2
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_03.gif differ
diff --git a/source/web/images/parts/bluetoolbar_04.gif b/source/web/images/parts/bluetoolbar_04.gif
new file mode 100644
index 0000000000..725cb7dcea
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_04.gif differ
diff --git a/source/web/images/parts/bluetoolbar_06.gif b/source/web/images/parts/bluetoolbar_06.gif
new file mode 100644
index 0000000000..974a284cfa
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_06.gif differ
diff --git a/source/web/images/parts/bluetoolbar_07.gif b/source/web/images/parts/bluetoolbar_07.gif
new file mode 100644
index 0000000000..8dcc24d539
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_07.gif differ
diff --git a/source/web/images/parts/bluetoolbar_08.gif b/source/web/images/parts/bluetoolbar_08.gif
new file mode 100644
index 0000000000..b267335bf4
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_08.gif differ
diff --git a/source/web/images/parts/bluetoolbar_09.gif b/source/web/images/parts/bluetoolbar_09.gif
new file mode 100644
index 0000000000..e978327cb4
Binary files /dev/null and b/source/web/images/parts/bluetoolbar_09.gif differ
diff --git a/source/web/images/parts/bottomShadow34.gif b/source/web/images/parts/bottomShadow34.gif
new file mode 100644
index 0000000000..c0cbacf188
Binary files /dev/null and b/source/web/images/parts/bottomShadow34.gif differ
diff --git a/source/web/images/parts/bottomShadow42.gif b/source/web/images/parts/bottomShadow42.gif
new file mode 100644
index 0000000000..354bc3d534
Binary files /dev/null and b/source/web/images/parts/bottomShadow42.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_01.gif b/source/web/images/parts/buttonboxgrey_01.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_01.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_02.gif b/source/web/images/parts/buttonboxgrey_02.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_02.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_03.gif b/source/web/images/parts/buttonboxgrey_03.gif
new file mode 100644
index 0000000000..e25176a056
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_03.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_04.gif b/source/web/images/parts/buttonboxgrey_04.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_04.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_06.gif b/source/web/images/parts/buttonboxgrey_06.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_06.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_07.gif b/source/web/images/parts/buttonboxgrey_07.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_07.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_08.gif b/source/web/images/parts/buttonboxgrey_08.gif
new file mode 100644
index 0000000000..08bd3b3d01
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_08.gif differ
diff --git a/source/web/images/parts/buttonboxgrey_09.gif b/source/web/images/parts/buttonboxgrey_09.gif
new file mode 100644
index 0000000000..6d2d7ea4ea
Binary files /dev/null and b/source/web/images/parts/buttonboxgrey_09.gif differ
diff --git a/source/web/images/parts/greyround_01.gif b/source/web/images/parts/greyround_01.gif
new file mode 100644
index 0000000000..0633b64056
Binary files /dev/null and b/source/web/images/parts/greyround_01.gif differ
diff --git a/source/web/images/parts/greyround_02.gif b/source/web/images/parts/greyround_02.gif
new file mode 100644
index 0000000000..acebcbb99b
Binary files /dev/null and b/source/web/images/parts/greyround_02.gif differ
diff --git a/source/web/images/parts/greyround_03.gif b/source/web/images/parts/greyround_03.gif
new file mode 100644
index 0000000000..93d3d7454a
Binary files /dev/null and b/source/web/images/parts/greyround_03.gif differ
diff --git a/source/web/images/parts/greyround_04.gif b/source/web/images/parts/greyround_04.gif
new file mode 100644
index 0000000000..d30fcca523
Binary files /dev/null and b/source/web/images/parts/greyround_04.gif differ
diff --git a/source/web/images/parts/greyround_06.gif b/source/web/images/parts/greyround_06.gif
new file mode 100644
index 0000000000..f5ecb29066
Binary files /dev/null and b/source/web/images/parts/greyround_06.gif differ
diff --git a/source/web/images/parts/greyround_07.gif b/source/web/images/parts/greyround_07.gif
new file mode 100644
index 0000000000..0d3501795b
Binary files /dev/null and b/source/web/images/parts/greyround_07.gif differ
diff --git a/source/web/images/parts/greyround_08.gif b/source/web/images/parts/greyround_08.gif
new file mode 100644
index 0000000000..d012e57b78
Binary files /dev/null and b/source/web/images/parts/greyround_08.gif differ
diff --git a/source/web/images/parts/greyround_09.gif b/source/web/images/parts/greyround_09.gif
new file mode 100644
index 0000000000..a69b9c5dfa
Binary files /dev/null and b/source/web/images/parts/greyround_09.gif differ
diff --git a/source/web/images/parts/greyround_white_07.gif b/source/web/images/parts/greyround_white_07.gif
new file mode 100644
index 0000000000..b18c4122a2
Binary files /dev/null and b/source/web/images/parts/greyround_white_07.gif differ
diff --git a/source/web/images/parts/greyround_white_09.gif b/source/web/images/parts/greyround_white_09.gif
new file mode 100644
index 0000000000..8cf60cb90b
Binary files /dev/null and b/source/web/images/parts/greyround_white_09.gif differ
diff --git a/source/web/images/parts/headbar_1.gif b/source/web/images/parts/headbar_1.gif
new file mode 100644
index 0000000000..305a46c449
Binary files /dev/null and b/source/web/images/parts/headbar_1.gif differ
diff --git a/source/web/images/parts/headbar_2.gif b/source/web/images/parts/headbar_2.gif
new file mode 100644
index 0000000000..bb1d55e238
Binary files /dev/null and b/source/web/images/parts/headbar_2.gif differ
diff --git a/source/web/images/parts/headbar_3.gif b/source/web/images/parts/headbar_3.gif
new file mode 100644
index 0000000000..510b998e78
Binary files /dev/null and b/source/web/images/parts/headbar_3.gif differ
diff --git a/source/web/images/parts/headbar_4.gif b/source/web/images/parts/headbar_4.gif
new file mode 100644
index 0000000000..49abb4c84b
Binary files /dev/null and b/source/web/images/parts/headbar_4.gif differ
diff --git a/source/web/images/parts/headbar_6.gif b/source/web/images/parts/headbar_6.gif
new file mode 100644
index 0000000000..e433d2ce12
Binary files /dev/null and b/source/web/images/parts/headbar_6.gif differ
diff --git a/source/web/images/parts/headbar_7.gif b/source/web/images/parts/headbar_7.gif
new file mode 100644
index 0000000000..f8750f591d
Binary files /dev/null and b/source/web/images/parts/headbar_7.gif differ
diff --git a/source/web/images/parts/headbar_8.gif b/source/web/images/parts/headbar_8.gif
new file mode 100644
index 0000000000..629375aa8c
Binary files /dev/null and b/source/web/images/parts/headbar_8.gif differ
diff --git a/source/web/images/parts/headbar_9.gif b/source/web/images/parts/headbar_9.gif
new file mode 100644
index 0000000000..bbb620c297
Binary files /dev/null and b/source/web/images/parts/headbar_9.gif differ
diff --git a/source/web/images/parts/headbar_begin.gif b/source/web/images/parts/headbar_begin.gif
new file mode 100644
index 0000000000..695e64c1d0
Binary files /dev/null and b/source/web/images/parts/headbar_begin.gif differ
diff --git a/source/web/images/parts/headbar_bg.gif b/source/web/images/parts/headbar_bg.gif
new file mode 100644
index 0000000000..53cfe054f8
Binary files /dev/null and b/source/web/images/parts/headbar_bg.gif differ
diff --git a/source/web/images/parts/headbar_end.gif b/source/web/images/parts/headbar_end.gif
new file mode 100644
index 0000000000..f05dcf3d9b
Binary files /dev/null and b/source/web/images/parts/headbar_end.gif differ
diff --git a/source/web/images/parts/innergrey_01.gif b/source/web/images/parts/innergrey_01.gif
new file mode 100644
index 0000000000..20d97c1280
Binary files /dev/null and b/source/web/images/parts/innergrey_01.gif differ
diff --git a/source/web/images/parts/innergrey_02.gif b/source/web/images/parts/innergrey_02.gif
new file mode 100644
index 0000000000..68c9dc4e16
Binary files /dev/null and b/source/web/images/parts/innergrey_02.gif differ
diff --git a/source/web/images/parts/innergrey_03.gif b/source/web/images/parts/innergrey_03.gif
new file mode 100644
index 0000000000..bde3b74aaa
Binary files /dev/null and b/source/web/images/parts/innergrey_03.gif differ
diff --git a/source/web/images/parts/innergrey_04.gif b/source/web/images/parts/innergrey_04.gif
new file mode 100644
index 0000000000..8ac0e0176f
Binary files /dev/null and b/source/web/images/parts/innergrey_04.gif differ
diff --git a/source/web/images/parts/innergrey_06.gif b/source/web/images/parts/innergrey_06.gif
new file mode 100644
index 0000000000..0f109eb7b1
Binary files /dev/null and b/source/web/images/parts/innergrey_06.gif differ
diff --git a/source/web/images/parts/innergrey_07.gif b/source/web/images/parts/innergrey_07.gif
new file mode 100644
index 0000000000..09d5492bd1
Binary files /dev/null and b/source/web/images/parts/innergrey_07.gif differ
diff --git a/source/web/images/parts/innergrey_08.gif b/source/web/images/parts/innergrey_08.gif
new file mode 100644
index 0000000000..945477e53d
Binary files /dev/null and b/source/web/images/parts/innergrey_08.gif differ
diff --git a/source/web/images/parts/innergrey_09.gif b/source/web/images/parts/innergrey_09.gif
new file mode 100644
index 0000000000..478797cbe3
Binary files /dev/null and b/source/web/images/parts/innergrey_09.gif differ
diff --git a/source/web/images/parts/mainwhite_01.gif b/source/web/images/parts/mainwhite_01.gif
new file mode 100644
index 0000000000..3478489f05
Binary files /dev/null and b/source/web/images/parts/mainwhite_01.gif differ
diff --git a/source/web/images/parts/mainwhite_02.gif b/source/web/images/parts/mainwhite_02.gif
new file mode 100644
index 0000000000..31b001482c
Binary files /dev/null and b/source/web/images/parts/mainwhite_02.gif differ
diff --git a/source/web/images/parts/mainwhite_03.gif b/source/web/images/parts/mainwhite_03.gif
new file mode 100644
index 0000000000..8417e62407
Binary files /dev/null and b/source/web/images/parts/mainwhite_03.gif differ
diff --git a/source/web/images/parts/mainwhite_04.gif b/source/web/images/parts/mainwhite_04.gif
new file mode 100644
index 0000000000..85f79e18d5
Binary files /dev/null and b/source/web/images/parts/mainwhite_04.gif differ
diff --git a/source/web/images/parts/mainwhite_06.gif b/source/web/images/parts/mainwhite_06.gif
new file mode 100644
index 0000000000..c05701adca
Binary files /dev/null and b/source/web/images/parts/mainwhite_06.gif differ
diff --git a/source/web/images/parts/mainwhite_07.gif b/source/web/images/parts/mainwhite_07.gif
new file mode 100644
index 0000000000..9f9eb5d541
Binary files /dev/null and b/source/web/images/parts/mainwhite_07.gif differ
diff --git a/source/web/images/parts/mainwhite_08.gif b/source/web/images/parts/mainwhite_08.gif
new file mode 100644
index 0000000000..3bad98d443
Binary files /dev/null and b/source/web/images/parts/mainwhite_08.gif differ
diff --git a/source/web/images/parts/mainwhite_09.gif b/source/web/images/parts/mainwhite_09.gif
new file mode 100644
index 0000000000..34fd965f34
Binary files /dev/null and b/source/web/images/parts/mainwhite_09.gif differ
diff --git a/source/web/images/parts/orangebody_1.gif b/source/web/images/parts/orangebody_1.gif
new file mode 100644
index 0000000000..5e475a54b0
Binary files /dev/null and b/source/web/images/parts/orangebody_1.gif differ
diff --git a/source/web/images/parts/orangebody_2.gif b/source/web/images/parts/orangebody_2.gif
new file mode 100644
index 0000000000..805d7f4a31
Binary files /dev/null and b/source/web/images/parts/orangebody_2.gif differ
diff --git a/source/web/images/parts/orangebody_3.gif b/source/web/images/parts/orangebody_3.gif
new file mode 100644
index 0000000000..c3393f5671
Binary files /dev/null and b/source/web/images/parts/orangebody_3.gif differ
diff --git a/source/web/images/parts/orangebody_4.gif b/source/web/images/parts/orangebody_4.gif
new file mode 100644
index 0000000000..dd6b4a4c4f
Binary files /dev/null and b/source/web/images/parts/orangebody_4.gif differ
diff --git a/source/web/images/parts/orangebody_6.gif b/source/web/images/parts/orangebody_6.gif
new file mode 100644
index 0000000000..33662dbc06
Binary files /dev/null and b/source/web/images/parts/orangebody_6.gif differ
diff --git a/source/web/images/parts/orangebody_7.gif b/source/web/images/parts/orangebody_7.gif
new file mode 100644
index 0000000000..c95b9c7af1
Binary files /dev/null and b/source/web/images/parts/orangebody_7.gif differ
diff --git a/source/web/images/parts/orangebody_8.gif b/source/web/images/parts/orangebody_8.gif
new file mode 100644
index 0000000000..30f3501552
Binary files /dev/null and b/source/web/images/parts/orangebody_8.gif differ
diff --git a/source/web/images/parts/orangebody_9.gif b/source/web/images/parts/orangebody_9.gif
new file mode 100644
index 0000000000..da93fea331
Binary files /dev/null and b/source/web/images/parts/orangebody_9.gif differ
diff --git a/source/web/images/parts/orangeheader_1.gif b/source/web/images/parts/orangeheader_1.gif
new file mode 100644
index 0000000000..2e93b05fa5
Binary files /dev/null and b/source/web/images/parts/orangeheader_1.gif differ
diff --git a/source/web/images/parts/orangeheader_2.gif b/source/web/images/parts/orangeheader_2.gif
new file mode 100644
index 0000000000..673f28c5f6
Binary files /dev/null and b/source/web/images/parts/orangeheader_2.gif differ
diff --git a/source/web/images/parts/orangeheader_3.gif b/source/web/images/parts/orangeheader_3.gif
new file mode 100644
index 0000000000..9e05cc35df
Binary files /dev/null and b/source/web/images/parts/orangeheader_3.gif differ
diff --git a/source/web/images/parts/rightSideShadow34.gif b/source/web/images/parts/rightSideShadow34.gif
new file mode 100644
index 0000000000..dfd4f9df1c
Binary files /dev/null and b/source/web/images/parts/rightSideShadow34.gif differ
diff --git a/source/web/images/parts/rightSideShadow42.gif b/source/web/images/parts/rightSideShadow42.gif
new file mode 100644
index 0000000000..fd8a776bd4
Binary files /dev/null and b/source/web/images/parts/rightSideShadow42.gif differ
diff --git a/source/web/images/parts/salmon_01.gif b/source/web/images/parts/salmon_01.gif
new file mode 100644
index 0000000000..28f83bc672
Binary files /dev/null and b/source/web/images/parts/salmon_01.gif differ
diff --git a/source/web/images/parts/salmon_02.gif b/source/web/images/parts/salmon_02.gif
new file mode 100644
index 0000000000..3249e257e3
Binary files /dev/null and b/source/web/images/parts/salmon_02.gif differ
diff --git a/source/web/images/parts/salmon_03.gif b/source/web/images/parts/salmon_03.gif
new file mode 100644
index 0000000000..c2f787e892
Binary files /dev/null and b/source/web/images/parts/salmon_03.gif differ
diff --git a/source/web/images/parts/salmon_04.gif b/source/web/images/parts/salmon_04.gif
new file mode 100644
index 0000000000..9dd5c60da1
Binary files /dev/null and b/source/web/images/parts/salmon_04.gif differ
diff --git a/source/web/images/parts/salmon_06.gif b/source/web/images/parts/salmon_06.gif
new file mode 100644
index 0000000000..5408319079
Binary files /dev/null and b/source/web/images/parts/salmon_06.gif differ
diff --git a/source/web/images/parts/salmon_07.gif b/source/web/images/parts/salmon_07.gif
new file mode 100644
index 0000000000..1f81607e51
Binary files /dev/null and b/source/web/images/parts/salmon_07.gif differ
diff --git a/source/web/images/parts/salmon_08.gif b/source/web/images/parts/salmon_08.gif
new file mode 100644
index 0000000000..4acffa5a47
Binary files /dev/null and b/source/web/images/parts/salmon_08.gif differ
diff --git a/source/web/images/parts/salmon_09.gif b/source/web/images/parts/salmon_09.gif
new file mode 100644
index 0000000000..11b8e5349f
Binary files /dev/null and b/source/web/images/parts/salmon_09.gif differ
diff --git a/source/web/images/parts/searchbar_begin.gif b/source/web/images/parts/searchbar_begin.gif
new file mode 100644
index 0000000000..00ae672b9d
Binary files /dev/null and b/source/web/images/parts/searchbar_begin.gif differ
diff --git a/source/web/images/parts/searchbar_bg.gif b/source/web/images/parts/searchbar_bg.gif
new file mode 100644
index 0000000000..f441c0a5c0
Binary files /dev/null and b/source/web/images/parts/searchbar_bg.gif differ
diff --git a/source/web/images/parts/searchbar_end.gif b/source/web/images/parts/searchbar_end.gif
new file mode 100644
index 0000000000..39f048eddd
Binary files /dev/null and b/source/web/images/parts/searchbar_end.gif differ
diff --git a/source/web/images/parts/spacer.gif b/source/web/images/parts/spacer.gif
new file mode 100644
index 0000000000..9935f82104
Binary files /dev/null and b/source/web/images/parts/spacer.gif differ
diff --git a/source/web/images/parts/statuspanel_4.gif b/source/web/images/parts/statuspanel_4.gif
new file mode 100644
index 0000000000..7e55ad0269
Binary files /dev/null and b/source/web/images/parts/statuspanel_4.gif differ
diff --git a/source/web/images/parts/statuspanel_6.gif b/source/web/images/parts/statuspanel_6.gif
new file mode 100644
index 0000000000..3b268f813d
Binary files /dev/null and b/source/web/images/parts/statuspanel_6.gif differ
diff --git a/source/web/images/parts/statuspanel_7.gif b/source/web/images/parts/statuspanel_7.gif
new file mode 100644
index 0000000000..b281715a0f
Binary files /dev/null and b/source/web/images/parts/statuspanel_7.gif differ
diff --git a/source/web/images/parts/statuspanel_8.gif b/source/web/images/parts/statuspanel_8.gif
new file mode 100644
index 0000000000..6d5d20a8eb
Binary files /dev/null and b/source/web/images/parts/statuspanel_8.gif differ
diff --git a/source/web/images/parts/statuspanel_9.gif b/source/web/images/parts/statuspanel_9.gif
new file mode 100644
index 0000000000..b4b4a47a71
Binary files /dev/null and b/source/web/images/parts/statuspanel_9.gif differ
diff --git a/source/web/images/parts/titlebar_begin.gif b/source/web/images/parts/titlebar_begin.gif
new file mode 100644
index 0000000000..2f779c136a
Binary files /dev/null and b/source/web/images/parts/titlebar_begin.gif differ
diff --git a/source/web/images/parts/titlebar_bg.gif b/source/web/images/parts/titlebar_bg.gif
new file mode 100644
index 0000000000..afed185966
Binary files /dev/null and b/source/web/images/parts/titlebar_bg.gif differ
diff --git a/source/web/images/parts/titlebar_end.gif b/source/web/images/parts/titlebar_end.gif
new file mode 100644
index 0000000000..fc2f9eb319
Binary files /dev/null and b/source/web/images/parts/titlebar_end.gif differ
diff --git a/source/web/images/parts/white_01.gif b/source/web/images/parts/white_01.gif
new file mode 100644
index 0000000000..0442fdd06f
Binary files /dev/null and b/source/web/images/parts/white_01.gif differ
diff --git a/source/web/images/parts/white_02.gif b/source/web/images/parts/white_02.gif
new file mode 100644
index 0000000000..bc45b52264
Binary files /dev/null and b/source/web/images/parts/white_02.gif differ
diff --git a/source/web/images/parts/white_03.gif b/source/web/images/parts/white_03.gif
new file mode 100644
index 0000000000..4a6d85b793
Binary files /dev/null and b/source/web/images/parts/white_03.gif differ
diff --git a/source/web/images/parts/white_03_squared.gif b/source/web/images/parts/white_03_squared.gif
new file mode 100644
index 0000000000..a4ad9ea6e0
Binary files /dev/null and b/source/web/images/parts/white_03_squared.gif differ
diff --git a/source/web/images/parts/white_04.gif b/source/web/images/parts/white_04.gif
new file mode 100644
index 0000000000..8c9e99bc40
Binary files /dev/null and b/source/web/images/parts/white_04.gif differ
diff --git a/source/web/images/parts/white_06.gif b/source/web/images/parts/white_06.gif
new file mode 100644
index 0000000000..0741f1fb0c
Binary files /dev/null and b/source/web/images/parts/white_06.gif differ
diff --git a/source/web/images/parts/white_07.gif b/source/web/images/parts/white_07.gif
new file mode 100644
index 0000000000..991424ef63
Binary files /dev/null and b/source/web/images/parts/white_07.gif differ
diff --git a/source/web/images/parts/white_08.gif b/source/web/images/parts/white_08.gif
new file mode 100644
index 0000000000..c8f1a8b840
Binary files /dev/null and b/source/web/images/parts/white_08.gif differ
diff --git a/source/web/images/parts/white_09.gif b/source/web/images/parts/white_09.gif
new file mode 100644
index 0000000000..b440024c05
Binary files /dev/null and b/source/web/images/parts/white_09.gif differ
diff --git a/source/web/images/parts/whitepanel_4.gif b/source/web/images/parts/whitepanel_4.gif
new file mode 100644
index 0000000000..234c0a5adf
Binary files /dev/null and b/source/web/images/parts/whitepanel_4.gif differ
diff --git a/source/web/images/parts/whitepanel_6.gif b/source/web/images/parts/whitepanel_6.gif
new file mode 100644
index 0000000000..730503c71a
Binary files /dev/null and b/source/web/images/parts/whitepanel_6.gif differ
diff --git a/source/web/images/parts/whitepanel_7.gif b/source/web/images/parts/whitepanel_7.gif
new file mode 100644
index 0000000000..1d8b5c9e91
Binary files /dev/null and b/source/web/images/parts/whitepanel_7.gif differ
diff --git a/source/web/images/parts/whitepanel_8.gif b/source/web/images/parts/whitepanel_8.gif
new file mode 100644
index 0000000000..51a01ffad6
Binary files /dev/null and b/source/web/images/parts/whitepanel_8.gif differ
diff --git a/source/web/images/parts/whitepanel_9.gif b/source/web/images/parts/whitepanel_9.gif
new file mode 100644
index 0000000000..acb7a29b86
Binary files /dev/null and b/source/web/images/parts/whitepanel_9.gif differ
diff --git a/source/web/images/parts/yellowInner_01.gif b/source/web/images/parts/yellowInner_01.gif
new file mode 100644
index 0000000000..8d7cc10a09
Binary files /dev/null and b/source/web/images/parts/yellowInner_01.gif differ
diff --git a/source/web/images/parts/yellowInner_02.gif b/source/web/images/parts/yellowInner_02.gif
new file mode 100644
index 0000000000..d511ea9dca
Binary files /dev/null and b/source/web/images/parts/yellowInner_02.gif differ
diff --git a/source/web/images/parts/yellowInner_03.gif b/source/web/images/parts/yellowInner_03.gif
new file mode 100644
index 0000000000..1fe4c98e55
Binary files /dev/null and b/source/web/images/parts/yellowInner_03.gif differ
diff --git a/source/web/images/parts/yellowInner_04.gif b/source/web/images/parts/yellowInner_04.gif
new file mode 100644
index 0000000000..3212024ce4
Binary files /dev/null and b/source/web/images/parts/yellowInner_04.gif differ
diff --git a/source/web/images/parts/yellowInner_06.gif b/source/web/images/parts/yellowInner_06.gif
new file mode 100644
index 0000000000..15e5fada62
Binary files /dev/null and b/source/web/images/parts/yellowInner_06.gif differ
diff --git a/source/web/images/parts/yellowInner_07.gif b/source/web/images/parts/yellowInner_07.gif
new file mode 100644
index 0000000000..3b114fa15f
Binary files /dev/null and b/source/web/images/parts/yellowInner_07.gif differ
diff --git a/source/web/images/parts/yellowInner_08.gif b/source/web/images/parts/yellowInner_08.gif
new file mode 100644
index 0000000000..99a3e7903b
Binary files /dev/null and b/source/web/images/parts/yellowInner_08.gif differ
diff --git a/source/web/images/parts/yellowInner_09.gif b/source/web/images/parts/yellowInner_09.gif
new file mode 100644
index 0000000000..c2da1cef2d
Binary files /dev/null and b/source/web/images/parts/yellowInner_09.gif differ
diff --git a/source/web/images/parts/yellow_01.gif b/source/web/images/parts/yellow_01.gif
new file mode 100644
index 0000000000..f86e6b2190
Binary files /dev/null and b/source/web/images/parts/yellow_01.gif differ
diff --git a/source/web/images/parts/yellow_02.gif b/source/web/images/parts/yellow_02.gif
new file mode 100644
index 0000000000..83d79a7197
Binary files /dev/null and b/source/web/images/parts/yellow_02.gif differ
diff --git a/source/web/images/parts/yellow_03.gif b/source/web/images/parts/yellow_03.gif
new file mode 100644
index 0000000000..c9a616b05d
Binary files /dev/null and b/source/web/images/parts/yellow_03.gif differ
diff --git a/source/web/images/parts/yellow_04.gif b/source/web/images/parts/yellow_04.gif
new file mode 100644
index 0000000000..7222359234
Binary files /dev/null and b/source/web/images/parts/yellow_04.gif differ
diff --git a/source/web/images/parts/yellow_06.gif b/source/web/images/parts/yellow_06.gif
new file mode 100644
index 0000000000..bb7646a73c
Binary files /dev/null and b/source/web/images/parts/yellow_06.gif differ
diff --git a/source/web/images/parts/yellow_07.gif b/source/web/images/parts/yellow_07.gif
new file mode 100644
index 0000000000..a4989c181c
Binary files /dev/null and b/source/web/images/parts/yellow_07.gif differ
diff --git a/source/web/images/parts/yellow_08.gif b/source/web/images/parts/yellow_08.gif
new file mode 100644
index 0000000000..5901455497
Binary files /dev/null and b/source/web/images/parts/yellow_08.gif differ
diff --git a/source/web/images/parts/yellow_09.gif b/source/web/images/parts/yellow_09.gif
new file mode 100644
index 0000000000..913341c98e
Binary files /dev/null and b/source/web/images/parts/yellow_09.gif differ
diff --git a/source/web/images/parts/yellowbody_1.gif b/source/web/images/parts/yellowbody_1.gif
new file mode 100644
index 0000000000..59bb034580
Binary files /dev/null and b/source/web/images/parts/yellowbody_1.gif differ
diff --git a/source/web/images/parts/yellowbody_2.gif b/source/web/images/parts/yellowbody_2.gif
new file mode 100644
index 0000000000..1a0666aec9
Binary files /dev/null and b/source/web/images/parts/yellowbody_2.gif differ
diff --git a/source/web/images/parts/yellowbody_3.gif b/source/web/images/parts/yellowbody_3.gif
new file mode 100644
index 0000000000..bf7496be17
Binary files /dev/null and b/source/web/images/parts/yellowbody_3.gif differ
diff --git a/source/web/images/parts/yellowbody_4.gif b/source/web/images/parts/yellowbody_4.gif
new file mode 100644
index 0000000000..ee2630e68f
Binary files /dev/null and b/source/web/images/parts/yellowbody_4.gif differ
diff --git a/source/web/images/parts/yellowbody_6.gif b/source/web/images/parts/yellowbody_6.gif
new file mode 100644
index 0000000000..0daf4288bc
Binary files /dev/null and b/source/web/images/parts/yellowbody_6.gif differ
diff --git a/source/web/images/parts/yellowbody_7.gif b/source/web/images/parts/yellowbody_7.gif
new file mode 100644
index 0000000000..11a142ec8b
Binary files /dev/null and b/source/web/images/parts/yellowbody_7.gif differ
diff --git a/source/web/images/parts/yellowbody_8.gif b/source/web/images/parts/yellowbody_8.gif
new file mode 100644
index 0000000000..2d2b4cc74d
Binary files /dev/null and b/source/web/images/parts/yellowbody_8.gif differ
diff --git a/source/web/images/parts/yellowbody_9.gif b/source/web/images/parts/yellowbody_9.gif
new file mode 100644
index 0000000000..0f0f9f82ba
Binary files /dev/null and b/source/web/images/parts/yellowbody_9.gif differ
diff --git a/source/web/images/parts/yellowheader_1.gif b/source/web/images/parts/yellowheader_1.gif
new file mode 100644
index 0000000000..ecf792283d
Binary files /dev/null and b/source/web/images/parts/yellowheader_1.gif differ
diff --git a/source/web/images/parts/yellowheader_2.gif b/source/web/images/parts/yellowheader_2.gif
new file mode 100644
index 0000000000..85c6168fd3
Binary files /dev/null and b/source/web/images/parts/yellowheader_2.gif differ
diff --git a/source/web/images/parts/yellowheader_3.gif b/source/web/images/parts/yellowheader_3.gif
new file mode 100644
index 0000000000..0ef93be74f
Binary files /dev/null and b/source/web/images/parts/yellowheader_3.gif differ
diff --git a/source/web/index.jsp b/source/web/index.jsp
new file mode 100644
index 0000000000..8916281a16
--- /dev/null
+++ b/source/web/index.jsp
@@ -0,0 +1,21 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%-- redirect to the web application's start page --%>
+<%
+response.sendRedirect(request.getContextPath() + "/faces/jsp/browse/browse.jsp");
+%>
\ No newline at end of file
diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp
new file mode 100644
index 0000000000..cd6fb87562
--- /dev/null
+++ b/source/web/jsp/admin/admin-console.jsp
@@ -0,0 +1,167 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_admin_console">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="admin-console">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width=32>
+                              <h:graphicImage id="logo" url="/images/icons/admin_console_large.gif" width="32" height="32" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.admin_console}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.admin_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td valign=top>
+                     
+                     <table cellspacing=4 cellpadding=4 border=0 width=100%>
+                        <tr>
+                           <td width=100%>
+                           
+                                 <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "ballongrey", "#EEEEEE"); %>
+                                 <table cellpadding="6" cellspacing="6" border="0" width="100%">
+                                    <tr>
+                                       <td><a:actionLink value="#{msg.manage_users}" image="/images/icons/users.gif" action="manageUsers" styleClass="title" actionListener="#{NewUserWizard.setupUsers}" /></td>
+                                    </tr>
+                                    <tr>
+                                       <td><a:actionLink value="#{msg.category_management}" image="/images/icons/categories.gif" action="manageCategories" styleClass="title" /></td>
+                                    </tr>
+                                    <tr>
+                                       <td>
+                                          <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="import" actionListener="#{BrowseBean.setupSpaceAction}" styleClass="title">
+                                             <f:param name="id" value="#{NavigationBean.currentNodeId}" />
+                                          </a:actionLink>
+                                       </td>
+                                    </tr>
+                                    <tr>
+                                       <td>
+                                          <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="export" actionListener="#{BrowseBean.setupSpaceAction}" styleClass="title">
+                                             <f:param name="id" value="#{NavigationBean.currentNodeId}" />
+                                          </a:actionLink>
+                                       </td>
+                                    </tr>
+                                    <tr>
+                                       <td><a:actionLink value="#{msg.system_info}" image="/images/icons/info_icon.gif" action="showSystemInfo" styleClass="title" /></td>
+                                    </tr>
+                                    <tr>
+                                       <td><a:actionLink value="#{msg.node_browser}" image="/images/icons/node_browser.gif" action="showNodeBrowser" styleClass="title" /></td>
+                                    </tr>
+                                 </table>
+                                 <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "ballongrey"); %>
+                           
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/admin/admin-title.jsp b/source/web/jsp/admin/admin-title.jsp
new file mode 100644
index 0000000000..9c21dffb9d
--- /dev/null
+++ b/source/web/jsp/admin/admin-title.jsp
@@ -0,0 +1,36 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+
+  Licensed under the Mozilla Public License version 1.1
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+
+    http://www.alfresco.org/legal/license.txt
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<h:form id="node-browser-titlebar">
+
+   <table width="100%">
+      <tr>
+         <td>
+            <h:graphicImage value="/images/logo/AlfrescoLogo32.png" alt="Alfresco" />
+         </td>
+         <td>
+            <nobr><h:outputText styleClass="mainTitle" value="#{msg.title_admin_node_browser}"/></nobr>
+         </td>
+         <td width="100%" align="right">
+            <h:commandButton value="#{msg.close}" action="adminConsole" />
+         </td>
+      </tr>
+   </table>
+
+</h:form>
+
+<br>
diff --git a/source/web/jsp/admin/node-browser.jsp b/source/web/jsp/admin/node-browser.jsp
new file mode 100644
index 0000000000..64db11e172
--- /dev/null
+++ b/source/web/jsp/admin/node-browser.jsp
@@ -0,0 +1,251 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_admin_node_browser">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+   <%@ include file="admin-title.jsp" %>
+
+   <h:commandLink id="selectStores" action="#{AdminNodeBrowseBean.selectStores}">
+       <h:outputText styleClass="mainSubText" value="Stores"/>
+   </h:commandLink>
+   <br>
+   <br>
+
+   <h:outputText styleClass="mainTitle" value="Search"/>
+
+   <h:form id="searchForm">
+      <table>
+         <tr>
+            <td>
+               <h:selectOneMenu id="queryLanguage" value="#{AdminNodeBrowseBean.queryLanguage}">
+                   <f:selectItems value="#{AdminNodeBrowseBean.queryLanguages}"/>
+               </h:selectOneMenu>
+            </td>
+            <td>
+               <h:inputText id="query" size="100" value="#{AdminNodeBrowseBean.query}"/>
+            </td>
+            <td>
+               <h:commandButton id="submitSearch" action="#{AdminNodeBrowseBean.submitSearch}" value="Search"/>
+            </td>
+         </tr>
+         <tr>
+            <td></td>
+            <td>
+                <h:message styleClass="errorMessage" id="queryError" for="query"/>
+            </td>
+            <td></td>
+         </tr>
+      </table>
+   </h:form>
+   
+   <h:outputText styleClass="mainTitle" value="Node Identifier"/>
+
+   <table>
+   <tr>
+      <td><nobr><b>Primary Path:</b></nobr></td><td>
+          <nobr>
+          <h:commandLink id="selectPrimaryParent" action="#{AdminNodeBrowseBean.selectPrimaryPath}">
+              <h:outputText id="primaryPath" value="#{AdminNodeBrowseBean.primaryPath}"/>
+          </h:commandLink>
+          </nobr>
+      </td>
+   </tr>
+   <tr>
+      <td><b>Reference:</b></td><td><h:outputText id="nodeRef" value="#{AdminNodeBrowseBean.nodeRef}"/></td>
+   </tr>
+   <tr>
+      <td><b>Type:</b></td><td><h:outputText id="nodeType" value="#{AdminNodeBrowseBean.nodeType}"/></td>
+   </tr>
+   <tr>
+      <td><b>Parent:</b></td>
+      <td>
+          <h:commandLink id="selectPrimaryParent" action="#{AdminNodeBrowseBean.selectPrimaryParent}">
+              <h:outputText id="primaryParent" value="#{AdminNodeBrowseBean.primaryParent}"/>
+          </h:commandLink>
+      </td>
+   </tr>
+   </table>
+
+   <br>
+   <h:outputText styleClass="mainTitle" value="Propertes"/>
+   
+   <h:dataTable id="properties" border="1" value="#{AdminNodeBrowseBean.properties}" var="property">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Name"/>
+           </f:facet>
+           <h:outputText value="#{property.name}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Value"/>
+           </f:facet>
+           <h:outputText styleClass="errorMessage" value="--collection--" rendered="#{property.collection == true}"/>
+           <h:dataTable id="values" border="0" cellspacing="0" value="#{property.values}" var="value" rendered="#{property.values.rowCount > 0}">
+                <h:column>
+                    <h:outputLink value="#{value.url}" target="_blank" rendered="#{value.content}">
+                        <h:outputText value="#{value.value}" />
+                    </h:outputLink>
+                    <h:commandLink id="selectNodeProperty" action="#{AdminNodeBrowseBean.selectNodeProperty}" rendered="#{value.nodeRef}">
+                        <h:outputText value="#{value.value}"/>
+                    </h:commandLink>
+                    <h:outputText value="#{value.value}" rendered="#{value.content == false && value.nodeRef == false && value.nullValue == false}"/>
+                    <h:outputText styleClass="errorMessage" value="--null--" rendered="#{value.nullValue}"/>
+               </h:column>
+           </h:dataTable>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Property Type"/>
+           </f:facet>
+           <h:outputText value="#{property.dataType}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Value Type"/>
+           </f:facet>
+           <h:dataTable id="valueTypes" border="0" cellspacing="0" value="#{property.values}" var="value">
+                <h:column>
+                    <h:outputText value="#{value.dataType}" rendered="#{property.dataType == null || property.any}"/>
+                </h:column>
+           </h:dataTable>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Residual"/>
+           </f:facet>
+           <h:outputText value="#{property.residual}"/>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+   <h:outputText styleClass="mainTitle" value="Aspects"/>
+
+   <h:dataTable id="aspects" value="#{AdminNodeBrowseBean.aspects}" var="aspect">
+       <h:column>
+           <h:outputText value="#{aspect}"/>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+   <h:outputText styleClass="mainTitle" value="Children"/>
+
+   <h:dataTable id="children" border="1" value="#{AdminNodeBrowseBean.children}" var="child">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Child Name"/>
+           </f:facet>
+           <h:outputText value="#{child.QName}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Child Node"/>
+           </f:facet>
+           <h:commandLink id="selectChild" action="#{AdminNodeBrowseBean.selectChild}">
+               <h:outputText value="#{child.childRef}"/>
+           </h:commandLink>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Primary"/>
+           </f:facet>
+           <h:outputText value="#{child.primary}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Association Type"/>
+           </f:facet>
+           <h:outputText value="#{child.typeQName}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Index"/>
+           </f:facet>
+           <h:outputText value="#{child.nthSibling}"/>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+   <h:outputText styleClass="mainTitle" value="Associations"/>
+
+   <h:dataTable id="assocs" border="1" value="#{AdminNodeBrowseBean.assocs}" var="assoc">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="To Node"/>
+           </f:facet>
+           <h:commandLink id="selectToNode" action="#{AdminNodeBrowseBean.selectToNode}">
+               <h:outputText value="#{assoc.targetRef}"/>
+           </h:commandLink>
+           
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Association Type"/>
+           </f:facet>
+           <h:outputText value="#{assoc.typeQName}"/>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+   <h:outputText styleClass="mainTitle" value="Parents"/>
+
+   <h:dataTable id="parents" border="1" value="#{AdminNodeBrowseBean.parents}" var="parent">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Child Name"/>
+           </f:facet>
+           <h:outputText value="#{parent.QName}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Parent Node"/>
+           </f:facet>
+           <h:commandLink id="selectParent" action="#{AdminNodeBrowseBean.selectParent}">
+               <h:outputText value="#{parent.parentRef}"/>
+           </h:commandLink>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Primary"/>
+           </f:facet>
+           <h:outputText value="#{parent.primary}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Association Type"/>
+           </f:facet>
+           <h:outputText value="#{parent.typeQName}"/>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/admin/search-results.jsp b/source/web/jsp/admin/search-results.jsp
new file mode 100644
index 0000000000..baede033dc
--- /dev/null
+++ b/source/web/jsp/admin/search-results.jsp
@@ -0,0 +1,93 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_admin_search_results">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%@ include file="admin-title.jsp" %>
+   
+   <table>
+      <tr>
+      <td>   
+         <h:commandLink action="#{AdminNodeBrowseBean.selectStores}">
+	        <h:outputText value="Stores"/>
+	     </h:commandLink>
+	  </td>
+	  <td>&nbsp;|&nbsp;</td>
+	  <td>
+         <h:commandLink action="nodeBrowser">
+            <h:outputText value="Node Browser"/>
+         </h:commandLink>
+	  </td>
+   </table>
+   
+   <br>
+   <h:outputText styleClass="mainTitle" value="Search"/>
+
+   <table>
+      <tr>
+         <td><b>Search Language:</b></td><td><h:outputText value="#{AdminNodeBrowseBean.queryLanguage}"/></td>
+      </tr>
+      <tr>
+         <td><b>Search:</b></td><td><h:outputText value="#{AdminNodeBrowseBean.query}"/></td>
+      </tr>
+   </table>
+
+   <br>
+   <span class="mainTitle">Results (<h:outputText value="#{AdminNodeBrowseBean.searchResults.length}"/> rows)</span>
+
+   <h:dataTable id="searchResults" border="1" value="#{AdminNodeBrowseBean.searchResults.rows}" var="row">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Name"/>
+           </f:facet>
+           <h:commandLink action="#{AdminNodeBrowseBean.selectResultNode}">
+           	   <h:outputText value="#{row.QName}"/>
+           </h:commandLink>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Node"/>
+           </f:facet>
+           <h:outputText value="#{row.childRef}"/>
+       </h:column>
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Parent"/>
+           </f:facet>
+           <h:commandLink action="#{AdminNodeBrowseBean.selectResultNode}">
+               <h:outputText value="#{row.parentRef}"/>
+           </h:commandLink>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/admin/store-browser.jsp b/source/web/jsp/admin/store-browser.jsp
new file mode 100644
index 0000000000..3c4dc8cb8f
--- /dev/null
+++ b/source/web/jsp/admin/store-browser.jsp
@@ -0,0 +1,58 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_admin_store_browser">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%@ include file="admin-title.jsp" %>
+   
+   <h:commandLink action="#{AdminNodeBrowseBean.selectStores}">
+       <h:outputText styleClass="mainSubText" value="Refresh view"/>
+   </h:commandLink>
+   
+   <br>
+   <br>
+   <h:outputText styleClass="mainTitle" value="Stores"/>
+   <br>
+   
+   <h:dataTable id="stores" border="1" value="#{AdminNodeBrowseBean.stores}" var="store">
+       <h:column>
+           <f:facet name="header">
+               <h:outputText value="Reference"/>
+           </f:facet>
+           <h:commandLink action="#{AdminNodeBrowseBean.selectStore}">
+               <h:outputText value="#{store}"/>
+           </h:commandLink>
+       </h:column>
+   </h:dataTable>
+
+   <br>
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
new file mode 100644
index 0000000000..56d7501027
--- /dev/null
+++ b/source/web/jsp/browse/browse.jsp
@@ -0,0 +1,548 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+   
+<r:page titleId="title_browse">
+
+<f:view>
+   <%
+      FacesContext fc = FacesContext.getCurrentInstance();
+     
+      // set locale for JSF framework usage
+      fc.getViewRoot().setLocale(Application.getLanguage(fc));
+   %>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="browse">
+   
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr valign=top>
+ 
+                           <%-- actions for browse mode --%>
+                           <a:panel id="browse-actions" rendered="#{NavigationBean.searchContext == null}">
+                              <td width=32>
+                                 <h:graphicImage id="space-logo" url="/images/icons/#{NavigationBean.nodeProperties.icon}.gif" width="32" height="32" />
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg1" /></div>
+                                 <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" />&nbsp;<a:actionLink image="/images/icons/opennetwork.gif" value="#{msg.network_folder} #{NavigationBean.nodeProperties.cifsPathLabel}" showLink="false" href="#{NavigationBean.nodeProperties.cifsPath}" rendered="#{NavigationBean.nodeProperties.cifsPath != null}" target="new" id="cifs" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.view_description}" id="msg3" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
+                                 <%--<div style="padding-top:2px"><a:statusMessage id="status1" border="yellowInner" bgcolor="#ffffcc" binding="#{BrowseBean.statusMessage}" /></div>--%>
+                              </td>
+                              <td bgcolor="#465F7D" width=1></td>
+                              <td width=110 style="padding-left:2px">
+                                 <%-- Current object actions --%>
+                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                    <a:actionLink value="#{msg.new_space}" image="/images/icons/create_space.gif" padding="4" action="createSpace" actionListener="#{NewSpaceDialog.startWizard}" id="link1" />
+                                 </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
+                                    <a:actionLink value="#{msg.add_content}" image="/images/icons/add.gif" padding="4" action="addContent" actionListener="#{AddContentWizard.startWizard}" id="link3" />
+                                 </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval3">
+                                    <a:actionLink value="#{msg.create_content}" image="/images/icons/new_content.gif" id="link3_1" padding="4" action="createContent" actionListener="#{CreateContentWizard.startWizard}" />
+                                 </r:permissionEvaluator>
+                                 <%-- Current space More actions menu --%>
+                                 <a:menu id="spaceMenu" itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                    <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" action="showSpaceDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link5">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6" />
+                                    </a:actionLink>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval4">
+                                       <a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                       </a:actionLink>
+                                       <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" id="link6" actionListener="#{ClipboardBean.cutNode}">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param3" />
+                                       </a:actionLink>
+                                    </r:permissionEvaluator>
+                                    <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" id="link7" actionListener="#{ClipboardBean.copyNode}">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param4" />
+                                    </a:actionLink>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Write" id="eval5">
+                                       <a:actionLink value="#{msg.paste_all}" image="/images/icons/paste.gif" actionListener="#{ClipboardBean.pasteAll}" id="link8" />
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval6">
+                                       <a:actionLink value="#{msg.advanced_space_wizard}" image="/images/icons/create_space.gif" action="createAdvancedSpace" actionListener="#{NewSpaceWizard.startWizard}" id="link9" />
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="ChangePermissions" id="eval3_1">
+                                       <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" id="link4" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6_1" />
+                                       </a:actionLink>
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Write" id="eval7">
+                                       <a:actionLink value="#{msg.manage_rules}" image="/images/icons/rule.gif" action="manageRules" actionListener="#{BrowseBean.setupSpaceAction}" id="link10">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param5" />
+                                       </a:actionLink>
+                                    </r:permissionEvaluator>
+                                    <%-- admin user only actions --%>
+                                    <a:booleanEvaluator value="#{NavigationBean.currentUser.admin == true}" id="eval8">
+                                       <a:actionLink value="#{msg.admin_console}" image="/images/icons/admin_console.gif" action="adminConsole" id="link11" />
+                                    </a:booleanEvaluator>
+                                 </a:menu>
+                              </td>
+                           </a:panel>
+                           
+                           <%-- actions for search results mode --%>
+                           <a:panel id="search-actions" rendered="#{NavigationBean.searchContext != null}">
+                              <td width=32>
+                                 <img src="<%=request.getContextPath()%>/images/icons/search_results_large.gif" width=32 height=32>
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg10" /></div>
+                                 <div class="mainTitle"><h:outputText value="#{msg.search_results}" id="msg11" /></div>
+                                 <div class="mainSubText">
+                                    <h:outputFormat value="#{msg.search_detail}" id="msg12">
+                                       <f:param value="#{NavigationBean.searchContext.text}" id="param2" />
+                                    </h:outputFormat>
+                                 </div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.search_description}" id="msg13" /></div>
+                                 <%--<div style="padding-top:2px"><a:statusMessage id="status2" border="yellowInner" bgcolor="#ffffcc" binding="#{BrowseBean.statusMessage}" /></div>--%>
+                              </td>
+                              <td bgcolor="#465F7D" width=1></td>
+                              <td width=100 style="padding-left:2px">
+                                 <%-- Current object actions --%>
+                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg14" /><br>
+                                 <a:actionLink value="#{msg.new_search}" image="/images/icons/search_icon.gif" padding="4" action="advSearch" id="link20" />
+                                 <a:actionLink value="#{msg.close_search}" image="/images/icons/action.gif" padding="4" actionListener="#{BrowseBean.closeSearch}" id="link21" />
+                              </td>
+                           </a:panel>
+                           
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110>
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
+                                    value="#{BrowseBean.browseViewMode}" actionListener="#{BrowseBean.viewModeChanged}">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                                 <a:listItem value="icons" label="#{msg.view_icon}" />
+                                 <a:listItem value="list" label="#{msg.view_browse}" />
+                                 <a:listItem value="dashboard" label="#{msg.dashboard_view}" disabled="#{!NavigationBean.currentNodeHasTemplate}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Details - Spaces --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="spaces-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_spaces}">
+                     
+                     <%-- Spaces List --%>
+                     <a:richList id="spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.browsePageSize}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{BrowseBean.nodes}" var="r">
+                        
+                        <%-- component to display if the list is empty --%>
+                        <f:facet name="empty">
+                           <%-- TODO: either build complete message in BrowseBean or have no icon... --%>
+                           <h:outputFormat value="#{msg.no_space_items}" escape="false">
+                              <f:param value="#{msg.new_space}" />
+                           </h:outputFormat>
+                        </f:facet>
+                        
+                        <%-- Primary column for details view mode --%>
+                        <a:column primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                           </f:facet>
+                           <f:facet name="small-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/space_small.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Primary column for icons view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left;vertical-align:top;" rendered="#{BrowseBean.browseViewMode == 'icons'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="header">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Primary column for list view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="title">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Description column for all view modes --%>
+                        <a:column style="text-align:left">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.description}" />
+                        </a:column>
+                        
+                        <%-- Path column for search mode in details view mode --%>
+                        <a:column style="text-align:left" rendered="#{NavigationBean.searchContext != null && BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.path}" value="displayPath" styleClass="header"/>
+                           </f:facet>
+                           <r:nodePath value="#{r.path}" actionListener="#{BrowseBean.clickSpacePath}" />
+                        </a:column>
+                        
+                        <%-- Created Date column for details view mode --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.created}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Modified Date column for details/icons view modes --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.modified}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Node Descendants links for list view mode --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                           <r:nodeDescendants value="#{r.nodeRef}" styleClass="header" actionListener="#{BrowseBean.clickDescendantSpace}" />
+                        </a:column>
+                        
+                        <%-- Space Actions column --%>
+                        <a:column actions="true" style="text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.actions}"/>
+                           </f:facet>
+                           <a:actionLink value="#{msg.preview}" image="/images/icons/preview.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupSpaceAction}" action="previewSpace">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" showLink="false" styleClass="inlineAction" actionListener="#{ClipboardBean.cutNode}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" showLink="false" styleClass="inlineAction" actionListener="#{ClipboardBean.copyNode}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" showLink="false" styleClass="inlineAction" action="showSpaceDetails" actionListener="#{BrowseBean.setupSpaceAction}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <a:dataPager styleClass="pager" />
+                     </a:richList>
+                     
+                     </a:panel>
+                     
+                     <div>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Details - Content --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_content}">
+                     
+                     <%-- Content list --%>
+                     <a:richList id="contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.browsePageSize}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{BrowseBean.content}" var="r">
+                        
+                        <%-- component to display if the list is empty --%>
+                        <f:facet name="empty">
+                           <%-- TODO: either build complete message in BrowseBean or have no icon... --%>
+                           <h:outputFormat value="#{msg.no_content_items}" escape="false">
+                              <f:param value="#{msg.add_content}" />
+                              <f:param value="#{msg.create_content}" />
+                           </h:outputFormat>
+                        </f:facet>
+                        
+                        <%-- Primary column for details view mode --%>
+                        <a:column primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                           </f:facet>
+                           <f:facet name="small-icon">
+                              <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" showLink="false" styleClass="inlineAction" />
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
+                           <r:lockIcon value="#{r.nodeRef}" align="absmiddle" />
+                        </a:column>
+                        
+                        <%-- Primary column for icons view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left;vertical-align:top;" rendered="#{BrowseBean.browseViewMode == 'icons'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType32}" showLink="false" styleClass="inlineAction" />
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" href="#{r.url}" target="new" styleClass="header" />
+                           <r:lockIcon value="#{r.nodeRef}" align="absmiddle" />
+                        </a:column>
+                        
+                        <%-- Primary column for list view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType32}" showLink="false" styleClass="inlineAction" />
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" href="#{r.url}" target="new" styleClass="title" />
+                           <r:lockIcon value="#{r.nodeRef}" align="absmiddle" />
+                        </a:column>
+                        
+                        <%-- Description column for all view modes --%>
+                        <a:column style="text-align:left">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.description}" />
+                        </a:column>
+                        
+                        <%-- Path column for search mode in details view mode --%>
+                        <a:column style="text-align:left" rendered="#{NavigationBean.searchContext != null && BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.path}" value="displayPath" styleClass="header"/>
+                           </f:facet>
+                           <r:nodePath value="#{r.path}" actionListener="#{BrowseBean.clickSpacePath}" />
+                        </a:column>
+                        
+                        <%-- Size for details/icons view modes --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.size}" value="size" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.size}">
+                              <a:convertSize />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Created Date column for details view mode --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.created}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Modified Date column for details/icons view modes --%>
+                        <a:column style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.modified}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Content Actions column --%>
+                        <a:column actions="true" style="text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.actions}"/>
+                           </f:facet>
+                           <r:permissionEvaluator value="#{r}" allow="Write">
+                              <a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
+                                 <a:booleanEvaluator value="#{r.editLinkType == 'http'}">
+                                    <a:actionLink value="#{msg.edit}" image="/images/icons/edit_icon.gif" showLink="false" styleClass="inlineAction" actionListener="#{CheckinCheckoutBean.editFile}">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                                 <a:booleanEvaluator value="#{r.editLinkType == 'webdav'}">
+                                    <a:actionLink value="#{msg.edit}" image="/images/icons/edit_icon.gif" showLink="false" styleClass="inlineAction" onclick="javascript:openDoc('#{r.webdavUrl}');" />
+                                 </a:booleanEvaluator>
+                                 <a:booleanEvaluator value="#{r.editLinkType == 'cifs'}">
+                                    <a:actionLink value="#{msg.edit}" image="/images/icons/edit_icon.gif" showLink="false" styleClass="inlineAction" href="#{r.cifsPath}" target="new" />
+                                 </a:booleanEvaluator>
+                              </a:booleanEvaluator>
+                           </r:permissionEvaluator>
+                           <r:permissionEvaluator value="#{r}" allow="CheckOut">
+                              <a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
+                                 <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" showLink="false" styleClass="inlineAction" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                           </r:permissionEvaluator>   
+                           <a:booleanEvaluator value="#{r.checkIn == true}">
+                              <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" showLink="false" styleClass="inlineAction" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkinFile">
+                                 <f:param name="id" value="#{r.id}" />
+                             </a:actionLink>
+                           </a:booleanEvaluator>
+                           <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="showDocDetails">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                           </r:permissionEvaluator>
+                           <%-- More actions menu --%>
+                           <a:menu itemSpacing="4" image="/images/icons/more.gif" tooltip="#{msg.more_actions}" menuStyleClass="moreActionsMenu">
+                              <r:permissionEvaluator value="#{r}" allow="Write">
+                                 <a:booleanEvaluator value="#{(r.locked == false && r.workingCopy == false) || r.owner == true}">
+                                    <a:actionLink value="#{msg.update}" image="/images/icons/update.gif" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="updateFile">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                              </r:permissionEvaluator>
+                              <a:booleanEvaluator value="#{r.cancelCheckOut == true}">
+                                 <a:actionLink value="#{msg.undocheckout}" image="/images/icons/undo_checkout.gif" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="undoCheckoutFile">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              <a:booleanEvaluator value='#{r["app:approveStep"] != null && r.workingCopy == false && r.locked == false}'>
+                                 <a:actionLink value='#{r["app:approveStep"]}' image="/images/icons/approve.gif" actionListener="#{DocumentDetailsBean.approve}">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              <a:booleanEvaluator value='#{r["app:rejectStep"] != null && r.workingCopy == false && r.locked == false}'>
+                                 <a:actionLink value='#{r["app:rejectStep"]}' image="/images/icons/reject.gif" actionListener="#{DocumentDetailsBean.reject}">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              <a:actionLink value="#{msg.preview}" image="/images/icons/preview.gif" actionListener="#{BrowseBean.setupContentAction}" action="previewContent">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                              <r:permissionEvaluator value="#{r}" allow="Delete">
+                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </a:menu>
+                        </a:column>
+                        
+                        <a:dataPager styleClass="pager" />
+                     </a:richList>
+                     
+                     </a:panel>
+                     
+                     </div>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/browse/dashboard.jsp b/source/web/jsp/browse/dashboard.jsp
new file mode 100644
index 0000000000..ab453a4dbd
--- /dev/null
+++ b/source/web/jsp/browse/dashboard.jsp
@@ -0,0 +1,152 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page titleId="title_browse">
+
+<f:view>
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="dashboard">
+   
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr valign=top>
+ 
+                           <%-- actions for browse mode --%>
+                           <td width=32>
+                              <h:graphicImage id="space-logo" url="/images/icons/#{NavigationBean.nodeProperties.icon}.gif" width="32" height="32" />
+                           </td>
+                           <td>
+                              <%-- Summary --%>
+                              <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg1" /></div>
+                              <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" />&nbsp;<a:actionLink image="/images/icons/opennetwork.gif" value="#{msg.network_folder} #{NavigationBean.nodeProperties.cifsPathLabel}" showLink="false" href="#{NavigationBean.nodeProperties.cifsPath}" rendered="#{NavigationBean.nodeProperties.cifsPath != null}" target="new" id="cifs" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.view_description}" id="msg3" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
+                           </td>
+                           
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110>
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
+                                    value="dashboard" actionListener="#{BrowseBean.viewModeChanged}">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                                 <a:listItem value="icons" label="#{msg.view_icon}" />
+                                 <a:listItem value="list" label="#{msg.view_browse}" />
+                                 <a:listItem value="dashboard" label="#{msg.dashboard_view}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Dashboard --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="dashboard-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.dashboard}">
+                        
+                        <r:template id="template" template="#{NavigationBean.currentNodeTemplate}" model="#{NavigationBean.templateModel}" />
+                        
+                     </a:panel>
+                     
+                     </div>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/categories/categories.jsp b/source/web/jsp/categories/categories.jsp
new file mode 100644
index 0000000000..3a80d79ad6
--- /dev/null
+++ b/source/web/jsp/categories/categories.jsp
@@ -0,0 +1,225 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_categories_list">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="logo" url="/images/icons/category.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.category_management}" /></div>
+                              <div class="mainSubTitle">
+                                 <%-- show either root message or the current category name --%>
+                                 <h:outputText value="#{msg.categories}" rendered="#{CategoriesBean.currentCategoryId == null}" />
+                                 <h:outputText value="#{CategoriesBean.currentCategory.name}" rendered="#{CategoriesBean.currentCategoryId != null}" />
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.categories_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
+                              <a:actionLink value="#{msg.add_category}" image="/images/icons/add_category.gif" padding="4" action="addCategory" actionListener="#{CategoriesBean.clearCategoryAction}" />
+                              <a:booleanEvaluator value="#{CategoriesBean.currentCategoryId != null}">
+                                 <a:actionLink value="#{msg.edit_category}" image="/images/icons/edit_category.gif" padding="4" action="editCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                    <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
+                                 </a:actionLink>
+                                 <a:actionLink value="#{msg.delete_category}" image="/images/icons/delete_category.gif" padding="4" action="deleteCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                    <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
+                                    value="#{CategoriesBean.viewMode}" actionListener="#{CategoriesBean.viewModeChanged}">
+                                 <a:listItem value="icons" label="#{msg.category_icons}" />
+                                 <a:listItem value="details" label="#{msg.category_details}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <%-- Category Path Breadcrumb --%>
+                              <div style="padding-left:8px;padding-top:4px;padding-bottom:4px">
+                                 <a:breadcrumb value="#{CategoriesBean.location}" styleClass="title" />
+                              </div>
+                              
+                              <%-- Categories List --%>
+                              <div style="padding:4px">
+                              
+                              <a:panel id="categories-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.items}">
+                              
+                              <a:richList id="categories-list" binding="#{CategoriesBean.categoriesRichList}" viewMode="#{CategoriesBean.viewMode}" pageSize="15"
+                                    styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                                    value="#{CategoriesBean.categories}" var="r" initialSortColumn="name" initialSortDescending="true">
+                                 
+                                 <%-- Primary column for icons view mode --%>
+                                 <a:column primary="true" style="padding:2px;text-align:left;vertical-align:top;">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                                    </f:facet>
+                                    <f:facet name="large-icon">
+                                       <a:actionLink value="#{r.name}" image="/images/icons/category.gif" actionListener="#{CategoriesBean.clickCategory}" showLink="false">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                    </f:facet>
+                                    <f:facet name="small-icon">
+                                       <a:actionLink value="#{r.name}" image="/images/icons/category_small.gif" actionListener="#{CategoriesBean.clickCategory}" showLink="false">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                    </f:facet>
+                                    <a:actionLink value="#{r.name}" actionListener="#{CategoriesBean.clickCategory}" styleClass="header">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                 </a:column>
+                                 
+                                 <%-- Actions column --%>
+                                 <a:column actions="true" style="text-align:left">
+                                    <f:facet name="header">
+                                       <h:outputText value="#{msg.actions}"/>
+                                    </f:facet>
+                                    <a:actionLink value="#{msg.modify}" image="/images/icons/edit_category.gif" showLink="false" action="editCategory" style="padding-right:2px" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete_category.gif" showLink="false" action="deleteCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                 </a:column>
+                                 
+                                 <a:dataPager styleClass="pager" />
+                              </a:richList>
+                              
+                              </a:panel>
+                     
+                              <div>
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="adminConsole" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/categories/delete-category.jsp b/source/web/jsp/categories/delete-category.jsp
new file mode 100644
index 0000000000..65686387b4
--- /dev/null
+++ b/source/web/jsp/categories/delete-category.jsp
@@ -0,0 +1,176 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_category">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_category_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_category}" /> '<h:outputText value="#{CategoriesBean.actionCategory.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_category_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{CategoriesBean.members != 0}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputFormat value="#{msg.delete_category_warning}">
+                                                   <f:param value="#{CategoriesBean.members}" />
+                                                </h:outputFormat>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_category_confirm}">
+                                          <f:param value="#{CategoriesBean.actionCategory.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.delete}" action="#{CategoriesBean.finishDelete}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/categories/edit-category.jsp b/source/web/jsp/categories/edit-category.jsp
new file mode 100644
index 0000000000..2698e52182
--- /dev/null
+++ b/source/web/jsp/categories/edit-category.jsp
@@ -0,0 +1,185 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_category">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("edit-category:name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("edit-category:name").value.length == 0 )
+      {
+         document.getElementById("edit-category:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("edit-category:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="logo" url="/images/icons/edit_category_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{CategoriesBean.actionCategory.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.edit_category}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.edit_category_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.category_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td>
+                                       <h:inputText id="name" value="#{CategoriesBean.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();"/>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{CategoriesBean.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.finish_button}" action="#{CategoriesBean.finishEdit}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/categories/new-category.jsp b/source/web/jsp/categories/new-category.jsp
new file mode 100644
index 0000000000..6d765a5307
--- /dev/null
+++ b/source/web/jsp/categories/new-category.jsp
@@ -0,0 +1,185 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_category">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("new-category:name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("new-category:name").value.length == 0 )
+      {
+         document.getElementById("new-category:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-category:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="logo" url="/images/icons/create_category_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{CategoriesBean.currentCategory.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.new_category}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.new_category_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_category_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.category_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td>
+                                       <h:inputText id="name" value="#{CategoriesBean.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();"/>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{CategoriesBean.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.new_category}" action="#{CategoriesBean.finishCreate}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dashboard.jsp b/source/web/jsp/dashboard.jsp
new file mode 100644
index 0000000000..190c6fcef7
--- /dev/null
+++ b/source/web/jsp/dashboard.jsp
@@ -0,0 +1,169 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="dashboard">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width=32>
+                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32.gif" width="32" height="32" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="My Dashboard" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Main --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td valign=top>
+                     
+                     <table cellspacing=4 cellpadding=2 border=0 width=100%>
+                        <tr valign=top>
+                           
+                           <td width=100% colspan=2>
+                              <a:panel label="My Summary" id="dash1" border="innergrey" bgcolor="#e8e8e8" progressive="true">
+                                 
+                                 <r:template id="t1" template="alfresco/templates/my_summary.ftl" />
+                                 
+                              </a:panel>
+                           </td>
+                           
+                        </tr>
+                        <tr valign=top>
+                           
+                           <td width=50%>
+                              <a:panel label="My Docs" id="dash2" border="white" bgcolor="white" progressive="true">
+                                 
+                                 <r:template id="t2" template="alfresco/templates/my_docs.ftl" />
+                                 
+                              </a:panel>
+                           </td>
+                           
+                           <td width=50%>
+                              <a:panel label="My Spaces" id="dash3" border="white" bgcolor="white" progressive="true">
+                                 
+                                 <r:template id="t3" template="alfresco/templates/my_spaces.ftl" />
+                                 
+                              </a:panel>
+                           </td>
+                           
+                        </tr>
+                        <tr valign=top>
+                        
+                           <td width=100% colspan=2>
+                              <a:panel label="Press Releases" id="dash4" border="blue" bgcolor="#d3e6fe" progressive="true">
+                                 
+                                 <r:template id="t4" template="alfresco/templates/my_pressreleases.ftl" />
+                                 
+                              </a:panel>
+                           </td>
+                           
+                        </tr>
+                        <tr valign=top>
+                        
+                           <td width=100% colspan=2>
+                              <a:panel label="Company Logos" id="dash5" border="white" bgcolor="white" progressive="true">
+                                 
+                                 <r:template id="t5" template="alfresco/templates/company_logos.ftl" />
+                                 
+                              </a:panel>
+                           </td>
+                           
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
new file mode 100644
index 0000000000..3c7f74ce98
--- /dev/null
+++ b/source/web/jsp/dialog/about.jsp
@@ -0,0 +1,273 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_about">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   <f:loadBundle basename="alfresco.version" var="version"/>
+   
+   <h:form acceptCharset="UTF-8" id="about">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width=32>
+                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32.gif" width="32" height="32" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.version}" />: <h:outputText value='#{version["version.edition"]} - v#{version["version.major"]}.#{version["version.minor"]}.#{version["version.revision"]}' /> <h:outputText rendered='#{version["version.label"] != ""}' value='(#{version["version.label"]})' /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td valign=top>
+                     
+                     <table cellspacing=0 cellpadding=0 border=0 width=100%>
+                     <tr>
+                     <td width=100% align=center>
+                     
+                        <div style="padding:8px">
+                           <img src="<%=request.getContextPath()%>/images/logo/alfresco3d.jpg" width=520 height=168>
+                        </div>
+                        <div style="padding:4px">
+                           <a href="http://www.alfresco.org/" class="title" target="new">http://www.alfresco.org</a>
+                           <p>
+                           Alfresco Software Inc. &#169; 2005 All rights reserved. <a href="http://www.alfresco.org/legalandlicense.html" target="new">Legal and License</a>
+                        </div>
+                        
+                        <div style="padding:4px" class="mainSubTitle">
+                           Alfresco Software utilises components or libraries from the following software vendors and companies
+                        </div>
+                        
+                        <p>
+                        
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://www.springframework.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/spring_logo.jpg" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://www.hibernate.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/hibernate_logo.gif" border=0></a>
+                           </span>
+                        </div>
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://www.apache.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/asf_logo_wide.gif" border=0></a>
+                           </span>
+                        </div>
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://jakarta.apache.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/jakarta-logo.gif" border=0></a>
+                           </span>
+                        </div>
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://www.java.com/" target="new"><img src="<%=request.getContextPath()%>/images/logo/java.gif" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://www.jboss.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/jbosslogo.gif" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://myfaces.apache.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/myfaces.png" border=0></a>
+                           </span>
+                        </div>
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://lucene.apache.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/lucene.gif" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://cglib.sourceforge.net/" target="new"><img src="<%=request.getContextPath()%>/images/logo/cglib.png" border=0></a>
+                           </span>
+                        </div>
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://www.pdfbox.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/pdfbox.gif" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://tinymce.moxiecode.com/" target="new"><img src="<%=request.getContextPath()%>/images/logo/tinymce.png" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://www.openoffice.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/open-office.gif" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://freemarker.sourceforge.net/" target="new"><img src="<%=request.getContextPath()%>/images/logo/freemarker.png" border=0></a>
+                           </span>
+                        </div>
+                        
+                        <p>
+                        <p>
+                        
+                        <div style="padding:4px" class="mainSubTitle">
+                           Alfresco Development tools:
+                        </div>
+                        
+                        <div style="padding:4px">
+                           <span align=center>
+                              <a href="http://subversion.tigris.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/subversion_logo.png" border=0></a>
+                           </span>
+                           <span align=center>
+                              <a href="http://www.eclipse.org/" target="new"><img src="<%=request.getContextPath()%>/images/logo/eclipse_logo.jpg" border=0></a>
+                           </span>
+                        </div>
+                        
+                        <p>
+                        <p>
+                        
+                        <div style="padding:4px" class="mainSubTitle">
+                           Alfresco Software contributors:
+                        </div>
+                        
+                        <table border=0 cellspacing=2 cellpadding=2>
+                           <tr>
+                              <td width=50% align=right>
+                                 Meta Data Extraction Framework and PDF/Open Office Format meta data extraction.
+                              </td>
+                              <td>&nbsp;&#8226;&nbsp;</td>
+                              <td width=50%>
+                                 Jesper Steen M&#248;ller
+                              </td>
+                           </tr>
+                           <tr>
+                              <td width=50% align=right>
+                                 Open Document Format meta data extraction.
+                              </td>
+                              <td>&nbsp;&#8226;&nbsp;</td>
+                              <td width=50%>
+                                 Antti Jokipii
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align=right width=50%>
+                                 Language and translation packs.
+                              </td>
+                              <td>&nbsp;&#8226;&nbsp;</td>
+                              <td width=50%>
+                                 Camille B&#233;gnis,
+                                 Andrejus Chaliapinas,
+                                 Laurent Genier,
+                                 Antti Jokipii,
+                                 Henning Kristensen,
+                                 Betty Mai,
+                                 Fabian Mandelbaum,
+                                 Theodoros Papageorgiou,
+                                 Gian Luca Farina Perseu,
+                                 Alex Revesz,
+                                 Christian Roy,
+                                 Philippe Seillier,
+                                 Frank Shipley,
+                                 Michiel Steltman,
+                                 Gert Thiel,
+                                 cnalfresco
+                              </td>
+                           </tr>
+                        </table>
+                        
+                     </td>
+                     <td valign="top">
+                        <div style="padding-top:16px">
+                        <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                        <table cellpadding="1" cellspacing="1" border="0">
+                           <tr>
+                              <td align="center">
+                                 <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                              </td>
+                           </tr>
+                        </table>
+                        <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                        </div>
+                     </td>
+                     
+                     </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp
new file mode 100644
index 0000000000..23007aa1f7
--- /dev/null
+++ b/source/web/jsp/dialog/advanced-search.jsp
@@ -0,0 +1,327 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_advanced_search">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("advsearch:search-text").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("advsearch:search-text").value.length == 0 )
+      {
+         document.getElementById("advsearch:search-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("advsearch:search-button").disabled = false;
+      }
+   }
+   
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="advsearch">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width=32>
+                              <img src="<%=request.getContextPath()%>/images/icons/search_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.advanced_search}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.advancedsearch_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=80 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                              <a:actionLink value="#{msg.resetall}" image="/images/icons/delete.gif" padding="4" actionListener="#{AdvancedSearchBean.reset}" />
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" valign="top">
+                                 
+                                 <tr>
+                                    <td colspan=2>
+                                       <h:outputText value="#{msg.look_for}" style="font-weight:bold" />:&nbsp;
+                                       <h:inputText id="search-text" value="#{AdvancedSearchBean.text}" size="48" maxlength="1024"
+                                             onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr>
+                                    <td valign="top">
+                                       <a:panel label="#{msg.show_results_for}" id="restrict-panel" style="font-weight:bold" border="white" bgcolor="white" progressive="true"
+                                             expanded='#{AdvancedSearchBean.panels["restrict-panel"]}' expandedActionListener="#{AdvancedSearchBean.expandPanel}">
+                                          <table cellpadding="2" cellspacing="2" border="0">
+                                             <tr>
+                                                <td>
+                                                   <h:selectOneRadio value="#{AdvancedSearchBean.mode}" layout="pageDirection" id="radioMode" >
+                                                      <f:selectItem itemValue="all" itemLabel="#{msg.all_items}" id="selectAll" />
+                                                      <f:selectItem itemValue="files_text" itemLabel="#{msg.file_names_contents}" id="selectFilesText" />
+                                                      <f:selectItem itemValue="files" itemLabel="#{msg.file_names}" id="selectFiles" />
+                                                      <f:selectItem itemValue="folders" itemLabel="#{msg.space_names}" id="selectFolders" />
+                                                   </h:selectOneRadio>
+                                                </td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                       
+                                       <div style="padding:3px"></div>
+                                       
+                                       <a:panel label="#{msg.look_in}" id="location-panel" style="font-weight:bold" border="white" bgcolor="white" progressive="true"
+                                             expanded='#{AdvancedSearchBean.panels["location-panel"]}' expandedActionListener="#{AdvancedSearchBean.expandPanel}">
+                                          <table cellpadding="2" cellspacing="2" border="0">
+                                             <tr>
+                                                <td>
+                                                   <h:selectOneRadio value="#{AdvancedSearchBean.lookin}" layout="pageDirection" id="radioLookin">
+                                                      <f:selectItem itemValue="all" itemLabel="#{msg.all_spaces}" id="spacesAll" />
+                                                      <f:selectItem itemValue="other" itemLabel="#{msg.specify_space}:" id="spacesOther" />
+                                                   </h:selectOneRadio>
+                                                </td>
+                                             </tr>
+                                             <tr>
+                                                <td style="padding-left:26px">
+                                                   <r:spaceSelector label="#{msg.select_space_prompt}" value="#{AdvancedSearchBean.location}" initialSelection="#{NavigationBean.currentNodeId}" styleClass="selector" id="spaceSelector" />
+                                                </td>
+                                             </tr>
+                                             <tr>
+                                                <td style="padding-left:22px">
+                                                   <h:selectBooleanCheckbox value="#{AdvancedSearchBean.locationChildren}" id="chkLocation" />
+                                                   <span style="vertical-align:20%"><h:outputText value="#{msg.include_child_spaces}" id="incchild" /></span>
+                                                </td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                       
+                                       <div style="padding:3px"></div>
+                                       
+                                       <a:panel label="#{msg.show_results_categories}" id="categories-panel" style="font-weight:bold" border="white" bgcolor="white" progressive="true"
+                                             expanded='#{AdvancedSearchBean.panels["categories-panel"]}' expandedActionListener="#{AdvancedSearchBean.expandPanel}">
+                                          <table cellpadding="2" cellspacing="2" border="0">
+                                             <tr>
+                                                <td style="padding-left:8px;padding-top:8px">
+                                                   <r:categorySelector label="#{msg.select_category_prompt}" value="#{AdvancedSearchBean.category}" styleClass="selector" id="catSelector" />
+                                                </td>
+                                             </tr>
+                                             <tr>
+                                                <td style="padding-left:4px">
+                                                   <h:selectBooleanCheckbox value="#{AdvancedSearchBean.categoryChildren}" id="chkCategory" />
+                                                   <span style="vertical-align:20%"><h:outputText value="#{msg.include_sub_categories}" id="incCats" /></span>
+                                                </td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                       
+                                    </td>
+                                    
+                                    <td valign="top">                                   
+                                       
+                                       <a:panel label="#{msg.also_search_results}" id="attrs-panel" style="font-weight:bold" border="white" bgcolor="white" progressive="true"
+                                             expanded='#{AdvancedSearchBean.panels["attrs-panel"]}' expandedActionListener="#{AdvancedSearchBean.expandPanel}">
+                                          <table cellpadding="2" cellspacing="2" border="0">
+                                             <tr>
+                                                <td>
+                                                   <table cellpadding="2" cellspacing="2" border="0">
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.content_type}" id="contentType" />:</td>
+                                                         <td>
+                                                            <h:selectOneMenu value="#{AdvancedSearchBean.contentType}" id="selectContentType">
+                                                               <f:selectItems value="#{AdvancedSearchBean.contentTypes}" id="contentTypes" />
+                                                            </h:selectOneMenu>
+                                                         </td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.content_format}" id="contentFormat" />:</td>
+                                                         <td>
+                                                            <h:selectOneMenu value="#{AdvancedSearchBean.contentFormat}" id="selectContentFormat">
+                                                               <f:selectItems value="#{AdvancedSearchBean.contentFormats}" id="contentFormats" />
+                                                            </h:selectOneMenu>
+                                                         </td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.title}" id="title" />:</td><td><h:inputText value="#{AdvancedSearchBean.title}" size="28" maxlength="1024" id="txtTitle" /></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.description}" id="desc" />:</td><td><h:inputText value="#{AdvancedSearchBean.description}" size="28" maxlength="1024" id="txtDesc" /></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.author}" id="author" />:</td><td><h:inputText value="#{AdvancedSearchBean.author}" size="28" maxlength="1024" id="txtAuthor" /></td>
+                                                      </tr>
+                                                   </table>
+                                                   <table cellpadding="1" cellspacing="0" border="0">
+                                                      <tr><td colspan=2 class="paddingRow"></td></tr>
+                                                      <tr>
+                                                         <td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.modifiedDateChecked}" id="chkModDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.modified_date}" id="modDate" />:</span></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.from}" id="modDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateFrom}" startYear="1985" yearCount="21" id="dateModFrom" /></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.to}" id="modDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.modifiedDateTo}" startYear="1985" yearCount="21" id="dateModTo" /><td>
+                                                      </tr>
+                                                      
+                                                      <tr>
+                                                         <td colspan=2><h:selectBooleanCheckbox value="#{AdvancedSearchBean.createdDateChecked}" id="chkCreateDate" /><span style="vertical-align:20%"><h:outputText value="#{msg.created_date}" id="createDate" />:</span></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.from}" id="createDateFrom" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateFrom}" startYear="1985" yearCount="21" id="dateCreatedFrom" /></td>
+                                                      </tr>
+                                                      <tr>
+                                                         <td style="padding-left:8px"><h:outputText value="#{msg.to}" id="createDateTo" />:</td><td><a:inputDatePicker value="#{AdvancedSearchBean.createdDateTo}" startYear="1985" yearCount="21" id="dateCreatedTo" /><td>
+                                                      </tr>
+                                                   </table>
+                                                   <div style="padding:4px"></div>
+                                                   <a:panel label="#{msg.additional_options}" id="custom-panel" style="font-weight:bold" progressive="true"
+                                                         expanded='#{AdvancedSearchBean.panels["custom-panel"]}' expandedActionListener="#{AdvancedSearchBean.expandPanel}">
+                                                      <r:searchCustomProperties id="customProps" bean="AdvancedSearchBean" var="customProperties" style="padding-left:12px;padding-top:4px" />
+                                                   </a:panel>
+                                                </td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                    </td>
+                                    
+                                 </tr>
+                              </table>
+                              
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="search-button" value="#{msg.search}" action="#{AdvancedSearchBean.search}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/apply-template.jsp b/source/web/jsp/dialog/apply-template.jsp
new file mode 100644
index 0000000000..4698496deb
--- /dev/null
+++ b/source/web/jsp/dialog/apply-template.jsp
@@ -0,0 +1,150 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_space_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="document-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/preview_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.apply_dashboard}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.apply_dashboard_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td><h:outputText value="#{msg.template}"/>:</td>
+                                    <td width=100%>
+                                       <%-- Templates drop-down selector --%>
+                                       <h:selectOneMenu value="#{SpaceDetailsBean.template}">
+                                          <f:selectItems value="#{SpaceDetailsBean.templates}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{SpaceDetailsBean.applyTemplate}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="showSpaceDetails" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/checkin-file.jsp b/source/web/jsp/dialog/checkin-file.jsp
new file mode 100644
index 0000000000..7bbc808454
--- /dev/null
+++ b/source/web/jsp/dialog/checkin-file.jsp
@@ -0,0 +1,254 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="org.alfresco.web.app.portlet.AlfrescoFacesPortlet" %>
+<%@ page import="org.alfresco.web.bean.CheckinCheckoutBean" %>
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<r:page titleId="title_checkin_file">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="checkin-file1">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/check_in_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.check_in}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.checkinfile_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td style="padding-top: 4px;">
+                     <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                        <tr>
+                           <td width="7"><img src='<%=request.getContextPath()%>/images/parts/white_01.gif' width=7 height=7 alt=''></td>
+                           <td width="100%" background='<%=request.getContextPath()%>/images/parts/white_02.gif'><img src='<%=request.getContextPath()%>/images/parts/white_02.gif' width=7 height=7 alt=''></td>
+                           <td width="7"><img src='<%=request.getContextPath()%>/images/parts/white_03.gif' width=7 height=7 alt=''></td>
+                           <td rowspan="4" valign="top" style="padding-left:6px;">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.check_in}" action="#{CheckinCheckoutBean.checkinFileOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CheckinCheckoutBean.cancel}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td background='<%=request.getContextPath()%>/images/parts/white_04.gif'><img src='<%=request.getContextPath()%>/images/parts/white_04.gif' width=7 height=7 alt=''></td>
+                           <td>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.checkin_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.version_notes}<br/>" escape="false" rendered="#{CheckinCheckoutBean.versionable}" />
+                                       <h:inputTextarea value="#{CheckinCheckoutBean.versionNotes}" rendered="#{CheckinCheckoutBean.versionable}" rows="2" cols="50" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{CheckinCheckoutBean.minorChange}" />
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.minor_change}" /></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{CheckinCheckoutBean.keepCheckedOut}" />
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.checkin_changes_info}" /></span>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.workingcopy_location}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.which_copy_checkin}" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{CheckinCheckoutBean.copyLocation}" layout="pageDirection">
+                                          <f:selectItem itemValue="current" itemDisabled="#{CheckinCheckoutBean.fileName != null}" itemLabel="#{msg.which_copy_current}" />
+                                          <f:selectItem itemValue="other" itemLabel="#{msg.which_copy_other}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </td>
+                           <td background='<%=request.getContextPath()%>/images/parts/white_06.gif'><img src='<%=request.getContextPath()%>/images/parts/white_06.gif' width=7 height=7 alt=''></td>
+                        </tr>
+                           
+                        </h:form>
+                        
+                        <tr>
+                           <td background='<%=request.getContextPath()%>/images/parts/white_04.gif'><img src='<%=request.getContextPath()%>/images/parts/white_04.gif' width=7 height=7 alt=''></td>
+                           <td>
+                              <r:uploadForm>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%" style="padding-left: 27px;">
+                                 <tr>
+                                    <td>1. <h:outputText value="#{msg.locate_doc_upload}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.file_location}" />:<input style="margin-left:12px;" type="file" size="50" name="alfFileInput"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">2. <h:outputText value="#{msg.click_upload}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <input style="margin-left:12px;" type="submit" value="<%=Application.getMessage(FacesContext.getCurrentInstance(), "upload")%>" />
+                                    </td>
+                                 </tr>
+                                 <%
+                                 CheckinCheckoutBean bean = (CheckinCheckoutBean)session.getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + "CheckinCheckoutBean");
+                                 if (bean == null)
+                                 {
+                                    bean = (CheckinCheckoutBean)session.getAttribute("CheckinCheckoutBean");
+                                 }
+                                 if (bean != null && bean.getFileName() != null) {
+                                 %>
+                                    <tr><td class="paddingRow"></td></tr>
+                                    <tr>
+                                       <td>
+                                          <img alt="" align="absmiddle" src="<%=request.getContextPath()%>/images/icons/info_icon.gif" />
+                                          <%=bean.getFileUploadSuccessMsg()%>
+                                       </td>
+                                    </tr>
+                                 <% } %>
+                              </table>
+                              </r:uploadForm>
+                           </td>
+                           <td background='<%=request.getContextPath()%>/images/parts/white_06.gif'><img src='<%=request.getContextPath()%>/images/parts/white_06.gif' width=7 height=7 alt=''></td>
+                        </tr>
+                        <tr>
+                           <td width="7"><img src='<%=request.getContextPath()%>/images/parts/white_07.gif' width=7 height=7 alt=''></td>
+                           <td width="100%" background='<%=request.getContextPath()%>/images/parts/white_08.gif'><img src='<%=request.getContextPath()%>/images/parts/white_08.gif' width=7 height=7 alt=''></td>
+                           <td width="7"><img src='<%=request.getContextPath()%>/images/parts/white_09.gif' width=7 height=7 alt=''></td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <h:form acceptCharset="UTF-8" id="checkin-file2">
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+               </h:form>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/checkout-file-link.jsp b/source/web/jsp/dialog/checkout-file-link.jsp
new file mode 100644
index 0000000000..3e0448ab62
--- /dev/null
+++ b/source/web/jsp/dialog/checkout-file-link.jsp
@@ -0,0 +1,207 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_checkout_file_link">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="checkout-link">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/check_out_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.check_out_of}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />' Complete</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.checkoutfilelink_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                              <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                 <tr>
+                                    <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                    <td class="mainSubText">
+                                       <h:outputFormat value="#{msg.copy_file_checkedout}">
+                                          <f:param value="#{CheckinCheckoutBean.document.name}" />
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{CheckinCheckoutBean.checkoutFileOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.undocheckout}" action="#{CheckinCheckoutBean.undoCheckout}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputText value="#{msg.edit_workingcopy_title}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText">
+                                       <h:outputText value="#{msg.edit_workingcopy_info}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td style="padding:6px">
+                                       <%-- downloadable file link generated by CheckinCheckoutBean --%>
+                                       <a:actionLink styleClass="title" image="#{CheckinCheckoutBean.workingDocument.properties.fileType32}" value="#{CheckinCheckoutBean.workingDocument.name}" href="#{CheckinCheckoutBean.workingDocument.properties.url}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.download_complete}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputText value="#{msg.continue_working_title}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText">
+                                       <h:outputText value="#{msg.continue_working_info1}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText">
+                                       <h:outputText value="#{msg.continue_working_info2}" /> <img src="<%=request.getContextPath()%>/images/icons/edit_icon.gif" align="absmiddle" width="12" height="16">
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp
new file mode 100644
index 0000000000..2200669926
--- /dev/null
+++ b/source/web/jsp/dialog/checkout-file.jsp
@@ -0,0 +1,192 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_checkout_file">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="checkout-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/check_out_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.check_out}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.checkoutfile_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                              <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                 <tr>
+                                    <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                    <td class="mainSubText">
+                                       <h:outputFormat value="#{msg.copy_work_with}">
+                                          <f:param value="#{CheckinCheckoutBean.document.name}" />
+                                       </h:outputFormat>
+                                       <br>
+                                       <h:outputText value="#{msg.copy_checkin_changes}" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.check_out}" action="#{CheckinCheckoutBean.checkoutFile}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{msg.copy_store_prompt}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{CheckinCheckoutBean.copyLocation}" layout="pageDirection">
+                                          <f:selectItem itemValue="current" itemLabel="#{msg.store_space_current}" />
+                                          <f:selectItem itemValue="other" itemLabel="#{msg.store_space_selected}:" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td style="padding-left:26px">
+                                       <%-- Space selector to allow user to pick a Space --%>
+                                       <r:spaceSelector label="#{msg.select_space_prompt}"
+                                                value="#{CheckinCheckoutBean.selectedSpaceId}"
+                                                initialSelection="#{NavigationBean.currentNodeId}"
+                                                styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/delete-file.jsp b/source/web/jsp/dialog/delete-file.jsp
new file mode 100644
index 0000000000..fbb01aa0d6
--- /dev/null
+++ b/source/web/jsp/dialog/delete-file.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_file">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_file}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_file_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_file_confirm}">
+                                          <f:param value="#{BrowseBean.document.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteFileOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/dialog/delete-rule.jsp b/source/web/jsp/dialog/delete-rule.jsp
new file mode 100644
index 0000000000..4f98bd916f
--- /dev/null
+++ b/source/web/jsp/dialog/delete-rule.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_rule">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_rule}" /> '<h:outputText value="#{RulesBean.currentRule.title}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_rule_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_rule_confirm}">
+                                          <f:param value="#{RulesBean.currentRule.title}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{RulesBean.deleteOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/dialog/delete-space.jsp b/source/web/jsp/dialog/delete-space.jsp
new file mode 100644
index 0000000000..f482acc96e
--- /dev/null
+++ b/source/web/jsp/dialog/delete-space.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_space">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_space}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_space_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_space_confirm}">
+                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
new file mode 100644
index 0000000000..93184e0708
--- /dev/null
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -0,0 +1,472 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_file_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="document-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">
+                                 <h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'<r:lockIcon value="#{DocumentDetailsBean.document.nodeRef}" align="absmiddle" />
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{DocumentDetailsBean.document.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.documentdetails_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" />
+                              
+                              <%-- checkin, checkout and undo checkout --%>
+                              <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="CheckOut">
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
+                                    <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" padding="4"
+                                                  actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                              </r:permissionEvaluator>
+                              
+                              <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.checkIn == true}">
+                                 <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" padding="4"
+                                               actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkinFile">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              
+                              <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.cancelCheckOut == true}">
+                                 <a:actionLink value="#{msg.undocheckout}" image="/images/icons/undo_checkout.gif" padding="4" 
+                                               actionListener="#{CheckinCheckoutBean.setupContentAction}" action="undoCheckoutFile">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              
+                              <%-- approve and reject --%>
+                              <a:booleanEvaluator value="#{DocumentDetailsBean.approveStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
+                                 <a:actionLink value="#{DocumentDetailsBean.approveStepName}" image="/images/icons/approve.gif" padding="4"
+                                               actionListener="#{DocumentDetailsBean.approve}" action="browse">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              <a:booleanEvaluator value="#{DocumentDetailsBean.rejectStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
+                                 <a:actionLink value="#{DocumentDetailsBean.rejectStepName}" image="/images/icons/reject.gif" padding="4"
+                                               actionListener="#{DocumentDetailsBean.reject}" action="browse">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                              </a:booleanEvaluator>
+                              
+                              <a:menu itemSpacing="4" image="/images/icons/more.gif" menuStyleClass="moreActionsMenu"
+                                      label="#{msg.more_options}" tooltip="#{msg.more_options_file}" style="padding-left:20px">
+                                 <%-- edit and update --%>
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
+                                    <a:booleanEvaluator value="#{(DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false) || DocumentDetailsBean.owner == true}">
+                                       <a:actionLink value="#{msg.edit}" image="/images/icons/edit_icon.gif"
+                                                     actionListener="#{CheckinCheckoutBean.editFile}">
+                                          <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                       </a:actionLink>
+                                       <a:actionLink value="#{msg.update}" image="/images/icons/update.gif"
+                                                     actionListener="#{CheckinCheckoutBean.setupContentAction}" action="updateFile">
+                                          <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                       </a:actionLink>
+                                    </a:booleanEvaluator>
+                                 </r:permissionEvaluator>
+                                 
+                                 <%-- cut --%>
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Delete">
+                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif"
+                                                  actionListener="#{ClipboardBean.cutNode}">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 
+                                 <%-- copy --%>
+                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif"
+                                               actionListener="#{ClipboardBean.copyNode}">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                                    
+                                 <%-- delete --%>
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Delete">
+                                    <a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
+                                       <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif"
+                                                     actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
+                                          <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                       </a:actionLink>
+                                    </a:booleanEvaluator>
+                                 </r:permissionEvaluator>
+                                 
+                                 <%-- Take Ownership --%>
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="TakeOwnership">
+                                    <a:actionLink value="#{msg.take_ownership}" image="/images/icons/take_ownership.gif" actionListener="#{DocumentDetailsBean.takeOwnership}" id="takeOwnership" />
+                                 </r:permissionEvaluator>
+                                 
+                                 <%-- create shortcut --%>
+                                 <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                                 
+                                 <%-- custom action --%>
+                                 <a:actionLink value="#{msg.other_action}" image="/images/icons/action.gif" action="createAction" actionListener="#{NewActionWizard.startWizard}" />
+                              </a:menu>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <a:panel label="#{msg.view_links}" id="preview-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE"
+                                       expanded='#{DocumentDetailsBean.panels["preview-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+                                    <tr>
+                                       <td>
+                                          <a:actionLink value="#{msg.view_in_browser}" href="#{DocumentDetailsBean.browserUrl}" target="new" id="link1" />
+                                       </td>
+                                       <td>
+                                          <a:actionLink value="#{msg.view_in_webdav}" href="#{DocumentDetailsBean.webdavUrl}" target="new" id="link2" />
+                                       </td>
+                                       <td>
+                                          <a:actionLink value="#{msg.view_in_cifs}" href="#{DocumentDetailsBean.cifsPath}" target="new" id="link3" />
+                                       </td>
+                                    </tr>
+                                    <tr>
+                                       <td>
+                                          <a:actionLink value="#{msg.download_content}" href="#{DocumentDetailsBean.downloadUrl}" target="new" id="link4" />
+                                       </td>
+                                       <td>
+                                          <a:actionLink value="#{msg.details_page_bookmark}" href="#{DocumentDetailsBean.bookmarkUrl}" target="new" id="link5" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <br/>
+                              
+                              <h:panelGroup id="props-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
+                                       <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editDocProperties" actionListener="#{EditDocPropsDialog.setupDocumentForAction}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:panelGroup>
+                              <a:panel label="#{msg.properties}" id="properties-panel" facetsId="props-panel-facets" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE"
+                                       rendered="#{DocumentDetailsBean.locked == false}"
+                                       expanded='#{DocumentDetailsBean.panels["properties-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the doc --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <a:actionLink id="doc-logo1" value="#{DocumentDetailsBean.name}" href="#{DocumentDetailsBean.url}" target="new" image="#{DocumentDetailsBean.document.properties.fileType32}" showLink="false" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <%-- properties for the doc --%>
+                                          <r:propertySheetGrid id="document-props" value="#{DocumentDetailsBean.document}" var="documentProps" 
+                                                      columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                      externalConfig="true" />
+                                          <h:outputText id="no-inline-msg" value="<br/>#{msg.not_inline_editable}<br/><br/>"
+                                               rendered="#{DocumentDetailsBean.inlineEditable == false}" escape="false" />
+                                          <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write" id="eval_inline">
+                                             <a:actionLink id="make-inline" value="#{msg.allow_inline_editing}" 
+                                                  action="#{DocumentDetailsBean.applyInlineEditable}"
+                                                  rendered="#{DocumentDetailsBean.inlineEditable == false}" />
+                                          </r:permissionEvaluator>
+                                          <h:messages globalOnly="true" id="props-msgs" styleClass="errorMessage" layout="table" />
+                                          <h:message for="takeOwnership" styleClass="statusMessage" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <br/>
+                              
+                              <a:panel label="#{msg.properties}" id="properties-panel-locked" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" rendered="#{DocumentDetailsBean.locked}"
+                                       expanded='#{DocumentDetailsBean.panels["properties-panel-locked"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the doc --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <a:actionLink id="doc-logo2" value="#{DocumentDetailsBean.name}" href="#{DocumentDetailsBean.url}" target="new" image="#{DocumentDetailsBean.document.properties.fileType32}" showLink="false" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <r:propertySheetGrid id="document-props-locked" value="#{DocumentDetailsBean.document}" var="documentProps" 
+                                                      columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                      externalConfig="true" />
+                                          <h:outputText id="no-inline-msg2" value="<br/>#{msg.not_inline_editable}<br/>"
+                                               rendered="#{DocumentDetailsBean.inlineEditable == false}" escape="false" />
+                                          <h:messages id="props-locked-msgs" styleClass="errorMessage" layout="table" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <h:panelGroup id="workflow-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
+                                       <a:actionLink id="titleLink2" value="#{msg.workflow}" showLink="false" image="/images/icons/Change_details.gif" action="editSimpleWorkflow" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:panelGroup>
+                              <a:panel label="#{msg.workflow}" id="workflow-panel" facetsId="workflow-panel-facets" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" rendered="#{DocumentDetailsBean.approveStepName != null}"
+                                       expanded='#{DocumentDetailsBean.panels["workflow-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <h:outputText id="workflow-overview" value="#{DocumentDetailsBean.workflowOverviewHTML}" 
+                                               escape="false" />
+                              </a:panel>
+                              <a:panel label="#{msg.workflow}" id="no-workflow-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" rendered="#{DocumentDetailsBean.approveStepName == null}"
+                                       expanded='#{DocumentDetailsBean.panels["workflow-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <h:outputText id="no-workflow-msg" value="#{msg.not_in_workflow}" />
+                              </a:panel>
+                              
+                              <br/>
+                              
+                              <h:panelGroup id="category-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
+                                       <a:actionLink id="titleLink3" value="#{msg.change_category}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editCategories" actionListener="#{DocumentDetailsBean.setupCategoriesForEdit}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:panelGroup>
+                              <a:panel label="#{msg.category}" id="category-panel" facetsId="category-panel-facets" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" rendered="#{DocumentDetailsBean.categorised}"
+                                       expanded='#{DocumentDetailsBean.panels["category-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <h:outputText id="category-overview" value="#{DocumentDetailsBean.categoriesOverviewHTML}" 
+                                               escape="false" />
+                              </a:panel>
+                              <a:panel label="#{msg.category}" id="no-category-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE"
+                                       rendered="#{DocumentDetailsBean.categorised == false}"
+                                       expanded='#{DocumentDetailsBean.panels["category-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <h:outputText id="no-category-msg" value="#{msg.not_in_category}<br/><br/>" 
+                                               escape="false"/>
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write" id="eval_cat">
+                                    <a:actionLink id="make-classifiable" value="#{msg.allow_categorization}" 
+                                                  action="#{DocumentDetailsBean.applyClassifiable}"
+                                                  rendered="#{DocumentDetailsBean.locked == false}" />
+                                 </r:permissionEvaluator>
+                              </a:panel>
+                              
+                              <br/>
+                              
+                              <a:panel label="#{msg.version_history}" id="version-history-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" rendered="#{DocumentDetailsBean.versionable}"
+                                       expanded='#{DocumentDetailsBean.panels["version-history-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 
+                                 <a:richList id="versionHistoryList" viewMode="details" value="#{DocumentDetailsBean.versionHistory}" 
+                                             var="r" styleClass="recordSet" headerStyleClass="recordSetHeader" 
+                                             rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" 
+                                             pageSize="10" initialSortColumn="versionLabel" initialSortDescending="false">
+                                    
+                                    <%-- Primary column for details view mode --%>
+                                    <a:column id="col1" primary="true" width="100" style="padding:2px;text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.version}" value="versionLabel" mode="case-insensitive" styleClass="header"/>
+                                       </f:facet>
+                                       <a:actionLink id="label" value="#{r.versionLabel}" href="#{r.url}" target="new" />
+                                    </a:column>
+                                    
+                                    <%-- Version notes columns --%>
+                                    <a:column id="col2" width="200" style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.notes}" value="notes" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="notes" value="#{r.notes}" />
+                                    </a:column>
+                                    
+                                    <%-- Description columns --%>
+                                    <a:column id="col3" style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.author}" value="author" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="author" value="#{r.author}" />
+                                    </a:column>
+                                    
+                                    <%-- Created Date column for details view mode --%>
+                                    <a:column id="col4" style="text-align:left; white-space:nowrap">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.date}" value="versionDate" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="date" value="#{r.versionDate}">
+                                          <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                                       </h:outputText>
+                                    </a:column>
+                                    
+                                    <%-- view the contents of the specific version --%>
+                                    <a:column id="col5" style="text-align: left">
+                                       <f:facet name="header">
+                                          <h:outputText value="#{msg.actions}"/>
+                                       </f:facet>
+                                       <a:actionLink id="view-link" value="View" href="#{r.url}" target="new" />
+                                    </a:column>
+              
+                                    <a:dataPager styleClass="pager" />
+                                 </a:richList>
+                              </a:panel>
+                              <a:panel label="#{msg.version_history}" id="no-version-history-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE"
+                                       rendered="#{DocumentDetailsBean.versionable == false}"
+                                       expanded='#{DocumentDetailsBean.panels["version-history-panel"]}' expandedActionListener="#{DocumentDetailsBean.expandPanel}">
+                                 <h:outputText id="no-history-msg" value="#{msg.not_versioned}<br/><br/>" 
+                                               escape="false" />
+                                 <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write" id="eval_ver">
+                                    <a:actionLink id="make-versionable" value="#{msg.allow_versioning}"
+                                                  action="#{DocumentDetailsBean.applyVersionable}" 
+                                                  rendered="#{DocumentDetailsBean.locked == false}" />
+                                 </r:permissionEvaluator>
+                              </a:panel>
+                              <br/>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-category.jsp b/source/web/jsp/dialog/edit-category.jsp
new file mode 100644
index 0000000000..ee29e133a9
--- /dev/null
+++ b/source/web/jsp/dialog/edit-category.jsp
@@ -0,0 +1,168 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_categories">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.modify_categories_of}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editcategory_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.categories}" />:</td>
+                                    <td width="98%">
+                                       <r:multiValueListEditor value="#{DocumentDetailsBean.categories}"
+                                                               lastItemAdded="#{DocumentDetailsBean.addedCategory}" 
+                                                               selectItemMsg="#{msg.select_category}"
+                                                               selectedItemsMsg="#{msg.selected_categories}"
+                                                               noSelectedItemsMsg="#{msg.no_selected_categories}"
+                                                               styleClass="selector">
+                                          <r:categorySelector label="#{msg.select_category_prompt}" styleClass="selector"
+                                                              value="#{DocumentDetailsBean.addedCategory}"/>
+                                       </r:multiValueListEditor>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{DocumentDetailsBean.saveCategories}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-document-properties.jsp b/source/web/jsp/dialog/edit-document-properties.jsp
new file mode 100644
index 0000000000..8afc9c43fc
--- /dev/null
+++ b/source/web/jsp/dialog/edit-document-properties.jsp
@@ -0,0 +1,219 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_doc_props">
+
+<script language="JavaScript1.2">
+   function checkButtonState()
+   {
+      if (document.getElementById("edit-doc-properties:file-name").value.length == 0 ||
+          document.getElementById("edit-doc-properties:title").value.length == 0)
+      {
+         document.getElementById("edit-doc-properties:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("edit-doc-properties:ok-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-doc-properties">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/details_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editdocument_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.document_properties}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.file_name}" />:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputText id="file-name" value="#{EditDocPropsDialog.properties.name}" size="35" maxlength="1024"
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.content_type}" />:</nobr></td>
+                                    <td>
+                                       <h:selectOneMenu value="#{EditDocPropsDialog.properties.mimetype}">
+                                          <f:selectItems value="#{EditDocPropsDialog.contentTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.title}" />:</nobr></td>
+                                    <td>
+                                       <h:inputText id="title" value="#{EditDocPropsDialog.properties.title}" size="35" maxlength="1024"
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.description}" />:</nobr></td>
+                                    <td>
+                                       <h:inputText value="#{EditDocPropsDialog.properties.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.author}" />:</nobr></td>
+                                    <td>
+                                       <h:inputText value="#{EditDocPropsDialog.properties.creator}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.other_properties}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <r:propertySheetGrid id="document-props" value="#{EditDocPropsDialog.editableNode}" 
+                                                            var="editDocProps" columns="1" 
+                                                            rendered="#{EditDocPropsDialog.otherPropertiesPresent}"
+                                                            externalConfig="true" configArea="edit-properties" />
+                                       <h:outputText value="#{msg.no_other_properties}" 
+                                                     rendered="#{EditDocPropsDialog.otherPropertiesPresent == false}" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{EditDocPropsDialog.save}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-file.jsp b/source/web/jsp/dialog/edit-file.jsp
new file mode 100644
index 0000000000..5c174e9119
--- /dev/null
+++ b/source/web/jsp/dialog/edit-file.jsp
@@ -0,0 +1,192 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_file">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="edit-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="26">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editfile_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputText value="#{msg.edit_file_title}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText">
+                                       <h:outputFormat value="#{msg.edit_file_prompt}">
+                                          <f:param value="#{CheckinCheckoutBean.document.name}" />
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td style="padding:10px" valign="middle">
+                                       <%-- downloadable file link generated by CheckinCheckoutBean --%>
+                                       <a:actionLink styleClass="title" image="#{CheckinCheckoutBean.document.properties.fileType32}" value="#{CheckinCheckoutBean.document.name}" href="#{CheckinCheckoutBean.document.properties.url}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.edit_download_complete}" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <%-- Hide the checkout info if this document is already checked out --%>
+                                 <a:panel id="checkout-panel" rendered="#{CheckinCheckoutBean.document.properties.workingCopy == false}">
+                                    <tr><td class="paddingRow"></td></tr>
+                                    <tr>
+                                       <td class="mainSubTitle">
+                                          <h:outputText value="#{msg.checkout_file_title}" />
+                                       </td>
+                                    </tr>
+                                    <tr>
+                                       <td>
+                                          <h:outputText value="#{msg.checkout_you_may_want}" />
+                                          <div class="mainSubText" style="padding-top:6px;padding-left:2px">
+                                             <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
+                                                <f:param name="id" value="#{CheckinCheckoutBean.document.id}" />
+                                             </a:actionLink>
+                                          </div>
+                                          <div class="mainSubText" style="padding-top:6px"><h:outputText value="#{msg.checkout_hint1}" /></div>
+                                          <div class="mainSubText"><h:outputText value="#{msg.checkout_hint2}" /></div>
+                                       </td>
+                                    </tr>
+                                 </a:panel>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="#{CheckinCheckoutBean.editFileOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-html-inline.jsp b/source/web/jsp/dialog/edit-html-inline.jsp
new file mode 100644
index 0000000000..40df9d3404
--- /dev/null
+++ b/source/web/jsp/dialog/edit-html-inline.jsp
@@ -0,0 +1,205 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_html_inline">
+
+<script language="javascript" type="text/javascript" src="<%=request.getContextPath()%>/scripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+
+   <%-- Init the Tiny MCE in-line HTML editor --%>
+   tinyMCE.init({
+   	theme : "advanced",
+   	mode : "exact",
+   	elements : "editor",
+   	save_callback : "saveContent",
+		plugins : "table",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "left",
+		theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+		theme_advanced_buttons2_add : "separator,forecolor,backcolor",
+		theme_advanced_buttons3_add_before : "tablecontrols,separator",
+		theme_advanced_disable: "styleselect",
+		extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]"
+   });
+   
+   function saveContent(id, content)
+   {
+      document.forms['edit-file']['edit-file:editorOutput'].value = content;
+   }
+   
+</script>
+
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editfileinline_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="100%">
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- Hide the checkout info if this document is already checked out --%>
+                              <a:panel id="checkout-panel" rendered="#{CheckinCheckoutBean.document.properties.workingCopy == false}">
+                                 <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                 <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                    <tr>
+                                       <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                       <td><td class="mainSubText">
+                                             <h:outputText value="#{msg.you_may_want}" />
+                                             <a:actionLink value="#{msg.checkout_document}" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
+                                                <f:param name="id" value="#{CheckinCheckoutBean.document.id}" />
+                                             </a:actionLink>
+                                             <h:outputText value="#{msg.checkout_want_to}" />
+                                             <br>
+                                             <h:outputText value="#{msg.checkout_warn}" />
+                                          </td>
+                                       </td>
+                                    </tr>
+                                 </table>
+                                 <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                              </a:panel>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.save}" action="#{CheckinCheckoutBean.editInlineOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        
+                        <%-- Inline editor --%>
+                        <tr>
+                           <td width="100%" valign="top" height="100%">
+                              <div id='editor' style='width:100%; height:360px'>
+                                 <h:outputText value="#{CheckinCheckoutBean.documentContent}" escape="false" />
+                              </div>
+                              <h:inputHidden id="editorOutput" value="#{CheckinCheckoutBean.editorOutput}" />
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-simple-workflow.jsp b/source/web/jsp/dialog/edit-simple-workflow.jsp
new file mode 100644
index 0000000000..402053b101
--- /dev/null
+++ b/source/web/jsp/dialog/edit-simple-workflow.jsp
@@ -0,0 +1,290 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_simple_workflow">
+
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("edit-simple-workflow:approve-step-name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("edit-simple-workflow:approve-step-name").value.length == 0 ||
+          document.getElementById("edit-simple-workflow:client-approve-folder_selected").value.length == 0 ||
+          rejectValid() == false)
+      {
+         document.getElementById("edit-simple-workflow:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("edit-simple-workflow:ok-button").disabled = false;
+      }
+   }
+   
+   function rejectValid()
+   {
+      var result = true;
+      
+      if (document.forms['edit-simple-workflow']['edit-simple-workflow:reject-step-present'][0].checked && 
+          (document.getElementById("edit-simple-workflow:reject-step-name").value.length == 0 ||
+           document.getElementById("edit-simple-workflow:client-reject-folder_selected").value.length == 0))
+      {
+         result = false;
+      }
+      
+      return result;
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-simple-workflow">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.modify_workflow_props}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editworkflow_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.approve_flow}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.name_approve_step}" />:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputText id="approve-step-name" value="#{DocumentDetailsBean.workflowProperties.approveStepName}" 
+                                                    onkeyup="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr><td colspan="2"><h:outputText value="#{msg.choose_copy_move_location}" /></td>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="2" cellspacing="2" border="0">
+                                          <tr>
+                                             <td valign="top">
+                                                <h:selectOneRadio value="#{DocumentDetailsBean.workflowProperties.approveAction}">
+                                                   <f:selectItem itemValue="move" itemLabel="Move" />
+                                                   <f:selectItem itemValue="copy" itemLabel="Copy" />
+                                                </h:selectOneRadio>
+                                             </td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td valign="top" style="padding-top:10px;"><h:outputText value="#{msg.to}" />:</td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td style="padding-top:6px;">
+                                                <r:spaceSelector id="client-approve-folder" label="#{msg.select_destination_prompt}"
+                                                        value="#{DocumentDetailsBean.workflowProperties.approveFolder}"
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.reject_flow}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.select_reject_step}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio id="reject-step-present" value="#{DocumentDetailsBean.workflowProperties.rejectStepPresent}"
+                                                         onclick="javascript:checkButtonState();">
+                                          <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
+                                          <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="0" cellspacing="0" border="0">
+                                          <tr>
+                                             <td style="padding-left:24px;"></td>
+                                             <td>
+                                                <table cellpadding="2" cellspacing="2" border="0">
+                                                   <tr>
+                                                      <td><nobr>
+                                                         <h:outputText value="#{msg.name_reject_step}" />:&nbsp;
+                                                         <h:inputText id="reject-step-name" value="#{DocumentDetailsBean.workflowProperties.rejectStepName}" 
+                                                                      onkeyup="javascript:checkButtonState();" />
+                                                      </nobr></td>
+                                                   </tr>
+                                                   <tr><td class="paddingRow"></td></tr>
+                                                   <tr><td><h:outputText value="#{msg.choose_copy_move_location}" /></td>
+                                                   <tr>
+                                                      <td>
+                                                         <table cellpadding="2" cellspacing="2" border="0">
+                                                            <tr>
+                                                               <td valign="top">
+                                                                  <h:selectOneRadio value="#{DocumentDetailsBean.workflowProperties.rejectAction}">
+                                                                     <f:selectItem itemValue="move" itemLabel="#{msg.move}" />
+                                                                     <f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
+                                                                  </h:selectOneRadio>
+                                                               </td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td valign="top" style="padding-top:10px;"><h:outputText value="#{msg.to}" />:</td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td style="padding-top:6px;">
+                                                                  <r:spaceSelector id="client-reject-folder" 
+                                                                          label="#{msg.select_destination_prompt}" 
+                                                                          value="#{DocumentDetailsBean.workflowProperties.rejectFolder}" 
+                                                                          initialSelection="#{NavigationBean.currentNodeId}"
+                                                                          styleClass="selector"/>
+                                                               </td>
+                                                            </tr>
+                                                         </table>
+                                                      </td>
+                                                   </tr>
+                                                </table>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{DocumentDetailsBean.saveWorkflow}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{DocumentDetailsBean.cancelWorkflowEdit}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-space.jsp b/source/web/jsp/dialog/edit-space.jsp
new file mode 100644
index 0000000000..055e68c85d
--- /dev/null
+++ b/source/web/jsp/dialog/edit-space.jsp
@@ -0,0 +1,195 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_space">
+
+<script language="JavaScript1.2">
+   function checkButtonState()
+   {
+      if (document.getElementById("edit-space:name").value.length == 0)
+      {
+         document.getElementById("edit-space:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("edit-space:ok-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+   <h:form acceptCharset="UTF-8" id="edit-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editspace_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_space_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.space_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td>
+                                       <h:inputText id="name" value="#{EditSpaceDialog.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{EditSpaceDialog.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.other_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.choose_space_icon}" />:</td>
+                                    <td>
+                                       <table border="0" cellpadding="0" cellspacing="0"><tr><td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{EditSpaceDialog.icon}">
+                                          <a:listItem value="space-icon-default" image="/images/icons/space-icon-default.gif" />
+                                          <a:listItem value="space-icon-star" image="/images/icons/space-icon-star.gif" />
+                                          <a:listItem value="space-icon-doc" image="/images/icons/space-icon-doc.gif" />
+                                          <a:listItem value="space-icon-pen" image="/images/icons/space-icon-pen.gif" />
+                                          <a:listItem value="space-icon-cd" image="/images/icons/space-icon-cd.gif" />
+                                          <a:listItem value="space-icon-image" image="/images/icons/space-icon-image.gif" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                       </td></tr></table>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{EditSpaceDialog.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{EditSpaceDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/edit-text-inline.jsp b/source/web/jsp/dialog/edit-text-inline.jsp
new file mode 100644
index 0000000000..c9d6882f16
--- /dev/null
+++ b/source/web/jsp/dialog/edit-text-inline.jsp
@@ -0,0 +1,175 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_edit_text_inline">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="edit-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.editfileinline_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="100%">
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- Hide the checkout info if this document is already checked out --%>
+                              <a:panel id="checkout-panel" rendered="#{CheckinCheckoutBean.document.properties.workingCopy == false}">
+                                 <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                 <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                    <tr>
+                                       <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                       <td><td class="mainSubText">
+                                             <h:outputText value="#{msg.you_may_want}" />
+                                             <a:actionLink value="#{msg.checkout_document}" actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
+                                                <f:param name="id" value="#{CheckinCheckoutBean.document.id}" />
+                                             </a:actionLink>
+                                             <h:outputText value="#{msg.checkout_want_to}" />
+                                             <br>
+                                             <h:outputText value="#{msg.checkout_warn}" />
+                                          </td>
+                                       </td>
+                                    </tr>
+                                 </table>
+                                 <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                              </a:panel>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.save}" action="#{CheckinCheckoutBean.editInlineOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        
+                        <%-- Inline editor --%>
+                        <tr>
+                           <td width="100%" valign="top" height="100%">
+                              <h:inputTextarea id="textArea" rows="20" cols="80" value="#{CheckinCheckoutBean.editorOutput}" />
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/export.jsp b/source/web/jsp/dialog/export.jsp
new file mode 100644
index 0000000000..f59fa523b6
--- /dev/null
+++ b/source/web/jsp/dialog/export.jsp
@@ -0,0 +1,237 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_export">
+
+<script language="JavaScript1.2">
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("export-form:package-name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("export-form:package-name").value.length == 0 ||
+          document.getElementById("export-form:destination_selected").value.length == 0)
+      {
+         document.getElementById("export-form:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("export-form:ok-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="export-form">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                        	<td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/export_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainSubTitle"><h:outputText value="#{msg.export}"/></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.export_info}"/></div>
+                           </td>
+                        </tr>
+                     </table>
+
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_export_all}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.package_name}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputText id="package-name" value="#{ExportDialog.packageName}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.destination}"/>:</nobr></td>
+                                    <td>
+                                       <r:spaceSelector id="destination" label="#{msg.select_destination_prompt}" 
+                                                        value="#{ExportDialog.destination}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.export_from}"/>:</nobr></td>
+                                    <td>
+                                       <h:selectOneRadio value="#{ExportDialog.mode}" layout="pageDirection">
+                                          <f:selectItem itemValue="current" itemLabel="#{msg.current_space}" />
+                                          <f:selectItem itemValue="all" itemLabel="#{msg.all_spaces}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.encoding}"/>:</nobr></td>
+                                    <td>
+                                       <h:selectOneMenu value="#{ExportDialog.encoding}">
+                                          <f:selectItems value="#{NewRuleWizard.encodings}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{ExportDialog.includeChildren}"/>&nbsp;
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.include_children}"/></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{ExportDialog.includeSelf}"/>&nbsp;
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.include_self}"/></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{ExportDialog.runInBackground}" />&nbsp;
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.run_export_in_background}"/></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <div id="error-info" style="padding-left: 24px;">
+                                          <h:graphicImage alt="" value="/images/icons/info_icon.gif" style="vertical-align: middle;"/>&nbsp;
+                                          <h:outputText value="#{msg.export_error_info}"/>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{ExportDialog.export}" 
+                                                        disabled="true" styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{ExportDialog.cancel}" 
+                                                        styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/import.jsp b/source/web/jsp/dialog/import.jsp
new file mode 100644
index 0000000000..e363d85725
--- /dev/null
+++ b/source/web/jsp/dialog/import.jsp
@@ -0,0 +1,207 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="org.alfresco.web.bean.ImportBean" %>
+<%@ page import="org.alfresco.web.app.portlet.AlfrescoFacesPortlet" %>
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<r:page titleId="title_import">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="import-form">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/import_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.import}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.import_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+                              
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           </h:form>
+                        
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_import_all}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">1. <h:outputText value="#{msg.locate_document}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <r:uploadForm>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.location}"/>:<input style="margin-left:12px;" type="file" size="50" name="alfFileInput"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">2. <h:outputText value="#{msg.click_upload}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <input style="margin-left:12px;" type="submit" value="<%=Application.getMessage(FacesContext.getCurrentInstance(), "upload")%>" />
+                                    </td>
+                                 </tr>
+                                 </r:uploadForm>
+                                 
+                                 <h:form acceptCharset="UTF-8" id="import-upload-end">
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <%
+                                 ImportBean bean = (ImportBean)session.getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + "ImportDialog");
+                                 if (bean == null)
+                                 {
+                                    bean = (ImportBean)session.getAttribute("ImportDialog");
+                                 }
+                                 if (bean != null && bean.getFileName() != null) {
+                                 %>
+                                    <tr>
+                                       <td>
+                                          <img alt="" align="absmiddle" src="<%=request.getContextPath()%>/images/icons/info_icon.gif" />
+                                          <%=bean.getFileUploadSuccessMsg()%>
+                                       </td>
+                                    </tr>
+                                 <% } %>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{ImportDialog.runInBackground}" />&nbsp;
+                                       <span style="vertical-align:20%">3. <h:outputText value="#{msg.run_import_in_background}"/></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <div id="error-info" style="padding-left: 24px;">
+                                          <h:graphicImage alt="" value="/images/icons/info_icon.gif" style="vertical-align: middle;"/>&nbsp;
+                                          <h:outputText value="#{msg.import_error_info}"/>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{ImportDialog.performImport}" 
+                                                        styleClass="wizardButton" disabled="#{ImportDialog.fileName == null}"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{ImportDialog.cancel}" 
+                                                        styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+  </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/new-space.jsp b/source/web/jsp/dialog/new-space.jsp
new file mode 100644
index 0000000000..5212390eb0
--- /dev/null
+++ b/source/web/jsp/dialog/new-space.jsp
@@ -0,0 +1,210 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_space">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("new-space:name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("new-space:name").value.length == 0 )
+      {
+         document.getElementById("new-space:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-space:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.new_space}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.newspace_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_space_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.space_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td>
+                                       <h:inputText id="name" value="#{NewSpaceDialog.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();"/>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{NewSpaceDialog.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.other_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.choose_space_icon}" />:</td>
+                                    <td>
+                                       <table border="0" cellpadding="0" cellspacing="0"><tr><td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{NewSpaceDialog.icon}">
+                                          <a:listItem value="space-icon-default" image="/images/icons/space-icon-default.gif" />
+                                          <a:listItem value="space-icon-star" image="/images/icons/space-icon-star.gif" />
+                                          <a:listItem value="space-icon-doc" image="/images/icons/space-icon-doc.gif" />
+                                          <a:listItem value="space-icon-pen" image="/images/icons/space-icon-pen.gif" />
+                                          <a:listItem value="space-icon-cd" image="/images/icons/space-icon-cd.gif" />
+                                          <a:listItem value="space-icon-image" image="/images/icons/space-icon-image.gif" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                       </td></tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_space_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.new_space}" action="#{NewSpaceDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{NewSpaceDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/preview-file.jsp b/source/web/jsp/dialog/preview-file.jsp
new file mode 100644
index 0000000000..693ebb6640
--- /dev/null
+++ b/source/web/jsp/dialog/preview-file.jsp
@@ -0,0 +1,172 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_file_preview">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="preview-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/preview_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">
+                                 <h:outputText value="#{msg.preview_of}" /> '<h:outputText value="#{DocumentPreviewBean.name}" />'<r:lockIcon value="#{DocumentPreviewBean.node.nodeRef}" align="absmiddle" />
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Available Templates --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
+                              
+                              <div style="padding-top:4px">
+                                 <%-- Templates drop-down selector --%>
+                                 <h:selectOneMenu id="template" value="#{DocumentPreviewBean.template}" onchange="document.forms['preview-file'].submit(); return true;">
+                                    <f:selectItems value="#{DocumentPreviewBean.templates}" />
+                                 </h:selectOneMenu>
+                              </div>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{DocumentPreviewBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{DocumentPreviewBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Preview area --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <%-- Template component --%>
+                           <td width="100%" valign="top">
+                              
+                              <%-- Get current template noderef and bind current document as model --%>
+                              <r:template template="#{DocumentPreviewBean.templateRef}" model="#{DocumentPreviewBean.templateModel}" />
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/dialog/preview-space.jsp b/source/web/jsp/dialog/preview-space.jsp
new file mode 100644
index 0000000000..8120d2150c
--- /dev/null
+++ b/source/web/jsp/dialog/preview-space.jsp
@@ -0,0 +1,172 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_file_preview">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="preview-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/preview_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle">
+                                 <h:outputText value="#{msg.preview_of}" /> '<h:outputText value="#{SpacePreviewBean.name}" />'<r:lockIcon value="#{SpacePreviewBean.node.nodeRef}" align="absmiddle" />
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Available Templates --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
+                              
+                              <div style="padding-top:4px">
+                                 <%-- Templates drop-down selector --%>
+                                 <h:selectOneMenu id="template" value="#{SpacePreviewBean.template}" onchange="document.forms['preview-space'].submit(); return true;">
+                                    <f:selectItems value="#{SpacePreviewBean.templates}" />
+                                 </h:selectOneMenu>
+                              </div>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{SpacePreviewBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{SpacePreviewBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Preview area --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <%-- Template component --%>
+                           <td width="100%" valign="top">
+                              
+                              <%-- Get current template noderef and bind current document as model --%>
+                              <r:template template="#{SpacePreviewBean.templateRef}" model="#{SpacePreviewBean.templateModel}" />
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp
new file mode 100644
index 0000000000..6fcd1257b2
--- /dev/null
+++ b/source/web/jsp/dialog/rules.jsp
@@ -0,0 +1,259 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_rules">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="document-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.content_rules}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.space_rules_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width="100" style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
+                              <a:actionLink value="#{msg.create_rule}" image="/images/icons/new_rule.gif" padding="4" action="createRule" actionListener="#{NewRuleWizard.startWizard}" />
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width="125" style="padding-left:2px">
+                              <%-- Filters --%>
+                              <h:outputText style="padding-left:26px;padding-bottom:4px;" styleClass="mainSubTitle" value="#{msg.filter_contents}" /><br/>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight"
+                                    value="#{RulesBean.viewMode}" actionListener="#{RulesBean.viewModeChanged}" 
+                                    selectedImage="/images/icons/Details.gif">
+                                 <a:listItem value="inherited" label="#{msg.inherited}" />
+                                 <a:listItem value="local" label="#{msg.local}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <%-- Rules List --%>
+                              <a:panel id="rules-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.rules}">
+                              
+                              <a:richList id="rulesList" viewMode="details" value="#{RulesBean.rules}" var="r"
+                                          styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
+                                          altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
+                                          initialSortColumn="title" initialSortDescending="true"
+                                          binding="#{RulesBean.richList}">
+                        
+                                 <%-- Primary column for details view mode --%>
+                                 <a:column primary="true" width="200" style="padding:2px;text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.title}" value="title" mode="case-insensitive" styleClass="header"/>
+                                    </f:facet>
+                                    <f:facet name="small-icon">
+                                       <h:panelGroup>
+                                          <a:booleanEvaluator value="#{r.local}">
+                                             <a:actionLink value="#{r.title}" image="/images/icons/rule.gif" 
+                                                           actionListener="#{NewRuleWizard.startWizardForEdit}" action="editRule"
+                                                           showLink="false">
+                                                <f:param name="id" value="#{r.id}" />
+                                             </a:actionLink>
+                                          </a:booleanEvaluator>
+                                          <a:booleanEvaluator value="#{r.local == false}">
+                                             <h:graphicImage value="/images/icons/rule.gif" title="#{r.title}" style="vertical-align: middle"/>
+                                          </a:booleanEvaluator>
+                                       </h:panelGroup>
+                                    </f:facet>
+                                    <a:booleanEvaluator value="#{r.local}">
+                                       <a:actionLink value="#{r.title}" actionListener="#{NewRuleWizard.startWizardForEdit}" 
+                                                     action="editRule">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                    </a:booleanEvaluator>
+                                    <a:booleanEvaluator value="#{r.local == false}">
+                                       <h:outputText value="#{r.title}"/>
+                                    </a:booleanEvaluator>
+                                 </a:column>
+                                 
+                                 <%-- Description column --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.description}" />
+                                 </a:column>
+                                 
+                                 <%-- Column to show whether the rule is local --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.local}" value="local" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.local}" >
+                                       <a:convertBoolean/>
+                                    </h:outputText>
+                                 </a:column>
+                                 
+                                 <%-- Created Date column for details view mode --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.created_date}" value="createdDate" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.createdDate}">
+                                       <a:convertXMLDate type="both" dateStyle="long" timeStyle="short" />
+                                    </h:outputText>
+                                 </a:column>
+                                 
+                                 <%-- Modified Date column for details/icons view modes --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.modified_date}" value="modifiedDate" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.modifiedDate}">
+                                       <a:convertXMLDate type="both" dateStyle="long" timeStyle="short" />
+                                    </h:outputText>
+                                 </a:column>
+                                 
+                                 <%-- Actions column --%>
+                                 <a:column actions="true" style="text-align:left">
+                                    <f:facet name="header">
+                                       <h:outputText value="#{msg.actions}"/>
+                                    </f:facet>
+                                    <a:booleanEvaluator value="#{r.local}">
+                                       <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" 
+                                                     styleClass="inlineAction"
+                                                     actionListener="#{RulesBean.setupRuleAction}" action="deleteRule">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                       <a:actionLink value="#{msg.change_details}" image="/images/icons/change_rule.gif" 
+                                                     showLink="false" styleClass="inlineAction"
+                                                     actionListener="#{NewRuleWizard.startWizardForEdit}" action="editRule">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                    </a:booleanEvaluator>
+                                 </a:column>
+                                 
+                                 <a:dataPager styleClass="pager" />
+                              </a:richList>
+                              
+                              </a:panel>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
new file mode 100644
index 0000000000..672a658f9d
--- /dev/null
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -0,0 +1,355 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_space_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="document-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.spacedetails_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                              
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                    <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="import" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="export" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
+                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- wrapper comment used by the panel to add additional component facets --%>
+                              <h:panelGroup id="dashboard-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write" id="evalChange">
+                                       <a:actionLink id="actModify" value="#{msg.modify}" action="applyTemplate" showLink="false" image="/images/icons/preview.gif" style="padding-right:8px" />
+                                       <a:actionLink id="actRemove" value="#{msg.remove}" action="#{SpaceDetailsBean.removeTemplate}" showLink="false" image="/images/icons/delete.gif" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:panelGroup>
+                              <a:panel label="#{msg.dashboard_view}" id="dashboard-panel" progressive="true" facetsId="dashboard-panel-facets"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+                                 <table width=100% cellspacing=0 cellpadding=0 border=0>
+                                    <tr>
+                                       <td align=left>
+                                          <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write" id="evalApply">
+                                             <a:actionLink id="actDashboard" value="#{msg.apply_dashboard}" rendered="#{SpaceDetailsBean.templatable == false}"
+                                                   action="applyTemplate" />
+                                          </r:permissionEvaluator>
+                                          <a:panel id="template-panel" rendered="#{SpaceDetailsBean.templatable == true}">
+                                             <div style="padding:4px;border: 1px dashed #cccccc">
+                                                <r:template id="dashboard" template="#{SpaceDetailsBean.templateRef}" model="#{SpaceDetailsBean.templateModel}" />
+                                             </div>
+                                          </a:panel>
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <br/>
+                              
+                              <%-- wrapper comment used by the panel to add additional component facets --%>
+                              <h:panelGroup id="props-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                       <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editSpaceProperties" actionListener="#{EditSpaceDialog.startWizardForEdit}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:panelGroup>
+                              <a:panel label="#{msg.properties}" id="properties-panel" facetsId="props-panel-facets"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the space --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <h:graphicImage id="space-logo" url="/images/icons/#{SpaceDetailsBean.space.properties.icon}.gif" width="32" height="32" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <%-- properties for the space --%>
+                                          <r:propertySheetGrid id="space-props" value="#{SpaceDetailsBean.space}" var="spaceProps" 
+                                                         columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                         externalConfig="true" />
+                                          <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <br/>
+                              <a:panel label="#{msg.links}" id="preview-panel" progressive="true"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+                                 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+                                    <tr>
+                                       <td>
+                                          <a:actionLink value="#{msg.view_in_webdav}" href="#{SpaceDetailsBean.webdavUrl}" target="new" id="link1" />
+                                       </td>
+                                       <td>
+                                          <a:actionLink value="#{msg.view_in_cifs}" href="#{SpaceDetailsBean.cifsPath}" target="new" id="link2" />
+                                       </td>
+                                       <td>
+                                          <a:actionLink value="#{msg.details_page_bookmark}" href="#{SpaceDetailsBean.bookmarkUrl}" target="new" id="link3" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                              
+                              <br/>
+                              <h:column id="rules-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                       <a:actionLink id="titleLink2" value="#{msg.modify}" showLink="false" image="/images/icons/rule.gif" action="manageRules" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:column>
+                              <a:panel label="#{msg.rules}" id="rules-panel" facetsId="rules-panel-facets" progressive="true"
+                                       expanded="false" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+                                 <a:richList id="rulesList" viewMode="details" value="#{RulesBean.rules}" var="r"
+                                          styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
+                                          altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
+                                          initialSortColumn="title" initialSortDescending="true">
+                                    
+                                    <%-- Primary column for details view mode --%>
+                                    <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.title}" value="title" mode="case-insensitive" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="title" value="#{r.title}" />
+                                    </a:column>
+                                    
+                                    <%-- Description columns --%>
+                                    <a:column id="col2" style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="description" value="#{r.description}" />
+                                    </a:column>
+                                    
+                                    <%-- Column to show whether the rule is local --%>
+                                    <a:column style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.local}" value="local" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText value="#{r.local}" >
+                                          <a:convertBoolean/>
+                                       </h:outputText>
+                                    </a:column>
+                                    
+                                    <%-- Created Date column for details view mode --%>
+                                    <a:column id="col3" style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.created_date}" value="createdDate" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="createddate" value="#{r.createdDate}">
+                                          <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}"/>
+                                       </h:outputText>
+                                    </a:column>
+                                    
+                                    <%-- Modified Date column for details/icons view modes --%>
+                                    <a:column id="col4" style="text-align:left">
+                                       <f:facet name="header">
+                                          <a:sortLink label="#{msg.modified_date}" value="modifiedDate" styleClass="header"/>
+                                       </f:facet>
+                                       <h:outputText id="modifieddate" value="#{r.modifiedDate}">
+                                          <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                                       </h:outputText>
+                                    </a:column>
+                                    
+                                    <a:dataPager styleClass="pager" />
+                                 </a:richList>
+                              </a:panel>
+                              <br/>
+                              
+                              <%-- TODO: implement this - but READONLY details only! Manage Space Users for edits...
+                                         need support for panel with facets - so can hide edit link unless edit permissions
+                                         also need to wrap this panel with an permissions check: ReadPermissions
+                              <a:panel label="#{msg.security}" id="security-panel" progressive="true" expanded="false"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE"
+                                       action="manageInvitedUsers" linkTooltip="#{msg.manage_invited_users}" linkIcon="/images/icons/invite.gif">
+                                 <table cellspacing="2" cellpadding="0" border="0" width="100%">
+                                    
+                                 </table>
+                              </a:panel>
+                              <br/>
+                              --%>
+                              
+                              <%-- TBD
+                              <a:panel label="Preferences" id="preferences-panel" progressive="true" expanded="false"
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+                                 <div></div>
+                              </a:panel>
+                              <br/>
+                              --%>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/system-info.jsp b/source/web/jsp/dialog/system-info.jsp
new file mode 100644
index 0000000000..92c5f5ca30
--- /dev/null
+++ b/source/web/jsp/dialog/system-info.jsp
@@ -0,0 +1,186 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_system_info">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   <f:loadBundle basename="alfresco.version" var="version"/>
+   
+   <h:form acceptCharset="UTF-8" id="system-information-form">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                        	<td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/file_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainTitle"><h:outputText value="#{msg.system_info}" /></div>
+                              <div class="mainSubTitle"><h:outputText value="#{msg.current_user}" />: <h:outputText value="#{NavigationBean.currentUser.userName}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.version}" />: <h:outputText value='#{version["version.edition"]} - v#{version["version.major"]}.#{version["version.minor"]}.#{version["version.revision"]}' /> <h:outputText rendered='#{version["version.label"] != ""}' value='(#{version["version.label"]})' /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2">
+                                       <a:panel label="#{msg.http_app_state}" id="http-application-state" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:httpApplicationState id="has" />
+                                       </a:panel>
+                                       <br/>
+                                       <a:panel label="#{msg.http_session_state}" id="http-session-state" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:httpSessionState id="hss" />
+                                       </a:panel>
+                                       <br/>
+                                       <a:panel label="#{msg.http_request_state}" id="http-request-state" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:httpRequestState id="hrs" />
+                                       </a:panel>
+                                       <br/>
+                                       <a:panel label="#{msg.http_request_params}" id="http-request-params" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:httpRequestParams id="hrp" />
+                                       </a:panel>
+                                       <br/>
+                                       <a:panel label="#{msg.http_request_headers}" id="http-request-headers" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:httpRequestHeaders id="hrh" />
+                                       </a:panel>
+                                       <br/>
+                                       <a:panel label="#{msg.system_props}" id="system-props" border="white" bgcolor="white" 
+                                                titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true" styleClass="mainSubTitle"
+                                                expanded="false">
+                                       	<a:systemProperties id="sp" />
+                                       </a:panel>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="adminConsole" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/undocheckout-file.jsp b/source/web/jsp/dialog/undocheckout-file.jsp
new file mode 100644
index 0000000000..bfe271f919
--- /dev/null
+++ b/source/web/jsp/dialog/undocheckout-file.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_undo_checkout">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="undocheckout-file">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/cancel_checkout_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.undo_checkout_for}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.undocheckoutfile_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                              <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                 <tr>
+                                    <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                    <td class="mainSubText"><h:outputText value="#{msg.undo_checkout_info}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                           </td>
+                           
+                           <td valign="top" rowspan=2>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.undo_checkout}" action="#{CheckinCheckoutBean.undoCheckoutFile}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="browse" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                        
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/dialog/update-file.jsp b/source/web/jsp/dialog/update-file.jsp
new file mode 100644
index 0000000000..36c796df38
--- /dev/null
+++ b/source/web/jsp/dialog/update-file.jsp
@@ -0,0 +1,201 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="org.alfresco.web.app.portlet.AlfrescoFacesPortlet" %>
+<%@ page import="org.alfresco.web.bean.CheckinCheckoutBean" %>
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<r:page titleId="title_update_file">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="update-file1">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/update_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.update}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.updatefile_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.local_copy_location}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       1. <h:outputText value="#{msg.locate_content_upload}" />
+                                    </td>
+                                 </tr>
+                                 </h:form>
+                                 
+                                 <r:uploadForm>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.location}" />:<input style="margin-left:12px;" type="file" size="50" name="alfFileInput"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">2. <h:outputText value="#{msg.click_upload}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <input style="margin-left:12px;" type="submit" value="<%=Application.getMessage(FacesContext.getCurrentInstance(), "upload")%>" />
+                                    </td>
+                                 </tr>
+                                 <%
+                                 CheckinCheckoutBean bean = (CheckinCheckoutBean)session.getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + "CheckinCheckoutBean");
+                                 if (bean == null)
+                                 {
+                                 	bean = (CheckinCheckoutBean)session.getAttribute("CheckinCheckoutBean");
+                                 }
+                                 if (bean != null && bean.getFileName() != null) {
+                                 %>
+                                    <tr>
+                                       <td>
+                                          <img alt="" align="absmiddle" src="<%=request.getContextPath()%>/images/icons/info_icon.gif" />
+                                          <%=bean.getFileUploadSuccessMsg()%>
+                                       </td>
+                                    </tr>
+                                 <% } %>
+                                 </r:uploadForm>
+                                 
+                                 <h:form acceptCharset="UTF-8" id="update-file2">
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.update}" action="#{CheckinCheckoutBean.updateFileOK}" disabled="#{CheckinCheckoutBean.fileName == null}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CheckinCheckoutBean.cancel}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/error.jsp b/source/web/jsp/error.jsp
new file mode 100644
index 0000000000..889cc4f82f
--- /dev/null
+++ b/source/web/jsp/error.jsp
@@ -0,0 +1,49 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.app.Application" %>
+
+<r:page titleId="title_error">
+
+<table cellspacing="0" cellpadding="2" width="100%">
+   <tr>
+      <%-- Top level toolbar and company logo area --%>
+      <td width=100%>
+         <table cellspacing="0" cellpadding="0" width="100%">
+            <tr>
+               <td><a href="http://www.alfresco.org" target="new"><img src="<%=request.getContextPath()%>/images/logo/AlfrescoLogo32.png" width=32 height=30 alt="Alfresco" title="Alfresco" border=0 style="padding-right:4px"></a></td>
+               <td><img src="<%=request.getContextPath()%>/images/parts/titlebar_begin.gif" width="10" height="30"></td>
+               <td width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/titlebar_bg.gif)">
+                  <span class="topToolbarTitle"><%=Application.getMessage(session, "system_error")%></span>
+               </td>
+               <td><img src="<%=request.getContextPath()%>/images/parts/titlebar_end.gif" width="8" height="30"></td>
+            </tr>
+         </table>
+      </td>
+   </tr>
+   <tr>
+      <td>
+         <r:systemError styleClass="errorMessage" detailsStyleClass="mainSubTextSmall" showDetails="false" />
+      </td>
+   </tr>
+</table>
+
+</r:page>
diff --git a/source/web/jsp/forums/create-forum.jsp b/source/web/jsp/forums/create-forum.jsp
new file mode 100644
index 0000000000..16eeab5f9c
--- /dev/null
+++ b/source/web/jsp/forums/create-forum.jsp
@@ -0,0 +1,205 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_forum">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("create-forum:name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("create-forum:name").value.length == 0 )
+      {
+         document.getElementById("create-forum:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-forum:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-forum">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_forum_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.create_forum}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.create_forum_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_forum_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.forum_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td width="95%">
+                                       <h:inputText id="name" value="#{CreateForumDialog.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();"/>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{CreateForumDialog.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.other_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.choose_icon}" />:</nobr></td>
+                                    <td>
+                                       <table border="0" cellpadding="0" cellspacing="0"><tr><td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{CreateForumDialog.icon}">
+                                          <a:listItems value="#{CreateForumDialog.icons}" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                       </td></tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_forum_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.create_forum}" action="#{CreateForumDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CreateForumDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/create-forums.jsp b/source/web/jsp/forums/create-forums.jsp
new file mode 100644
index 0000000000..7e38c49a06
--- /dev/null
+++ b/source/web/jsp/forums/create-forums.jsp
@@ -0,0 +1,205 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_forums">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("create-forums:name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("create-forums:name").value.length == 0 )
+      {
+         document.getElementById("create-forums:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-forums:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-forums">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_forum_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.create_forums}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.create_forums_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_forums_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.forums_props}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}" />:</td>
+                                    <td width="95%">
+                                       <h:inputText id="name" value="#{CreateForumsDialog.name}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();"/>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{CreateForumsDialog.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.other_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.choose_icon}" />:</nobr></td>
+                                    <td>
+                                       <table border="0" cellpadding="0" cellspacing="0"><tr><td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{CreateForumsDialog.icon}">
+                                          <a:listItems value="#{CreateForumsDialog.icons}" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                       </td></tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_forums_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.create_forums}" action="#{CreateForumsDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CreateForumsDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/create-post.jsp b/source/web/jsp/forums/create-post.jsp
new file mode 100644
index 0000000000..083ec4a116
--- /dev/null
+++ b/source/web/jsp/forums/create-post.jsp
@@ -0,0 +1,178 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_post">
+
+<script language="JavaScript1.2">
+   function checkButtonState()
+   {
+      if (document.getElementById("create-post:message").value.length == 0)
+      {
+         document.getElementById("create-post:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-post:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-post">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/file_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.create_post}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.create_post_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_post_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.message}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.message}" />:</td>
+                                    <td>
+                                       <h:inputTextarea id="message" value="#{CreatePostDialog.content}" rows="6" cols="70" 
+                                                        onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_post_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.post}" action="#{CreatePostDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CreatePostDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+         </td>
+      </tr>
+   </table>
+    
+   </h:form>
+    
+   <script language="JavaScript1.2">
+      document.getElementById("create-post:message").focus();
+   </script>
+
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/create-reply.jsp b/source/web/jsp/forums/create-reply.jsp
new file mode 100644
index 0000000000..fb33756ecf
--- /dev/null
+++ b/source/web/jsp/forums/create-reply.jsp
@@ -0,0 +1,178 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_reply">
+
+<script language="JavaScript1.2">
+   function checkButtonState()
+   {
+      if (document.getElementById("create-reply:message").value.length == 0)
+      {
+         document.getElementById("create-reply:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-reply:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-reply">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/file_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.post_reply}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.create_reply_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_reply_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.reply_message}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.message}" />:</td>
+                                    <td>
+                                       <h:inputTextarea id="message" value="#{CreateReplyDialog.content}" rows="6" cols="70" 
+                                                        onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_reply_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.reply}" action="#{CreateReplyDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CreateReplyDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+         </td>
+      </tr>
+   </table>
+    
+   </h:form>
+    
+   <script language="JavaScript1.2">
+      document.getElementById("create-reply:message").focus();
+   </script>
+
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/create-topic.jsp b/source/web/jsp/forums/create-topic.jsp
new file mode 100644
index 0000000000..4eb25a7556
--- /dev/null
+++ b/source/web/jsp/forums/create-topic.jsp
@@ -0,0 +1,212 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_topic">
+
+<script language="JavaScript1.2">
+   function checkButtonState()
+   {
+      if (document.getElementById("create-topic:subject").value.length == 0 ||
+          document.getElementById("create-topic:message").value.length == 0)
+      {
+         document.getElementById("create-topic:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-topic:ok-button").disabled = false;
+      }
+   }
+
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-topic">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_forum_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.create_topic}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.create_topic_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>                  
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_create_forum_dialog}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.topic_props}" /></td>
+                                 </tr>
+                                 <%--
+                                 <tr>
+                                    <td><h:outputText value="#{msg.type}" />:</td>
+                                    <td width="95%">
+                                       <h:selectOneMenu value="#{CreateTopicDialog.topicType}">
+                                          <f:selectItems value="#{CreateTopicDialog.topicTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.subject}" />:</td>
+                                    <td>
+                                       <h:inputText id="subject" value="#{CreateTopicDialog.name}" size="50" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.choose_icon}" />:</nobr></td>
+                                    <td>
+                                       <table border="0" cellpadding="0" cellspacing="0"><tr><td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{CreateTopicDialog.icon}">
+                                          <a:listItems value="#{CreateTopicDialog.icons}" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                       </td></tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.message}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.message}" />:</td>
+                                    <td valign="top">
+                                       <h:inputTextarea id="message" value="#{CreateTopicDialog.message}" rows="6" cols="70" 
+                                                        onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.create_topic_finish}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.create_topic}" action="#{CreateTopicDialog.finish}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="#{CreateTopicDialog.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+         </td>
+      </tr>
+   </table>
+    
+   </h:form>
+    
+   <script language="JavaScript1.2">
+      document.getElementById("create-topic:subject").focus();
+   </script>
+
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/delete-forum.jsp b/source/web/jsp/forums/delete-forum.jsp
new file mode 100644
index 0000000000..a7263a1c28
--- /dev/null
+++ b/source/web/jsp/forums/delete-forum.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_forum_space">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-forum-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_forum}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_forum_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_forum_confirm}">
+                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/delete-forums.jsp b/source/web/jsp/forums/delete-forums.jsp
new file mode 100644
index 0000000000..cc8de78fec
--- /dev/null
+++ b/source/web/jsp/forums/delete-forums.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_forums_space">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-forums-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_forums}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_forums_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_space_confirm}">
+                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/delete-post.jsp b/source/web/jsp/forums/delete-post.jsp
new file mode 100644
index 0000000000..cec9e0b1e8
--- /dev/null
+++ b/source/web/jsp/forums/delete-post.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_post">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-post">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_post}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_post_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_post_confirm}">
+                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/delete-topic.jsp b/source/web/jsp/forums/delete-topic.jsp
new file mode 100644
index 0000000000..616dcd5579
--- /dev/null
+++ b/source/web/jsp/forums/delete-topic.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_topic_space">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-topic-space">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_topic}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_topic_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <a:panel id="delete-panel" rendered="#{BrowseBean.deleteMessage != null}">
+                                 <tr>
+                                    <td width="100%" valign="top">
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+                                       <table cellpadding="0" cellspacing="0" border="0" width="100%">
+                                          <tr>
+                                             <td valign=top style="padding-top:2px" width=20><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/></td>
+                                             <td class="mainSubText">
+                                                <h:outputText value="#{BrowseBean.deleteMessage}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+                                    </td>
+                                 </tr>
+                                 </a:panel>
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_topic_confirm}">
+                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.no}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp
new file mode 100644
index 0000000000..d369f9215d
--- /dev/null
+++ b/source/web/jsp/forums/forum-details.jsp
@@ -0,0 +1,224 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_forum_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="forum-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.forum_details_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                              
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <%--
+                              <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                    <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="import" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="export" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
+                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
+                              --%>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- wrapper comment used by the panel to add additional component facets --%>
+                              <%--
+                              <h:column id="props-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                       <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editSpaceProperties" actionListener="#{EditSpaceDialog.startWizardForEdit}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:column>
+                              facetsId="props-panel-facets"
+                              --%>
+                              <a:panel label="#{msg.properties}" id="properties-panel" 
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the space --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <h:graphicImage id="space-logo" url="/images/icons/#{SpaceDetailsBean.space.properties.icon}.gif" width="32" height="32" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <%-- properties for the space --%>
+                                          <r:propertySheetGrid id="space-props" value="#{SpaceDetailsBean.space}" var="spaceProps" 
+                                                         columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                         externalConfig="true" />
+                                          <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp
new file mode 100644
index 0000000000..5b704777de
--- /dev/null
+++ b/source/web/jsp/forums/forum.jsp
@@ -0,0 +1,213 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page titleId="title_forum">
+
+<f:view>
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="browse-topics">
+   
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr valign=top>
+ 
+                           <%-- actions for topics --%>
+                           <a:panel id="forum-actions">
+                              <td width=32>
+                                 <h:graphicImage id="space-logo" url="/images/icons/forum_large.gif" width="32" height="32" />
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainSubTitle"><h:outputText value="#{msg.forum}" id="msg1" /></div>
+                                 <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.forum_info}" id="msg3" /></div>
+                              </td>
+                              <td bgcolor="#465F7D" width=1></td>
+                              <td width=110 style="padding-left:2px">
+                                 <%-- Current object actions --%>
+                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                    <a:actionLink value="#{msg.create_topic}" image="/images/icons/create_topic.gif" padding="4" action="createTopic" actionListener="#{CreateTopicDialog.startWizard}" id="link1" />
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="showForumDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
+                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
+                                    <a:actionLink value="#{msg.delete_forum}" image="/images/icons/delete.gif" padding="4" action="deleteForum" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </td>
+                           </a:panel>
+                                                      
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110>
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
+                                    value="#{ForumsBean.forumViewMode}" actionListener="#{ForumsBean.forumViewModeChanged}">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Details - Topics --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="topics-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_topics}">
+
+                     <%-- Topics List --%>
+                     <a:richList id="topicsList" binding="#{ForumsBean.forumRichList}" viewMode="#{ForumsBean.forumViewMode}" pageSize="#{ForumsBean.forumPageSize}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{ForumsBean.topics}" var="r">
+                        
+                        <%-- component to display if the list is empty --%>
+                        <f:facet name="empty">
+                           <h:outputFormat value="#{msg.no_topics}" escape="false" />
+                        </f:facet>
+                        
+                        <%-- Primary column for details view mode --%>
+                        <a:column primary="true" width="200" style="padding:2px;text-align:left" rendered="#{ForumsBean.forumViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.topic}" value="name" mode="case-insensitive" styleClass="header"/>
+                           </f:facet>
+                           <f:facet name="small-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/topic.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Replies column for all view modes --%>
+                        <a:column style="text-align:left">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.replies}" value="replies" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.replies}" />
+                        </a:column>
+                        
+                        <%-- Actions column --%>
+                        <a:column actions="true" style="text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.actions}"/>
+                           </f:facet>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:actionLink value="#{msg.delete_topic}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteTopic" actionListener="#{BrowseBean.setupDeleteAction}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" showLink="false" styleClass="inlineAction" action="showTopicDetails" actionListener="#{BrowseBean.setupSpaceAction}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <a:dataPager styleClass="pager" />
+                     </a:richList>
+                        
+                     </a:panel>
+                     
+                     </div>
+                                          
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp
new file mode 100644
index 0000000000..aaaba7258a
--- /dev/null
+++ b/source/web/jsp/forums/forums-details.jsp
@@ -0,0 +1,224 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_forums_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="forums-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.forums_details_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                              
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <%--
+                              <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                    <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="import" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="export" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
+                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
+                              --%>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- wrapper comment used by the panel to add additional component facets --%>
+                              <%--
+                              <h:column id="props-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                       <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editSpaceProperties" actionListener="#{EditSpaceDialog.startWizardForEdit}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:column>
+                              facetsId="props-panel-facets"
+                              --%>
+                              <a:panel label="#{msg.properties}" id="properties-panel" 
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the space --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <h:graphicImage id="space-logo" url="/images/icons/#{SpaceDetailsBean.space.properties.icon}.gif" width="32" height="32" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <%-- properties for the space --%>
+                                          <r:propertySheetGrid id="space-props" value="#{SpaceDetailsBean.space}" var="spaceProps" 
+                                                         columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                         externalConfig="true" />
+                                          <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/forums.jsp b/source/web/jsp/forums/forums.jsp
new file mode 100644
index 0000000000..83ee5b86ed
--- /dev/null
+++ b/source/web/jsp/forums/forums.jsp
@@ -0,0 +1,276 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page titleId="title_forums">
+
+<f:view>
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="browse-forums">
+   
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr valign=top>
+ 
+                           <%-- actions for forums --%>
+                           <a:panel id="forums-actions">
+                              <td width=32>
+                                 <h:graphicImage id="space-logo" url="/images/icons/forums_large.gif" width="32" height="32" />
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainSubTitle"><h:outputText value="#{msg.forums}" id="msg1" /></div>
+                                 <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.forums_info}" id="msg3" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
+                              </td>
+                              <td bgcolor="#465F7D" width=1></td>
+                              <td width=130 style="padding-left:2px">
+                                 <%-- Current object actions --%>
+                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                    <a:actionLink value="#{msg.create_forums}" image="/images/icons/create_forums.gif" padding="4" action="createForums" actionListener="#{CreateForumsDialog.startWizard}" id="link1" />
+                                 </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
+                                    <a:actionLink value="#{msg.create_forum}" image="/images/icons/create_forum.gif" padding="4" action="createForum" actionListener="#{CreateForumDialog.startWizard}" id="link2" />
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="showForumsDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link3">
+                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval3">
+                                    <a:actionLink value="#{msg.delete_forums}" image="/images/icons/delete.gif" padding="4" action="deleteForums" actionListener="#{BrowseBean.setupDeleteAction}" id="link4">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </td>
+                           </a:panel>
+                                                      
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110>
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
+                                    value="#{ForumsBean.forumsViewMode}" actionListener="#{ForumsBean.forumsViewModeChanged}">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                                 <a:listItem value="icons" label="#{msg.view_icon}" />
+                                 <a:listItem value="list" label="#{msg.view_browse}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Details - Forums --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="forums-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_forums}">
+                     
+                     <%-- Forums List --%>
+                     <a:richList id="forumsList" binding="#{ForumsBean.forumsRichList}" viewMode="#{ForumsBean.forumsViewMode}" pageSize="#{ForumsBean.forumsPageSize}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{ForumsBean.forums}" var="r">
+                        
+                        <%-- component to display if the list is empty --%>
+                        <f:facet name="empty">
+                           <h:outputFormat value="#{msg.no_forums}" escape="false" />
+                        </f:facet>
+                        
+                        <%-- Primary column for details view mode --%>
+                        <a:column primary="true" width="200" style="padding:2px;text-align:left" rendered="#{ForumsBean.forumsViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                           </f:facet>
+                           <f:facet name="small-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/space_small.gif" actionListener="#{BrowseBean.clickSpace}" action="showTopics" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Primary column for icons view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left;vertical-align:top;" rendered="#{ForumsBean.forumsViewMode == 'icons'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" action="showTopics" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="header">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Primary column for list view mode --%>
+                        <a:column primary="true" style="padding:2px;text-align:left" rendered="#{ForumsBean.forumsViewMode == 'list'}">
+                           <f:facet name="large-icon">
+                              <a:actionLink value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" action="showTopics" showLink="false">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </f:facet>
+                           <a:actionLink value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="title">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <%-- Description column for all view modes --%>
+                        <a:column style="text-align:left">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.description}" />
+                        </a:column>
+                        
+                        <%-- Path column for search mode in details view mode --%>
+                        <a:column style="text-align:left" rendered="#{NavigationBean.searchContext != null && ForumsBean.forumsViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.path}" value="displayPath" styleClass="header"/>
+                           </f:facet>
+                           <r:nodePath value="#{r.path}" actionListener="#{BrowseBean.clickSpacePath}" />
+                        </a:column>
+                        
+                        <%-- Created Date column for details view mode --%>
+                        <a:column style="text-align:left" rendered="#{ForumsBean.forumsViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.created}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Modified Date column for details/icons view modes --%>
+                        <a:column style="text-align:left" rendered="#{ForumsBean.forumsViewMode == 'details' || ForumsBean.forumsViewMode == 'icons'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.modified}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Node Descendants links for list view mode --%>
+                        <a:column style="text-align:left" rendered="#{ForumsBean.forumsViewMode == 'list'}">
+                           <r:nodeDescendants value="#{r.nodeRef}" styleClass="header" actionListener="#{BrowseBean.clickDescendantSpace}" />
+                        </a:column>
+                        
+                        <%-- Actions column --%>
+                        <a:column actions="true" style="text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.actions}"/>
+                           </f:facet>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" showLink="false" styleClass="inlineAction" action="showSpaceDetails" actionListener="#{BrowseBean.setupSpaceAction}">
+                              <f:param name="id" value="#{r.id}" />
+                           </a:actionLink>
+                        </a:column>
+                        
+                        <a:dataPager styleClass="pager" />
+                     </a:richList>
+                     
+                     </a:panel>
+                     
+                     </div>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp
new file mode 100644
index 0000000000..ca939dd8d9
--- /dev/null
+++ b/source/web/jsp/forums/topic-details.jsp
@@ -0,0 +1,224 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_topic_details">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="topic-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.topic_details_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                              
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteTopic" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                              </r:permissionEvaluator>
+                              <%--
+                              <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                    <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="import" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="export" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
+                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
+                              --%>
+                           </td>
+                           
+                           <%-- Navigation --%>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100>
+                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                              </a:actionLink>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <%-- wrapper comment used by the panel to add additional component facets --%>
+                              <%--
+                              <h:column id="props-panel-facets">
+                                 <f:facet name="title">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                       <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif"
+                                             action="editSpaceProperties" actionListener="#{EditSpaceDialog.startWizardForEdit}" />
+                                    </r:permissionEvaluator>
+                                 </f:facet>
+                              </h:column>
+                              facetsId="props-panel-facets"
+                              --%>
+                              <a:panel label="#{msg.properties}" id="properties-panel" 
+                                       border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" progressive="true">
+                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                                    <tr>
+                                       <td width=80 align=center>
+                                          <%-- icon image for the space --%>
+                                          <table cellspacing=0 cellpadding=0 border=0>
+                                             <tr>
+                                                <td>
+                                                   <div style="border: thin solid #CCCCCC; padding:4px">
+                                                      <h:graphicImage id="space-logo" url="/images/icons/#{SpaceDetailsBean.space.properties.icon}.gif" width="32" height="32" />
+                                                   </div>
+                                                </td>
+                                                <td><img src="<%=request.getContextPath()%>/images/parts/rightSideShadow42.gif" width=6 height=42></td>
+                                             </tr>
+                                             <tr>
+                                                <td colspan=2><img src="<%=request.getContextPath()%>/images/parts/bottomShadow42.gif" width=48 height=5></td>
+                                             </tr>
+                                          </table>
+                                       </td>
+                                       <td>
+                                          <%-- properties for the space --%>
+                                          <r:propertySheetGrid id="space-props" value="#{SpaceDetailsBean.space}" var="spaceProps" 
+                                                         columns="1" mode="view" labelStyleClass="propertiesLabel" 
+                                                         externalConfig="true" />
+                                          <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/forums/topic.jsp b/source/web/jsp/forums/topic.jsp
new file mode 100644
index 0000000000..93bb89f6a2
--- /dev/null
+++ b/source/web/jsp/forums/topic.jsp
@@ -0,0 +1,254 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page titleId="title_topic">
+
+<f:view>
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="browse-posts">
+   
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr valign=top>
+ 
+                           <%-- actions for forums --%>
+                           <a:panel id="topic-actions">
+                              <td width=32>
+                                 <h:graphicImage id="space-logo" url="/images/icons/topic_large.gif" width="32" height="32" />
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainSubTitle"><h:outputText value="#{msg.topic}" id="msg1" /></div>
+                                 <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.topic_info}" id="msg3" /></div>
+                              </td>
+                              <td bgcolor="#465F7D" width=1></td>
+                              <td width=110 style="padding-left:2px">
+                                 <%-- Current object actions --%>
+                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                    <a:actionLink value="#{msg.post_to_topic}" image="/images/icons/create_post.gif" padding="4" action="createPost" actionListener="#{CreatePostDialog.startWizard}" id="link1" />
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="showTopicDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
+                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                 </a:actionLink>
+                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
+                                    <a:actionLink value="#{msg.delete_topic}" image="/images/icons/delete.gif" padding="4" action="deleteTopic" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </td>
+                           </a:panel>
+                                                      
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110>
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
+                                    value="#{ForumsBean.topicViewMode}" actionListener="#{ForumsBean.topicViewModeChanged}">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                                 <a:listItem value="bubble" label="#{msg.bubble_view}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Details - Posts --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <div style="padding:4px">
+                     
+                     <a:panel id="posts-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_posts}">
+
+                     <%-- Posts List --%>
+                     <a:richList id="postsList" binding="#{ForumsBean.topicRichList}" viewMode="#{ForumsBean.topicViewMode}" pageSize="#{ForumsBean.topicPageSize}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{ForumsBean.posts}" var="r">
+                        
+                        <%-- component to display if the list is empty --%>
+                        <f:facet name="empty">
+                           <h:outputFormat value="#{msg.no_posts}" escape="false" />
+                        </f:facet>
+                        
+                        <%-- Content column for all view modes --%>
+                        <a:column primary="true" width="200" style="padding:2px;text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.post}" />
+                           </f:facet>
+                           <h:outputText value="#{r.message}" />
+                        </a:column>
+                        
+                        <%-- Author column for the details view mode --%>
+                        <a:column style="text-align:left" rendered="#{ForumsBean.topicViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.author}" value="creator" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.creator}" />
+                        </a:column>
+                        
+                        <%-- Posted time column for details view mode --%>
+                        <a:column style="text-align:left; white-space:nowrap" 
+                                  rendered="#{ForumsBean.topicViewMode == 'details'}">
+                           <f:facet name="header">
+                              <a:sortLink label="#{msg.posted}" value="created" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.created}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- topic name column for bubble view mode --%>
+                        <a:column style="text-align:left;" 
+                                  rendered="#{ForumsBean.topicViewMode == 'bubble'}">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.post}:" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{NavigationBean.nodeProperties.name}" />
+                        </a:column>
+                        
+                        <%-- reply to column for bubble view mode --%>
+                        <a:column style="text-align:left;" 
+                                  rendered="#{ForumsBean.topicViewMode == 'bubble' && r.replyTo != null}">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.reply_to}:" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.replyTo}" />
+                        </a:column>
+                        
+                        <%-- Posted time column for bubble view mode --%>
+                        <a:column style="text-align:left; white-space:nowrap" 
+                                  rendered="#{ForumsBean.topicViewMode == 'bubble'}">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.on}:" styleClass="header"/>
+                           </f:facet>
+                           <h:outputText value="#{r.created}">
+                              <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                           </h:outputText>
+                        </a:column>
+                        
+                        <%-- Actions column --%>
+                        <a:column actions="true" style="text-align:left">
+                           <f:facet name="header">
+                              <h:outputText value="#{msg.actions}"/>
+                           </f:facet>
+                           <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren">
+                              <a:actionLink value="#{msg.post_reply}" image="/images/icons/post_reply.gif" showLink="false" styleClass="inlineAction" action="createReply" actionListener="#{CreateReplyDialog.startWizard}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <r:permissionEvaluator value="#{r}" allow="Write">
+                              <a:actionLink value="#{msg.edit_post}" image="/images/icons/edit_icon.gif" showLink="false" styleClass="inlineAction" action="editPost" actionListener="#{BrowseBean.setupContentAction}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                           <r:permissionEvaluator value="#{r}" allow="Delete">
+                              <a:actionLink value="#{msg.delete_post}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deletePost" actionListener="#{BrowseBean.setupDeleteAction}">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                           </r:permissionEvaluator>
+                        </a:column>
+                        
+                        <a:dataPager styleClass="pager" />
+                     </a:richList>
+                        
+                     </a:panel>
+                     
+                     </div>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/login.jsp b/source/web/jsp/login.jsp
new file mode 100644
index 0000000000..63662bbaf0
--- /dev/null
+++ b/source/web/jsp/login.jsp
@@ -0,0 +1,135 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="16kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<body bgcolor="#ffffff" style="background-image: url(<%=request.getContextPath()%>/images/logo/AlfrescoFadedBG.png); background-repeat: no-repeat; background-attachment: fixed">
+
+<r:page titleId="title_login">
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="loginForm" >
+   
+   <table width=100% height=98% align=center>
+      <tr width=100% align=center>
+         <td valign=middle align=center width=100%>
+            
+            <table cellspacing=0 cellpadding=0 border=0>
+            <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_01.gif' width=7 height=7 alt=''></td>
+            <td background='<%=request.getContextPath()%>/images/parts/white_02.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_02.gif' width=7 height=7 alt=''></td>
+            <td width=7><img src='<%=request.getContextPath()%>/images/parts/white_03.gif' width=7 height=7 alt=''></td>
+            </tr>
+            <tr><td background='<%=request.getContextPath()%>/images/parts/white_04.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_04.gif' width=7 height=7 alt=''></td><td bgcolor='white'>
+            
+            <table border=0 cellspacing=4 cellpadding=2>
+               <tr>
+                  <td colspan=2>
+                     <img src='<%=request.getContextPath()%>/images/logo/AlfrescoLogo200.png' width=200 height=58 alt="Alfresco" title="Alfresco">
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td colspan=2>
+                     <span class='mainSubTitle'><h:outputText value="#{msg.login_details}" />:</span>
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td>
+                     <h:outputText value="#{msg.username}"/>:
+                  </td>
+                  <td>
+                     <%-- input text field, with an example of a nested validator tag --%>
+                     <h:inputText id="user-name" value="#{LoginBean.username}" validator="#{LoginBean.validateUsername}" style="width:150px" />
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td>
+                     <h:outputText value="#{msg.password}"/>:
+                  </td>
+                  <td>
+                     <%-- password text field, with an example of a validation bean method --%>
+                     <%-- the validation method adds a faces message to be displayed by a message tag --%>
+                     <h:inputSecret id="user-password" value="#{LoginBean.password}" validator="#{LoginBean.validatePassword}" style="width:150px" />
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td>
+                     <h:outputText value="#{msg.language}"/>:
+                  </td>
+                  <td>
+                     <%-- language selection drop-down --%>
+                     <h:selectOneMenu value="#{LoginBean.language}" style="width:150px" onchange="document.forms['loginForm'].submit(); return true;">
+                        <f:selectItems value="#{LoginBean.languages}" />
+                     </h:selectOneMenu>
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td colspan=2 align=right>
+                     <h:commandButton id="submit" action="#{LoginBean.login}" value="#{msg.login}" />
+                  </td>
+               </tr>
+            </table>
+            
+            <%-- messages tag to show messages not handled by other specific message tags --%>
+            <h:messages style="padding-top:8px; color:red; font-size:10px" layout="table" />
+            
+            </td><td background='<%=request.getContextPath()%>/images/parts/white_06.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_06.gif' width=7 height=7 alt=''></td></tr>
+            <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_07.gif' width=7 height=7 alt=''></td>
+            <td background='<%=request.getContextPath()%>/images/parts/white_08.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_08.gif' width=7 height=7 alt=''></td>
+            <td width=7><img src='<%=request.getContextPath()%>/images/parts/white_09.gif' width=7 height=7 alt=''></td></tr>
+            </table>
+            
+         </td>
+      </tr>
+   </table>
+      
+   </h:form>
+</f:view>
+
+<script>
+
+   if (document.getElementById("loginForm:user-name").value.length == 0)
+   {
+      document.getElementById("loginForm:user-name").focus();
+   }
+   else
+   {
+      document.getElementById("loginForm:user-password").focus();
+   }
+
+</script>
+
+</r:page>
+
+</body>
\ No newline at end of file
diff --git a/source/web/jsp/parts/breadcrumb.jsp b/source/web/jsp/parts/breadcrumb.jsp
new file mode 100644
index 0000000000..a7cdf591a2
--- /dev/null
+++ b/source/web/jsp/parts/breadcrumb.jsp
@@ -0,0 +1,40 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%-- Breadcrumb area --%>
+<%-- Designed to support a variable height breadcrumb --%>
+<tr>
+   <td><img src="<%=request.getContextPath()%>/images/parts/headbar_1.gif" width=4 height=7></td>
+   <td width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/headbar_2.gif)"></td>
+   <td><img src="<%=request.getContextPath()%>/images/parts/headbar_3.gif" width=4 height=7></td>
+</tr>
+
+<tr>
+   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/headbar_4.gif)"></td>
+   <td bgcolor="#8EB6E6">
+      <%-- Breadcrumb component --%>
+      <div style="padding-left:8px" class="headbarTitle">
+         <a:breadcrumb value="#{NavigationBean.location}" styleClass="headbarLink" />
+      </div>
+   </td>
+   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/headbar_6.gif)"></td>
+</tr>
+
+<tr>
+   <td><img src="<%=request.getContextPath()%>/images/parts/headbar_7.gif" width=4 height=10></td>
+   <td width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/headbar_8.gif)"></td>
+   <td><img src="<%=request.getContextPath()%>/images/parts/headbar_9.gif" width=4 height=10></td>
+</tr>
diff --git a/source/web/jsp/parts/shelf.jsp b/source/web/jsp/parts/shelf.jsp
new file mode 100644
index 0000000000..c01324edd6
--- /dev/null
+++ b/source/web/jsp/parts/shelf.jsp
@@ -0,0 +1,73 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%-- Shelf area --%>
+<a:panel id="shelfPanel" expanded="#{NavigationBean.shelfExpanded}">
+   
+   <table cellspacing=0 cellpadding=0 width=100% bgcolor='#ffffff'>
+      <tr>
+         <td><img src="<%=request.getContextPath()%>/images/parts/headbar_begin.gif" width=4 height=33></td>
+         <td align=center width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/headbar_bg.gif)">
+            <div class="headbarTitle"><h:outputText id="shelfText" value="#{msg.shelf}"/></div>
+         </td>
+         <td><img src="<%=request.getContextPath()%>/images/parts/headbar_end.gif" width=4 height=33></td>
+      </tr>
+      <tr>
+         <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+         <td valign=top width=100%>
+            
+            <%-- Shelf component --%>
+            <%-- IMPORTANT NOTE: All inner components must be given an explicit ID! --%>
+            <%--                 This is because they are wrapped in a Panel component --%>
+            <r:shelf id="shelf" groupPanel="ballongrey" groupBgcolor="#eeeeee" selectedGroupPanel="bluetoolbar" selectedGroupBgcolor="#e9f0f4"
+                  innerGroupPanel="white" innerGroupBgcolor="#ffffff" groupExpandedActionListener="#{NavigationBean.shelfGroupToggled}">
+               <r:shelfGroup label="#{msg.clipboard}" id="shelf-group-1" expanded="#{NavigationBean.shelfItemExpanded[0]}">
+                  <r:clipboardShelfItem id="clipboard-shelf" collections="#{ClipboardBean.items}" pasteActionListener="#{ClipboardBean.pasteItem}" />
+               </r:shelfGroup>
+               
+               <%-- NOTE: this component is exanded=true as default so the RecentSpaces managed Bean is
+                          instantied early - otherwise it will not be seen until this shelf component is
+                          first expanded. There is no config setting to do this in JSF by default --%>
+               <r:shelfGroup label="#{msg.recent_spaces}" id="shelf-group-2" expanded="#{NavigationBean.shelfItemExpanded[1]}">
+                  <r:recentSpacesShelfItem id="recent-shelf" value="#{RecentSpacesBean.recentSpaces}" navigateActionListener="#{RecentSpacesBean.navigate}" /> 
+               </r:shelfGroup>
+               
+               <r:shelfGroup label="#{msg.shortcuts}" id="shelf-group-3" expanded="#{NavigationBean.shelfItemExpanded[2]}">
+                  <r:shortcutsShelfItem id="shortcut-shelf" value="#{UserShortcutsBean.shortcuts}" clickActionListener="#{UserShortcutsBean.click}" removeActionListener="#{UserShortcutsBean.removeShortcut}" />
+               </r:shelfGroup>
+               
+               <%-- TBD
+               <r:shelfGroup label="Drop Zone" id="shelf-group-4" expanded="#{NavigationBean.shelfItemExpanded[3]}">
+                  
+               </r:shelfGroup>
+               
+               <r:shelfGroup label="Actions in Progress" id="shelf-group-5" expanded="#{NavigationBean.shelfItemExpanded[4]}">
+                  
+               </r:shelfGroup>
+               --%>
+            </r:shelf>
+            
+         </td>
+         <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+      </tr>
+      <tr>
+         <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+         <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+         <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+      </tr>
+   </table>
+   
+</a:panel>
diff --git a/source/web/jsp/parts/titlebar.jsp b/source/web/jsp/parts/titlebar.jsp
new file mode 100644
index 0000000000..0a4ba3caef
--- /dev/null
+++ b/source/web/jsp/parts/titlebar.jsp
@@ -0,0 +1,67 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%-- Title bar area --%>
+<table cellspacing=0 cellpadding=2 width=100%>
+   <tr>
+      <%-- Top level toolbar and company logo area --%>
+      <td width=100%>
+         <table cellspacing=0 cellpadding=0 width=100%>
+            <tr>
+               <td style="padding-right:4px;"><a:actionLink image="/images/logo/AlfrescoLogo32.png" value="Alfresco" tooltip="Alfresco" showLink="false" action="about" /></td>
+               <td><img src="<%=request.getContextPath()%>/images/parts/titlebar_begin.gif" width=10 height=30></td>
+               <td width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/titlebar_bg.gif)">
+                  <%-- Toolbar --%>
+                  <a:modeList itemSpacing="3" iconColumnWidth="0" horizontal="true"
+                        itemStyleClass="topToolbar" itemLinkStyleClass="topToolbarLink" selectedStyleClass="topToolbarHighlight" selectedLinkStyleClass="topToolbarLinkHighlight"
+                        value="#{NavigationBean.toolbarLocation}" actionListener="#{NavigationBean.toolbarLocationChanged}">
+                     <a:listItem value="company" label="#{msg.company_home}" />
+                     <a:listItem value="home" label="#{msg.my_home}" />
+                  </a:modeList>
+               </td>
+               <td><img src="<%=request.getContextPath()%>/images/parts/titlebar_end.gif" width=8 height=30></td>
+            </tr>
+         </table>
+      </td>
+      
+      <%-- Help area --%>
+      <td>
+         <table cellspacing=2 cellpadding=0 width=100%>
+            <tr>
+               <td><a:actionLink value="#{msg.toggle_shelf}" image="/images/icons/shelf.gif" actionListener="#{NavigationBean.toggleShelf}" showLink="false" /></td>
+               <td width=8>&nbsp;</td>
+               <td><img src="<%=request.getContextPath()%>/images/icons/Help_icon.gif" width=15 height=15></td>
+               <td><nobr><h:outputLink value="#{NavigationBean.helpUrl}"><h:outputText value="#{msg.help}" /></h:outputLink></nobr></td>
+               <td width=8>&nbsp;</td>
+               <td><nobr><a:actionLink value="#{msg.logout} (#{NavigationBean.currentUser.userName})" action="#{LoginBean.logout}" /></nobr></td>
+            </tr>
+         </table>
+      </td>
+      
+      <%-- Search area --%>
+      <td>
+         <table cellspacing=0 cellpadding=0 width=100%>
+            <tr>
+               <td><img src="<%=request.getContextPath()%>/images/parts/searchbar_begin.gif" width=6 height=30></td>
+               <td width=100% style="background-image: url(<%=request.getContextPath()%>/images/parts/searchbar_bg.gif)">
+                  <r:simpleSearch id="search" actionListener="#{BrowseBean.search}" />
+               </td>
+               <td><img src="<%=request.getContextPath()%>/images/parts/searchbar_end.gif" width=6 height=30></td>
+            </tr>
+         </table>
+      </td>
+   </tr>
+</table>
diff --git a/source/web/jsp/relogin.jsp b/source/web/jsp/relogin.jsp
new file mode 100644
index 0000000000..15ca5160fb
--- /dev/null
+++ b/source/web/jsp/relogin.jsp
@@ -0,0 +1,89 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="16kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<body bgcolor="#ffffff" style="background-image: url(<%=request.getContextPath()%>/images/logo/AlfrescoFadedBG.png); background-repeat: no-repeat; background-attachment: fixed">
+
+<r:page titleId="title_relogin">
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="loggedOutForm" >
+   
+   <table width=100% height=90% align=center>
+      <tr width=100% align=center>
+         <td valign=middle align=center width=100%>
+            
+            <table cellspacing=0 cellpadding=0 border=0>
+            <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_01.gif' width=7 height=7 alt=''></td>
+            <td background='<%=request.getContextPath()%>/images/parts/white_02.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_02.gif' width=7 height=7 alt=''></td>
+            <td width=7><img src='<%=request.getContextPath()%>/images/parts/white_03.gif' width=7 height=7 alt=''></td>
+            </tr>
+            <tr><td background='<%=request.getContextPath()%>/images/parts/white_04.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_04.gif' width=7 height=7 alt=''></td><td bgcolor='white'>
+            
+            <table border=0 cellspacing=4 cellpadding=2>
+               <tr>
+                  <td align=center>
+                     <img src='<%=request.getContextPath()%>/images/logo/AlfrescoLogo200.png' width=200 height=58 alt="Alfresco" title="Alfresco">
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td align=center>
+                     <span class='mainSubTitle'><h:outputText value="#{msg.loggedout_details}" /></span>
+                  </td>
+               </tr>
+               
+               <tr>
+                  <td align=center>
+                     <a:actionLink href="/faces/jsp/browse/browse.jsp" value="#{msg.relogin}" />
+                  </td>
+               </tr>
+            </table>
+            
+            <%-- messages tag to show messages not handled by other specific message tags --%>
+            <h:messages style="padding-top:8px; color:red; font-size:10px" layout="table" />
+            
+            </td><td background='<%=request.getContextPath()%>/images/parts/white_06.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_06.gif' width=7 height=7 alt=''></td></tr>
+            <tr><td width=7><img src='<%=request.getContextPath()%>/images/parts/white_07.gif' width=7 height=7 alt=''></td>
+            <td background='<%=request.getContextPath()%>/images/parts/white_08.gif'>
+            <img src='<%=request.getContextPath()%>/images/parts/white_08.gif' width=7 height=7 alt=''></td>
+            <td width=7><img src='<%=request.getContextPath()%>/images/parts/white_09.gif' width=7 height=7 alt=''></td></tr>
+            </table>
+            
+         </td>
+      </tr>
+   </table>
+      
+   </h:form>
+</f:view>
+
+</r:page>
+
+</body>
\ No newline at end of file
diff --git a/source/web/jsp/roles/edit-user-roles.jsp b/source/web/jsp/roles/edit-user-roles.jsp
new file mode 100644
index 0000000000..a7b8cee0e3
--- /dev/null
+++ b/source/web/jsp/roles/edit-user-roles.jsp
@@ -0,0 +1,208 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_change_user_roles">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="invite-users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edituser_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
+                              <div class="mainTitle">
+                                 <h:outputText value="#{msg.modify_user_roles}" />
+                                 '<h:outputText value="#{UserMembersBean.personName}" />'
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.modify_user_roles_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{msg.change_user_roles}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>1.&nbsp;<h:outputText value="#{msg.select_role}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneListbox id="roles" style="width:250px" size="5">
+                                          <f:selectItems value="#{InviteUsersWizard.roles}" />
+                                       </h:selectOneListbox>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       2.&nbsp;<h:commandButton value="#{msg.add_to_list_button}" actionListener="#{UserMembersBean.addRole}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.selected_roles}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:dataTable value="#{UserMembersBean.personRolesDataModel}" var="row"
+                                                    rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                                                    styleClass="selectedItems" headerClass="selectedItemsHeader"
+                                                    cellspacing="0" cellpadding="4" 
+                                                    rendered="#{UserMembersBean.personRolesDataModel.rowCount != 0}">
+                                          <h:column>
+                                             <f:facet name="header">
+                                                <h:outputText value="#{msg.name}" />
+                                             </f:facet>
+                                             <h:outputText value="#{row.role}" />
+                                          </h:column>
+                                          <h:column>
+                                             <a:actionLink actionListener="#{UserMembersBean.removeRole}" image="/images/icons/delete.gif"
+                                                           value="#{msg.remove}" showLink="false" style="padding-left:6px" />
+                                          </h:column>
+                                       </h:dataTable>
+                                       <a:panel id="no-items" rendered="#{UserMembersBean.personRolesDataModel.rowCount == 0}">
+                                          <table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>
+                                             <tr>
+                                                <td colspan='2' class='selectedItemsHeader'><h:outputText id="no-items-name" value="#{msg.name}" /></td>
+                                             </tr>
+                                             <tr>
+                                                <td class='selectedItemsRow'><h:outputText id="no-items-msg" value="#{msg.no_selected_items}" /></td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan=2 class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{UserMembersBean.finishOK}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="cancel" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/roles/manage-invited-users.jsp b/source/web/jsp/roles/manage-invited-users.jsp
new file mode 100644
index 0000000000..e9cff7e015
--- /dev/null
+++ b/source/web/jsp/roles/manage-invited-users.jsp
@@ -0,0 +1,235 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_invited_users">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.manage_invited_users}" /></div>
+                              <div class="mainSubText">
+                                 <h:outputFormat value="#{msg.space_owner}" rendered="#{UserMembersBean.owner != null}">
+                                    <f:param value="#{UserMembersBean.owner}" />
+                                 </h:outputFormat>
+                              </div>
+                              <div class="mainSubText"><h:outputText value="#{msg.manage_invited_users_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
+                              <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="ChangePermissions">
+                                 <a:actionLink value="#{msg.invite}" image="/images/icons/invite.gif" padding="4" action="inviteUsers" actionListener="#{InviteUsersWizard.startWizard}" />
+                              </r:permissionEvaluator>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0">
+                                 <a:listItem value="0" label="#{msg.user_details}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="2" cellpadding="2" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:panel id="users-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.users_and_groups}">
+                              
+                              <a:richList id="users-list" binding="#{UserMembersBean.usersRichList}" viewMode="details" pageSize="10"
+                                    styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                                    value="#{UserMembersBean.users}" var="r" initialSortColumn="userName" initialSortDescending="true">
+                                 
+                                 <%-- Primary column with full name --%>
+                                 <a:column primary="true" width="200" style="padding:2px;text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.name}" value="fullName" mode="case-insensitive" styleClass="header"/>
+                                    </f:facet>
+                                    <f:facet name="small-icon">
+                                       <h:graphicImage url="#{r.icon}" />
+                                    </f:facet>
+                                    <h:outputText value="#{r.fullName}" />
+                                 </a:column>
+                                 
+                                 <%-- Username column --%>
+                                 <a:column width="120" style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.authority}" value="userName" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.userName}" />
+                                 </a:column>
+                                 
+                                 <%-- Roles column --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.roles}" value="roles" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.roles}" />
+                                 </a:column>
+                                 
+                                 <%-- Actions column --%>
+                                 <a:column actions="true" style="text-align:left">
+                                    <f:facet name="header">
+                                       <h:outputText value="#{msg.actions}"/>
+                                    </f:facet>
+                                    <a:actionLink value="#{msg.change_roles}" image="/images/icons/edituser.gif" showLink="false" action="editRoles" actionListener="#{UserMembersBean.setupUserAction}">
+                                       <f:param name="userName" value="#{r.userName}" />
+                                    </a:actionLink>
+                                    <a:actionLink value="#{msg.remove}" image="/images/icons/delete_person.gif" showLink="false" action="removeUser" actionListener="#{UserMembersBean.setupUserAction}">
+                                       <f:param name="userName" value="#{r.userName}" />
+                                    </a:actionLink>
+                                 </a:column>
+                                 
+                                 <a:dataPager styleClass="pager" />
+                              </a:richList>
+                              
+                              </a:panel>
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="0" cellspacing="0" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="2" cellpadding="0" border="0" width="100%">
+                        <tr>
+                           <td>
+                              <h:selectBooleanCheckbox id="chkPermissions" value="#{UserMembersBean.inheritPermissions}" valueChangeListener="#{UserMembersBean.inheritPermissionsValueChanged}"
+                                    onchange="document.forms['users'].submit(); return true;" disabled="#{!UserMembersBean.hasChangePermissions}" />
+                           </td>
+                           <td width=100%>
+                              &nbsp;<h:outputText value="#{msg.inherit_permissions}" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td colspan=2><h:message for="chkPermissions" styleClass="statusMessage" /></td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/roles/remove-invited-user.jsp b/source/web/jsp/roles/remove-invited-user.jsp
new file mode 100644
index 0000000000..1723c631a4
--- /dev/null
+++ b/source/web/jsp/roles/remove-invited-user.jsp
@@ -0,0 +1,168 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_remove_invited_user">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="remove-user">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.remove_user}" /> '<h:outputText value="#{UserMembersBean.personName}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.remove_invited_user_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.remove_invited_user_confirm}">
+                                          <f:param value="#{UserMembersBean.personName}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.remove}" action="#{UserMembersBean.removeOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/test/_template.jsp b/source/web/jsp/test/_template.jsp
new file mode 100644
index 0000000000..8c10accc58
--- /dev/null
+++ b/source/web/jsp/test/_template.jsp
@@ -0,0 +1,157 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<%-- REPLACE ME: set the title I18N message Id here --%>
+<r:page titleId="">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- REPLACE ME: set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="myform">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="26">
+                              <%-- REPLACE ME: icon here --%>
+                           </td>
+                           <td>
+                              <%-- Summary --%>
+                              <%-- REPLACE ME: summary here --%>
+                           </td>
+                           <td bgcolor="#465F7D" width="1"></td>
+                           <td width="100" style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <%-- REPLACE ME: object actions --%>
+                           </td>
+                           <td bgcolor="#465F7D" width="1"></td>
+                           <td width="100">
+                              <%-- Details View settings --%>
+                              <%-- REPLACE ME: views --%>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Toolbar --%>
+               <tr style="padding-top:4px">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4">
+                        <tr>
+                           <td>
+                              <%-- Toolbar actions --%>
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "bluetoolbar", "#E9F0F4"); %>
+                                 <%-- REPLACE ME: toolbar actions --%>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "bluetoolbar"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="300">
+                     
+                     <%-- Details inner components --%>
+                     <%-- REPLACE ME: details components --%>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/test/adduser.jsp b/source/web/jsp/test/adduser.jsp
new file mode 100644
index 0000000000..6a1b70345b
--- /dev/null
+++ b/source/web/jsp/test/adduser.jsp
@@ -0,0 +1,42 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="userForm" >
+   
+      <h3>New User details:</h3>
+      
+      <%@ include file="userform.jsp" %>
+      
+      <p>
+      
+      <h:commandButton id="submit" value="OK" action="success" actionListener="#{UserListBean.addUserOK}" />
+      <%-- Use of the 'immediate' attribute forces the cancel action impl to execute
+           in the Apply Request Values processing phase - it would normally be deferred to
+           the Invoke Application phase. This means is fires before the form validation
+           occurs - allow pure UI events to either navigate or change the UI without
+           seeing validation errors etc. --%>
+      <h:commandButton id="cancel" value="Cancel" action="cancel" immediate="true" />
+      
+   </h:form>
+</f:view>
diff --git a/source/web/jsp/test/edituser.jsp b/source/web/jsp/test/edituser.jsp
new file mode 100644
index 0000000000..f2fb27a5fc
--- /dev/null
+++ b/source/web/jsp/test/edituser.jsp
@@ -0,0 +1,42 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="userForm" >
+   
+      <h3>Edit User details:</h3>
+      
+      <%@ include file="userform.jsp" %>
+      
+      <p>
+      
+      <h:commandButton id="submit" value="OK" action="success" actionListener="#{UserListBean.editUserOK}" />
+      <%-- Use of the 'immediate' attribute forces the cancel action impl to execute
+           in the Apply Request Values processing phase - it would normally be deferred to
+           the Invoke Application phase. This means is fires before the form validation
+           occurs - allow pure UI events to either navigate or change the UI without
+           seeing validation errors etc. --%>
+      <h:commandButton id="cancel" value="Cancel" action="cancel" immediate="true" />
+      
+   </h:form>
+</f:view>
diff --git a/source/web/jsp/test/userform.jsp b/source/web/jsp/test/userform.jsp
new file mode 100644
index 0000000000..413c91472f
--- /dev/null
+++ b/source/web/jsp/test/userform.jsp
@@ -0,0 +1,89 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%-- JSP fragment - included directly by other complete JSP pages --%>
+<table border=0 cellspacing=2 cellpadding=2>
+
+   <tr>
+      <td>
+         <%-- use an I18N message --%>
+         <h:outputText value="#{msg.username}"/>:
+      </td>
+      <td>
+         <%-- example of the 'disabled' attribute bound to a form bean property --%>
+         <h:inputText id="username" value="#{UserListBean.user.username}" required="true" disabled="#{!UserListBean.isNewUser}">
+            <f:validateLength minimum="5" maximum="12" />
+         </h:inputText>
+         <%--  message tag to show errors for the 'username' field --%>
+         <h:message id="errors1" for="username" style="color:red; font-size:10px" />
+      </td>
+   </tr>
+   
+   <tr>
+      <td>
+         <h:outputText value="#{msg.password}"/>:
+      </td>
+      <td>
+         <h:inputText id="userpassword" value="#{UserListBean.user.password}" validator="#{LoginBean.validatePassword}" required="true">
+            <f:validateLength minimum="5" maximum="12" />
+         </h:inputText>
+         <h:message id="errors2" for="userpassword" style="color:red; font-size:10px" />
+      </td>
+   </tr>
+
+   <tr>
+      <td>
+         <h:outputText value="#{msg.name}"/>:
+      </td>
+      <td>
+         <h:inputText id="name" value="#{UserListBean.user.name}" required="true" />
+         <h:message id="errors3" for="name" style="color:red; font-size:10px" />
+      </td>
+   </tr>
+   
+   <tr>
+      <td>
+         <h:outputText value="#{msg.joindate}"/>:
+      </td>
+      <td>
+         <%-- Example of a tag utilising an Input Component with a custom renderer.
+              The renderer handles encoding and decoding of date values to UI elements --%>
+         <a:inputDatePicker id="joined" value="#{UserListBean.user.dateJoined}" startYear="1996" yearCount="10"/>
+      </td>
+   </tr>
+   
+   <tr>
+      <td>
+         <h:outputText value="#{msg.roles}"/>:
+      </td>
+      <td>
+         <%-- Show an example of a listbox populated by a server-side List of SelectItem
+              objects. The preselection is controlled by the selectItems tag which contains
+              a list of values that the control will try to select.
+              Also shows an example of a valueChangedListener which uses onchange() Javascript
+              to submit the form immediately to update the UI. --%>
+         <h:selectManyListbox id="rolesListbox" value="#{UserListBean.user.roles}" valueChangeListener="#{UserListBean.roleValueChanged}" immediate="true" onchange="javascript:document.forms['userForm'].submit();">
+            <f:selectItems value="#{UserListBean.user.allRolesList}" />
+         </h:selectManyListbox>
+         <h:message id="errors5" for="rolesListbox" style="color:red; font-size:10px" />
+         <br>
+         <%-- Example of a direct component binding. The setting method on the bean 
+              is called and the OutputText component can be programmically modified --%>
+         <h:outputText id='roles-text' binding="#{UserListBean.rolesOutputText}"/>
+      </td>
+   </tr>
+
+</table>
diff --git a/source/web/jsp/test/userlist.jsp b/source/web/jsp/test/userlist.jsp
new file mode 100644
index 0000000000..c30b9f38be
--- /dev/null
+++ b/source/web/jsp/test/userlist.jsp
@@ -0,0 +1,108 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<%@ page isELIgnored="false" %>
+
+
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="userListForm">
+   
+      <h2>UserList Test</h2>
+      
+      <%-- use JSTL as simple example way to list the users --%>
+      <%-- TODO: find out how to get this working - currently it can't find the JSF bean
+                 in the session scope. Using useBean tag creates a new copy --%>
+      <%--<jsp:useBean id="UserListBean" scope="session" class="jsftest.UserListBean" />--%>
+      <%--
+      <ol>
+         <c:forEach items="${sessionScope.UserListBean.users}" var="u">
+            <li>Username: ${u.username}, Name: ${u.name}, Roles: ${u.roles}</li>
+         </c:forEach>
+      </ol>
+            
+      <p>
+      --%>
+      
+      <%-- example of using a JSF DataTable to list the users --%>
+      <%-- iterates around the List of User objects in the UserListBean --%>
+      <b>JSF dataTable component test.</b><br>
+      <h:dataTable id="userlist" value="#{UserListBean.usersModel}" var="u">
+        <h:column>
+          <f:facet name="header">
+            <%-- NOTE: You cannot insert plain HTML text here, due to the way that some JSF
+                       components are architected, the plain HTML would get displayed before
+                       the body of the datatable tag is output. This is also true of the
+                       other container tags including 'panel'.
+                       The datatable is considerably inferior to our portal data tags
+                       or even the freely available 'displaytag' tag library --%>
+            <%-- You can also use the nasty 'f:verbatim' tag to wrap any non JSF elements --%>
+            <h:outputText value="#{msg.username}"/>
+          </f:facet>
+          <h:outputText value="#{u.username}"/>
+        </h:column>
+        <h:column>
+          <f:facet name="header">
+            <h:outputText value="#{msg.name}"/>
+          </f:facet>
+          <h:outputText value="#{u.name}"/>
+        </h:column>
+        <h:column>
+          <f:facet name="header">
+            <h:outputText value="#{msg.joindate}"/>
+          </f:facet>
+          <h:outputText value="#{u.dateJoined}">
+            <%-- example of a DateTime converter --%>
+            <%-- can be used to convert both input and output text --%>
+            <f:convertDateTime dateStyle="short" />
+          </h:outputText>
+        </h:column>
+        <h:column>
+          <f:facet name="header">
+            <h:outputText value="#{msg.roles}"/>
+          </f:facet>
+          <h:outputText value="#{u.roles}"/>
+        </h:column>
+        <h:column>
+          <f:facet name="actions">
+            <h:outputText value="#{msg.actions}"/>
+          </f:facet>
+          <%-- inline command link - has an action listener which will decode which
+               item in the grid it was clicked using the param tag below
+               Then the action listener will delegate to the action view --%>
+          <h:commandLink id="edit" value="Edit" action="edituser" actionListener="#{UserListBean.editUser}">
+            <f:param id="userId" name="id" value="#{u.username}" />
+          </h:commandLink>
+        </h:column>
+      </h:dataTable>
+      
+      <p>
+      
+      <h:commandButton id="add-user" value="Add" action="adduser" actionListener="#{UserListBean.addUser}"/>
+      
+      <p>
+      
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+      
+   </h:form>
+</f:view>
diff --git a/source/web/jsp/users/change-password.jsp b/source/web/jsp/users/change-password.jsp
new file mode 100644
index 0000000000..29aebb50b4
--- /dev/null
+++ b/source/web/jsp/users/change-password.jsp
@@ -0,0 +1,198 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_change_password">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("edit-pass:password").focus();
+      updateButtonState();
+   }
+   
+   function updateButtonState()
+   {
+      if (document.getElementById("edit-pass:password").value.length == 0 ||
+          document.getElementById("edit-pass:confirm").value.length == 0)
+      {
+         document.getElementById("edit-pass:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("edit-pass:ok-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="edit-pass">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/edituser_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.change_password}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.change_password_description}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.change_password_instructions}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.username}"/>:</td>
+                                    <td>
+                                       <h:outputText value="#{UsersBean.person.properties.userName}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.password}"/>:</td>
+                                    <td>
+                                       <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" redisplay="true" />&nbsp;*
+                                       &nbsp;<h:message id="errors1" for="password" style="color:red" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.confirm}"/>:</td>
+                                    <td>
+                                       <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" redisplay="true" />&nbsp;*
+                                       &nbsp;<h:message id="errors2" for="confirm" style="color:red" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" id="ok-button" action="#{UsersBean.changePasswordOK}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="cancel" styleClass="wizardButton" immediate="true" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+<script>
+   updateButtonState();
+</script>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/users/delete-user.jsp b/source/web/jsp/users/delete-user.jsp
new file mode 100644
index 0000000000..b150e4c600
--- /dev/null
+++ b/source/web/jsp/users/delete-user.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_delete_user">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="delete-user">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                     
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage url="/images/icons/delete_large.gif"/>
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_user}" /> '<h:outputText value="#{UsersBean.person.properties.userName}" />'</div>
+                              <div class="mainSubText"><h:outputText value="#{msg.delete_user_info}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="4" border="0" width="100%">
+                        <tr>
+                           
+                           <td width="100%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubTitle">
+                                       <h:outputFormat value="#{msg.delete_user_confirm}">
+                                          <f:param value="#{UsersBean.person.properties.userName}"/>
+                                       </h:outputFormat>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <%-- Error Messages --%>
+                                       <%-- messages tag to show messages not handled by other specific message tags --%>
+                                       <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                                    <td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.delete}" action="#{UsersBean.deleteOK}" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="dialogButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel}" action="manageUsers" styleClass="dialogControls" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
new file mode 100644
index 0000000000..4bf9efb23e
--- /dev/null
+++ b/source/web/jsp/users/users.jsp
@@ -0,0 +1,213 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_users">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.manage_users}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{msg.manageusers_description}" /></div>
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=100 style="padding-left:2px">
+                              <%-- Current object actions --%>
+                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
+                              <a:actionLink value="#{msg.create_user}" image="/images/icons/create_user.gif" padding="4" action="createUser" actionListener="#{NewUserWizard.startWizard}" />
+                           </td>
+                           <td bgcolor="#465F7D" width=1></td>
+                           <td width=110 style="padding-left:2px">
+                              <%-- View mode settings --%>
+                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0">
+                                 <a:listItem value="0" label="#{msg.user_details}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="2" cellpadding="2" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <%-- Users List --%>
+                              <a:panel id="users-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.users}">
+                              
+                              <a:richList id="users-list" binding="#{UsersBean.usersRichList}" viewMode="details" pageSize="10"
+                                    styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                                    value="#{UsersBean.users}" var="r" initialSortColumn="userName" initialSortDescending="true">
+                                 
+                                 <%-- Primary column with full name --%>
+                                 <a:column primary="true" width="200" style="padding:2px;text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.name}" value="fullName" mode="case-insensitive" styleClass="header"/>
+                                    </f:facet>
+                                    <f:facet name="small-icon">
+                                       <h:graphicImage url="/images/icons/person.gif" />
+                                    </f:facet>
+                                    <h:outputText value="#{r.fullName}" />
+                                 </a:column>
+                                 
+                                 <%-- Username column --%>
+                                 <a:column width="120" style="text-align:left">
+                                    <f:facet name="header">
+                                       <a:sortLink label="#{msg.username}" value="userName" styleClass="header"/>
+                                    </f:facet>
+                                    <h:outputText value="#{r.userName}" />
+                                 </a:column>
+                                 
+                                 <%-- Home Space Path column --%>
+                                 <a:column style="text-align:left">
+                                    <f:facet name="header">
+                                       <h:outputText value="#{msg.homespace}"/>
+                                    </f:facet>
+                                    <r:nodePath value="#{r.homeSpace}" disabled="true" showLeaf="true" />
+                                 </a:column>
+                                 
+                                 <%-- Actions column --%>
+                                 <a:column actions="true" style="text-align:left">
+                                    <f:facet name="header">
+                                       <h:outputText value="#{msg.actions}"/>
+                                    </f:facet>
+                                    <a:actionLink value="#{msg.modify}" image="/images/icons/edituser.gif" showLink="false" action="editUser" actionListener="#{NewUserWizard.startWizardForEdit}">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                    <a:actionLink value="#{msg.change_password}" image="/images/icons/change_password.gif" showLink="false" action="changePassword" actionListener="#{UsersBean.setupUserAction}">
+                                       <f:param name="id" value="#{r.id}" />
+                                    </a:actionLink>
+                                    <a:booleanEvaluator value="#{r.userName != 'admin'}">
+                                       <a:actionLink value="#{msg.delete}" image="/images/icons/delete_person.gif" showLink="false" action="deleteUser" actionListener="#{UsersBean.setupUserAction}">
+                                          <f:param name="id" value="#{r.id}" />
+                                       </a:actionLink>
+                                    </a:booleanEvaluator>
+                                 </a:column>
+                                 
+                                 <a:dataPager styleClass="pager" />
+                              </a:richList>
+                              
+                              </a:panel>
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="0" cellspacing="0" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.close}" action="adminConsole" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/add-content/properties.jsp b/source/web/jsp/wizard/add-content/properties.jsp
new file mode 100644
index 0000000000..651ecda810
--- /dev/null
+++ b/source/web/jsp/wizard/add-content/properties.jsp
@@ -0,0 +1,268 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_add_content_props">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("add-content-properties:file-name").focus();
+      checkButtonState();
+   }
+
+   function checkButtonState()
+   {
+      if (document.getElementById("add-content-properties:file-name").value.length == 0 ||
+          document.getElementById("add-content-properties:title").value.length == 0)
+      {
+         document.getElementById("add-content-properties:next-button").disabled = true;
+         document.getElementById("add-content-properties:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("add-content-properties:next-button").disabled = false;
+         document.getElementById("add-content-properties:finish-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="add-content-properties">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.upload_document}" />
+                                 <a:listItem value="2" label="2. #{msg.properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.general}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.file_name}"/>:</td>
+                                    <td width="85%">
+                                       <h:inputText id="file-name" value="#{AddContentWizard.fileName}" size="35" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.type}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu value="#{AddContentWizard.objectType}">
+                                          <f:selectItems value="#{AddContentWizard.objectTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.content_type}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu value="#{AddContentWizard.contentType}">
+                                          <f:selectItems value="#{AddContentWizard.contentTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.title}"/>:</td>
+                                    <td>
+                                       <h:inputText id="title" value="#{AddContentWizard.title}" size="35" maxlength="1024"
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{AddContentWizard.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.author}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{AddContentWizard.author}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td></td>
+                                    <td><table cellspacing=0 cellpadding=0>
+                                          <tr>
+                                             <td><h:selectBooleanCheckbox value="#{AddContentWizard.inlineEdit}" /></td>
+                                             <td width=100%><nobr>&nbsp;<h:outputText value="#{msg.inline_editable}"/></nobr></td>
+                                          </tr>
+                                          <tr>
+                                             <td colspan=2>
+                                                <div id="info" style="padding-left: 2px; padding-top: 2px;">
+                                                   <h:graphicImage alt="" value="/images/icons/info_icon.gif" style="vertical-align: middle;" />&nbsp;
+                                                   <h:outputText value="#{msg.warning_inline}" />
+                                                </div>
+                                             </td>
+                                          </tr>
+                                       </table></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{AddContentWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{AddContentWizard.next}" 
+                                                        styleClass="wizardButton" disabled="#{AddContentWizard.nextFinishDisabled}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{AddContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{AddContentWizard.finish}" 
+                                                        styleClass="wizardButton" disabled="#{AddContentWizard.nextFinishDisabled}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/add-content/summary.jsp b/source/web/jsp/wizard/add-content/summary.jsp
new file mode 100644
index 0000000000..497871638d
--- /dev/null
+++ b/source/web/jsp/wizard/add-content/summary.jsp
@@ -0,0 +1,174 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_add_content_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+   <h:form acceptCharset="UTF-8" id="add-content-summary">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.upload_document}" />
+                                 <a:listItem value="2" label="2. #{msg.properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{AddContentWizard.summary}" escape="false" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{AddContentWizard.stepInstructions}" escape="false" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{AddContentWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{AddContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/add-content/upload.jsp b/source/web/jsp/wizard/add-content/upload.jsp
new file mode 100644
index 0000000000..bec125eeec
--- /dev/null
+++ b/source/web/jsp/wizard/add-content/upload.jsp
@@ -0,0 +1,218 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="org.alfresco.web.bean.wizard.AddContentWizard" %>
+<%@ page import="org.alfresco.web.app.portlet.AlfrescoFacesPortlet" %>
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<r:page titleId="title_add_content_upload">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="add-content-upload-start">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+                              
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                          value="1" disabled="true">
+                                <a:listItem value="1" label="1. #{msg.upload_document}" />
+                                 <a:listItem value="2" label="2. #{msg.properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>   
+                           
+                           </h:form>
+                        
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{AddContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{AddContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">1. <h:outputText value="#{msg.locate_document}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 
+                                 <r:uploadForm>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.location}"/>:<input style="margin-left:12px;" type="file" size="50" name="alfFileInput"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">2. <h:outputText value="#{msg.click_upload}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <input style="margin-left:12px;" type="submit" value="<%=Application.getMessage(FacesContext.getCurrentInstance(), "upload")%>" />
+                                    </td>
+                                 </tr>
+                                 </r:uploadForm>
+                                 
+                                 <h:form acceptCharset="UTF-8" id="add-content-upload-end">
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <%
+                                 AddContentWizard wiz = (AddContentWizard)session.getAttribute(AlfrescoFacesPortlet.MANAGED_BEAN_PREFIX + "AddContentWizard");
+                                 if (wiz == null)
+                                 {
+                                    wiz = (AddContentWizard)session.getAttribute("AddContentWizard");
+                                 }
+                                 if (wiz != null && wiz.getFileName() != null) {
+                                 %>
+                                    <tr>
+                                       <td>
+                                          <img alt="" align="absmiddle" src="<%=request.getContextPath()%>/images/icons/info_icon.gif" />
+                                          <%=wiz.getFileUploadSuccessMsg()%>
+                                       </td>
+                                    </tr>
+                                 <% } %>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{AddContentWizard.stepInstructions}" escape="false" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{AddContentWizard.next}" styleClass="wizardButton" disabled="#{AddContentWizard.fileName == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{AddContentWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{AddContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+  </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-add-features.jsp b/source/web/jsp/wizard/create-action/action-add-features.jsp
new file mode 100644
index 0000000000..99097a9332
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-add-features.jsp
@@ -0,0 +1,183 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_add_feature">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="add-features">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.select_feature}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewActionWizard.actionProperties.aspect}">
+                                          <f:selectItems value="#{NewActionWizard.aspects}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-check-in.jsp b/source/web/jsp/wizard/create-action/action-check-in.jsp
new file mode 100644
index 0000000000..a730a46155
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-check-in.jsp
@@ -0,0 +1,189 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_checkin">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-check-in">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><nobr><h:outputText value="#{msg.version_notes}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputTextarea value="#{NewActionWizard.actionProperties.checkinDescription}" 
+                                                        rows="2" cols="50" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{NewActionWizard.actionProperties.checkinMinorChange}" />
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.minor_change}" /></span>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-check-out.jsp b/source/web/jsp/wizard/create-action/action-check-out.jsp
new file mode 100644
index 0000000000..b6b6d55c23
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-check-out.jsp
@@ -0,0 +1,186 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_checkout">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-check-out">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
+                                    <td width="100%">
+                                       <r:spaceSelector label="#{msg.select_checkout_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-copy.jsp b/source/web/jsp/wizard/create-action/action-copy.jsp
new file mode 100644
index 0000000000..78a565b576
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-copy.jsp
@@ -0,0 +1,186 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_copy">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-copy">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-email.jsp b/source/web/jsp/wizard/create-action/action-email.jsp
new file mode 100644
index 0000000000..6c0609b4d4
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-email.jsp
@@ -0,0 +1,226 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_email">
+
+   
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("action-email:subject").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("action-email:subject").value.length == 0 ||
+          document.getElementById("action-email:address").value.length == 0)
+      {
+         document.getElementById("action-email:next-button").disabled = true;
+         document.getElementById("action-email:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("action-email:next-button").disabled = false;
+         document.getElementById("action-email:finish-button").disabled = false;
+      }
+   }
+</script>
+   
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-email">
+      
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.subject}"/>:</td>
+                                    <td width="90%">
+                                       <h:inputText id="subject" value="#{NewActionWizard.actionProperties.subject}" 
+                                                    size="75" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.message}"/>:</td>
+                                    <td>
+                                       <h:inputTextarea value="#{NewActionWizard.actionProperties.message}" 
+                                                        rows="5" cols="75" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.to}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu id="address" value="#{NewActionWizard.actionProperties.to}"
+                                                            onchange="javascript:checkButtonState();">
+                                          <f:selectItems value="#{NewActionWizard.users}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-import.jsp b/source/web/jsp/wizard/create-action/action-import.jsp
new file mode 100644
index 0000000000..5e45c59577
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-import.jsp
@@ -0,0 +1,197 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_import">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-import">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        style="border: 1px dashed #cccccc; padding: 6px;"/>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.encoding}"/>:</nobr></td>
+                                    <td>
+                                       <h:selectOneMenu value="#{NewActionWizard.actionProperties.encoding}">
+                                          <f:selectItems value="#{NewActionWizard.encodings}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-link-category.jsp b/source/web/jsp/wizard/create-action/action-link-category.jsp
new file mode 100644
index 0000000000..a58c633694
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-link-category.jsp
@@ -0,0 +1,185 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_link_category">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-link-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
+                                    <td width="90%">
+                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.category}" 
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.category == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.category == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                             
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-move.jsp b/source/web/jsp/wizard/create-action/action-move.jsp
new file mode 100644
index 0000000000..e042fff7de
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-move.jsp
@@ -0,0 +1,186 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_move">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-move">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-simple-workflow.jsp b/source/web/jsp/wizard/create-action/action-simple-workflow.jsp
new file mode 100644
index 0000000000..6d86981724
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-simple-workflow.jsp
@@ -0,0 +1,317 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_simple_workflow">
+
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("simple-workflow:approve-step-name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("simple-workflow:approve-step-name").value.length == 0 ||
+          document.getElementById("simple-workflow:client-approve-folder_selected").value.length == 0 ||
+          rejectValid() == false)
+      {
+         document.getElementById("simple-workflow:next-button").disabled = true;
+         document.getElementById("simple-workflow:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("simple-workflow:next-button").disabled = false;
+         document.getElementById("simple-workflow:finish-button").disabled = false;
+      }
+   }
+   
+   function rejectValid()
+   {
+      var result = true;
+      
+      if (document.forms['simple-workflow']['simple-workflow:reject-step-present'][0].checked && 
+          (document.getElementById("simple-workflow:reject-step-name").value.length == 0 ||
+           document.getElementById("simple-workflow:client-reject-folder_selected").value.length == 0))
+      {
+         result = false;
+      }
+      
+      return result;
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="simple-workflow">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.approve_flow}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.approve_step_name}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputText id="approve-step-name" value="#{NewActionWizard.actionProperties.approveStepName}" 
+                                                    onkeyup="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr><td colspan="2"><h:outputText value="#{msg.move_or_copy}"/></td>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="2" cellspacing="2" border="0">
+                                          <tr>
+                                             <td valign="top">
+                                                <h:selectOneRadio value="#{NewActionWizard.actionProperties.approveAction}">
+                                                   <f:selectItem itemValue="move" itemLabel="#{msg.move}" />
+                                                   <f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
+                                                </h:selectOneRadio>
+                                             </td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td valign="top" style="padding-top:10px;">To:</td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td style="padding-top:6px;">
+                                                <r:spaceSelector id="client-approve-folder"
+                                                        label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.approveFolder}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.reject_flow}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.want_reject_step}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio id="reject-step-present" value="#{NewActionWizard.actionProperties.rejectStepPresent}"
+                                                         onclick="javascript:checkButtonState();" >
+                                          <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
+                                          <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="0" cellspacing="0" border="0">
+                                          <tr>
+                                             <td style="padding-left:24px;"></td>
+                                             <td>
+                                                <table cellpadding="2" cellspacing="2" border="0">
+                                                   <tr>
+                                                      <td>
+                                                         <nobr><h:outputText value="#{msg.reject_step_name}"/>:</nobr>
+                                                         <h:inputText id="reject-step-name" value="#{NewActionWizard.actionProperties.rejectStepName}" 
+                                                                      onkeyup="javascript:checkButtonState();" />
+                                                      </td>
+                                                   </tr>
+                                                   <tr><td class="paddingRow"></td></tr>
+                                                   <tr><td><h:outputText value="#{msg.move_or_copy}"/></td>
+                                                   <tr>
+                                                      <td>
+                                                         <table cellpadding="2" cellspacing="2" border="0">
+                                                            <tr>
+                                                               <td valign="top">
+                                                                  <h:selectOneRadio value="#{NewActionWizard.actionProperties.rejectAction}">
+                                                                     <f:selectItem itemValue="move" itemLabel="#{msg.move}" />
+                                                                     <f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
+                                                                  </h:selectOneRadio>
+                                                               </td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td valign="top" style="padding-top:10px;"><h:outputText value="#{msg.to}"/>:</td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td style="padding-top:6px;">
+                                                                  <r:spaceSelector id="client-reject-folder"
+                                                                          label="#{msg.select_destination_prompt}" 
+                                                                          value="#{NewActionWizard.actionProperties.rejectFolder}" 
+                                                                          initialSelection="#{NavigationBean.currentNodeId}"
+                                                                          styleClass="selector"/>
+                                                               </td>
+                                                            </tr>
+                                                         </table>
+                                                      </td>
+                                                   </tr>
+                                                </table>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-specialise-type.jsp b/source/web/jsp/wizard/create-action/action-specialise-type.jsp
new file mode 100644
index 0000000000..e1b9be1acd
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-specialise-type.jsp
@@ -0,0 +1,183 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_specialise_action">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="create-action-specialise-type-action">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.required_format}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewActionWizard.actionProperties.objecttype}">
+                                          <f:selectItems value="#{NewActionWizard.objectTypes}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-transform-image.jsp b/source/web/jsp/wizard/create-action/action-transform-image.jsp
new file mode 100644
index 0000000000..2949c1340b
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-transform-image.jsp
@@ -0,0 +1,201 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_transform_image">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-transform-image">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.required_format}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewActionWizard.actionProperties.imageTransformer}">
+                                          <f:selectItems value="#{NewActionWizard.imageTransformers}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.options}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{NewActionWizard.actionProperties.transformOptions}" size="50" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action-transform.jsp b/source/web/jsp/wizard/create-action/action-transform.jsp
new file mode 100644
index 0000000000..4cdfa5841d
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action-transform.jsp
@@ -0,0 +1,195 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_transform">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-transform">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.required_format}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewActionWizard.actionProperties.transformer}">
+                                          <f:selectItems value="#{NewActionWizard.transformers}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewActionWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewActionWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/action.jsp b/source/web/jsp/wizard/create-action/action.jsp
new file mode 100644
index 0000000000..0aa08b0c35
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/action.jsp
@@ -0,0 +1,196 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_action">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-action">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.action}"/>:</td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewActionWizard.action}"
+                                          onchange="javascript:itemSelected(this);">
+                                          <f:selectItems value="#{NewActionWizard.actions}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <div style="width: 300px">
+                                          <a:dynamicDescription selected="#{NewActionWizard.action}">
+                                             <a:descriptions value="#{NewActionWizard.actionDescriptions}" />
+                                          </a:dynamicDescription>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewActionWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-action/summary.jsp b/source/web/jsp/wizard/create-action/summary.jsp
new file mode 100644
index 0000000000..1a8690d156
--- /dev/null
+++ b/source/web/jsp/wizard/create-action/summary.jsp
@@ -0,0 +1,175 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_action_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="action-summary">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.action}" />
+                                 <a:listItem value="2" label="2. #{msg.action_settings}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewActionWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewActionWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewActionWizard.summary}" escape="false"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewActionWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewActionWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewActionWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewActionWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/create-html.jsp b/source/web/jsp/wizard/create-content/create-html.jsp
new file mode 100644
index 0000000000..fd47ca5166
--- /dev/null
+++ b/source/web/jsp/wizard/create-content/create-html.jsp
@@ -0,0 +1,209 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_content">
+
+<script language="javascript" type="text/javascript" src="<%=request.getContextPath()%>/scripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+
+   <%-- Init the Tiny MCE in-line HTML editor --%>
+   tinyMCE.init({
+   	theme : "advanced",
+   	mode : "exact",
+   	elements : "editor",
+   	save_callback : "saveContent",
+		plugins : "table",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "left",
+		theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+		theme_advanced_buttons2_add : "separator,forecolor,backcolor",
+		theme_advanced_buttons3_add_before : "tablecontrols,separator",
+		theme_advanced_disable: "styleselect",
+		extended_valid_elements : "a[href|target|name],font[face|size|color|style],span[class|align|style]"
+   });
+   
+   function saveContent(id, content)
+   {
+      document.forms['create-html']['create-html:editorOutput'].value = content;
+   }
+   
+   var isIE = (document.all);
+   
+</script>
+
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="create-html">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="100%">
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.select_type}" />
+                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
+                                 <a:listItem value="3" label="3. #{msg.properties}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top" height="100%">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <div id='editor' style='width:100%; height:360px'>
+                                 <h:outputText value="#{CreateContentWizard.content}" escape="false" />
+                              </div>
+                              <h:inputHidden id="editorOutput" value="#{CreateContentWizard.content}" />
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/create-text.jsp b/source/web/jsp/wizard/create-content/create-text.jsp
new file mode 100644
index 0000000000..84e8b30088
--- /dev/null
+++ b/source/web/jsp/wizard/create-content/create-text.jsp
@@ -0,0 +1,177 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_content">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="create-text">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="100%">
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.select_type}" />
+                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
+                                 <a:listItem value="3" label="3. #{msg.properties}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top" height="100%">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <h:inputTextarea id="textArea" rows="20" cols="80" value="#{CreateContentWizard.content}" />
+                              
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/properties.jsp b/source/web/jsp/wizard/create-content/properties.jsp
new file mode 100644
index 0000000000..d8f2a6dff8
--- /dev/null
+++ b/source/web/jsp/wizard/create-content/properties.jsp
@@ -0,0 +1,252 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_content_props">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("create-content-props:file-name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("create-content-props:file-name").value.length == 0 ||
+          document.getElementById("create-content-props:title").value.length == 0)
+      {
+         document.getElementById("create-content-props:next-button").disabled = true;
+         document.getElementById("create-content-props:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("create-content-props:next-button").disabled = false;
+         document.getElementById("create-content-props:finish-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="create-content-props">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.select_type}" />
+                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
+                                 <a:listItem value="3" label="3. #{msg.properties}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.general}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.file_name}"/>:</td>
+                                    <td width="85%">
+                                       <h:inputText id="file-name" value="#{CreateContentWizard.fileName}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.type}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu value="#{CreateContentWizard.objectType}">
+                                          <f:selectItems value="#{CreateContentWizard.objectTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.content_type}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu value="#{CreateContentWizard.contentType}">
+                                          <f:selectItems value="#{CreateContentWizard.contentTypes}" />
+                                       </h:selectOneMenu>&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.title}"/>:</td>
+                                    <td>
+                                       <h:inputText id="title" value="#{CreateContentWizard.title}" size="35" maxlength="1024" onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{CreateContentWizard.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.author}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{CreateContentWizard.author}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{CreateContentWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+<script>
+   checkButtonState();
+</script>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/select-type.jsp b/source/web/jsp/wizard/create-content/select-type.jsp
new file mode 100644
index 0000000000..6c912b2461
--- /dev/null
+++ b/source/web/jsp/wizard/create-content/select-type.jsp
@@ -0,0 +1,192 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_content">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="select-type">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td height="100%">
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.select_type}" />
+                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
+                                 <a:listItem value="3" label="3. #{msg.properties}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top" height="100%">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{CreateContentWizard.createType}" layout="pageDirection" valueChangeListener="#{CreateContentWizard.createContentChanged}">
+                                          <f:selectItem itemValue="html" itemLabel="#{msg.html_content}" />
+                                          <f:selectItem itemValue="txt" itemLabel="#{msg.text_content}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{CreateContentWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{CreateContentWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign="top">
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <h:messages globalOnly="true" styleClass="errorMessage" layout="table" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/create-content/summary.jsp b/source/web/jsp/wizard/create-content/summary.jsp
new file mode 100644
index 0000000000..88f4460952
--- /dev/null
+++ b/source/web/jsp/wizard/create-content/summary.jsp
@@ -0,0 +1,178 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_create_content_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="create-content-summary">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="4" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.select_type}" />
+                                 <a:listItem value="2" label="2. #{msg.enter_content}" />
+                                 <a:listItem value="3" label="3. #{msg.properties}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{CreateContentWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{CreateContentWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{CreateContentWizard.summary}" escape="false" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{CreateContentWizard.stepInstructions}" escape="false" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{CreateContentWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{CreateContentWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{CreateContentWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/invite-users/invite.jsp b/source/web/jsp/wizard/invite-users/invite.jsp
new file mode 100644
index 0000000000..805e0a4b5a
--- /dev/null
+++ b/source/web/jsp/wizard/invite-users/invite.jsp
@@ -0,0 +1,234 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_inviteusers_invite">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="invite-users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteUsersWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{InviteUsersWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.invite_step_1}" />
+                                 <a:listItem value="2" label="2. #{msg.invite_step_2}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{InviteUsersWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{InviteUsersWizard.stepDescription}" /></td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{msg.specify_usersgroups}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="1. #{msg.select_usersgroups}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <%-- Picker to select Users/Groups --%>
+                                    <td><a:genericPicker id="picker" showAddButton="false" filters="#{InviteUsersWizard.filters}" queryCallback="#{InviteUsersWizard.pickerCallback}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.role}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <div style="padding:4px">
+                                          <h:selectOneListbox id="roles" style="width:250px" size="5">
+                                             <f:selectItems value="#{InviteUsersWizard.roles}" />
+                                          </h:selectOneListbox>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText">
+                                       2. <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{InviteUsersWizard.addSelection}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{msg.selected_usersgroups}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:dataTable value="#{InviteUsersWizard.userRolesDataModel}" var="row" 
+                                                    rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                                                    styleClass="selectedItems" headerClass="selectedItemsHeader"
+                                                    cellspacing="0" cellpadding="4" 
+                                                    rendered="#{InviteUsersWizard.userRolesDataModel.rowCount != 0}">
+                                          <h:column>
+                                             <f:facet name="header">
+                                                <h:outputText value="#{msg.name}" />
+                                             </f:facet>
+                                             <h:outputText value="#{row.label}" />
+                                          </h:column>
+                                          <h:column>
+                                             <a:actionLink actionListener="#{InviteUsersWizard.removeSelection}" image="/images/icons/delete.gif"
+                                                           value="#{msg.remove}" showLink="false" style="padding-left:6px" />
+                                          </h:column>
+                                       </h:dataTable>
+                                       
+                                       <a:panel id="no-items" rendered="#{InviteUsersWizard.userRolesDataModel.rowCount == 0}">
+                                          <table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>
+                                             <tr>
+                                                <td colspan='2' class='selectedItemsHeader'><h:outputText id="no-items-name" value="#{msg.name}" /></td>
+                                             </tr>
+                                             <tr>
+                                                <td class='selectedItemsRow'><h:outputText id="no-items-msg" value="#{msg.no_selected_items}" /></td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{InviteUsersWizard.stepInstructions}" /></td>
+                                 </tr> 
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{InviteUsersWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{InviteUsersWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/invite-users/notify.jsp b/source/web/jsp/wizard/invite-users/notify.jsp
new file mode 100644
index 0000000000..302c20bd19
--- /dev/null
+++ b/source/web/jsp/wizard/invite-users/notify.jsp
@@ -0,0 +1,215 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_inviteusers_notify">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="notify-users">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteUsersWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{InviteUsersWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.invite_step_1}" />
+                                 <a:listItem value="2" label="2. #{msg.invite_step_2}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan=2 class="mainSubTitle"><h:outputText value="#{InviteUsersWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan=2 class="mainSubText"><h:outputText value="#{InviteUsersWizard.stepDescription}" /></td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan=2><h:outputText value="#{msg.send_email}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan=2>
+                                       <h:selectOneRadio value="#{InviteUsersWizard.notify}">
+                                          <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
+                                          <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr>
+                                    <td><h:outputText value="#{msg.subject}" />:</td>
+                                    <td>
+                                       <h:inputText value="#{InviteUsersWizard.subject}" size="50" maxlength="256" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr>
+                                    <td><h:outputText value="#{msg.body}" />:</td>
+                                    <td>
+                                       <h:inputTextarea value="#{InviteUsersWizard.body}" rows="2" cols="48" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan=2>
+                                       <table border=0 cellspacing=2 cellpadding=0>
+                                          <tr valign="top">
+                                             <td>
+                                                <h:outputText value="#{msg.automatic_text}" />:
+                                             </td>
+                                             <td>
+                                                <h:outputText escape="false" value="#{InviteUsersWizard.automaticText}" />
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan=2><h:outputText value="#{InviteUsersWizard.stepInstructions}" /></td>
+                                 </tr> 
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{InviteUsersWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{InviteUsersWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{InviteUsersWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-add-features.jsp b/source/web/jsp/wizard/new-rule/action-add-features.jsp
new file mode 100644
index 0000000000..7af463b459
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-add-features.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_add_feature">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-add-features">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.select_feature}"/></nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.actionProperties.aspect}">
+                                          <f:selectItems value="#{NewRuleWizard.aspects}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-check-in.jsp b/source/web/jsp/wizard/new-rule/action-check-in.jsp
new file mode 100644
index 0000000000..d11b4c4c74
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-check-in.jsp
@@ -0,0 +1,164 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_checkin">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-check-in">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><nobr><h:outputText value="#{msg.version_notes}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputTextarea value="#{NewRuleWizard.actionProperties.checkinDescription}" 
+                                                        rows="2" cols="50" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td>
+                                       <h:selectBooleanCheckbox value="#{NewRuleWizard.actionProperties.checkinMinorChange}" />
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.minor_change}" /></span>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-check-out.jsp b/source/web/jsp/wizard/new-rule/action-check-out.jsp
new file mode 100644
index 0000000000..0e8e3e3d24
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-check-out.jsp
@@ -0,0 +1,160 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_checkout">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-check-out">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.checkout_location}"/>:</nobr></td>
+                                    <td width="100%">
+                                       <r:spaceSelector label="#{msg.select_checkout_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-copy.jsp b/source/web/jsp/wizard/new-rule/action-copy.jsp
new file mode 100644
index 0000000000..779c3a2fe2
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-copy.jsp
@@ -0,0 +1,160 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_copy">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-copy">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-email.jsp b/source/web/jsp/wizard/new-rule/action-email.jsp
new file mode 100644
index 0000000000..8ecf3577aa
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-email.jsp
@@ -0,0 +1,200 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_email">
+
+   
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("new-rule-email:subject").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("new-rule-email:subject").value.length == 0 ||
+          document.getElementById("new-rule-email:address").value.length == 0)
+      {
+         document.getElementById("new-rule-email:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-rule-email:ok-button").disabled = false;
+      }
+   }
+</script>
+   
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-email">
+      
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.subject}"/>:</td>
+                                    <td width="90%">
+                                       <h:inputText id="subject" value="#{NewRuleWizard.actionProperties.subject}" 
+                                                    size="75" maxlength="1024" 
+                                                    onkeyup="javascript:checkButtonState();"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.message}"/>:</td>
+                                    <td>
+                                       <h:inputTextarea value="#{NewRuleWizard.actionProperties.message}" 
+                                                        rows="5" cols="75" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.to}"/>:</td>
+                                    <td>
+                                       <h:selectOneMenu id="address" value="#{NewRuleWizard.actionProperties.to}"
+                                                            onchange="javascript:checkButtonState();">
+                                          <f:selectItems value="#{NewRuleWizard.users}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{NewRuleWizard.addAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-import.jsp b/source/web/jsp/wizard/new-rule/action-import.jsp
new file mode 100644
index 0000000000..4cc8ac7172
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-import.jsp
@@ -0,0 +1,171 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_import">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-import">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.import_to}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        style="border: 1px dashed #cccccc; padding: 6px;"/>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.encoding}"/>:</nobr></td>
+                                    <td>
+                                       <h:selectOneMenu value="#{NewRuleWizard.actionProperties.encoding}">
+                                          <f:selectItems value="#{NewRuleWizard.encodings}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-link-category.jsp b/source/web/jsp/wizard/new-rule/action-link-category.jsp
new file mode 100644
index 0000000000..0af8bc38c6
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-link-category.jsp
@@ -0,0 +1,159 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_link_category">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-link-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
+                                    <td width="90%">
+                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.category}" 
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.category == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                             
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-move.jsp b/source/web/jsp/wizard/new-rule/action-move.jsp
new file mode 100644
index 0000000000..11c0ee7684
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-move.jsp
@@ -0,0 +1,160 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_move">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-move">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td width="90%">
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp b/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp
new file mode 100644
index 0000000000..dac60cd051
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp
@@ -0,0 +1,289 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_simple_workflow">
+
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("new-rule-simple-workflow:approve-step-name").focus();
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("new-rule-simple-workflow:approve-step-name").value.length == 0 ||
+          document.getElementById("new-rule-simple-workflow:client-approve-folder_selected").value.length == 0 ||
+          rejectValid() == false)
+      {
+         document.getElementById("new-rule-simple-workflow:ok-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-rule-simple-workflow:ok-button").disabled = false;
+      }
+   }
+   
+   function rejectValid()
+   {
+      var result = true;
+      
+      if (document.forms['new-rule-simple-workflow']['new-rule-simple-workflow:reject-step-present'][0].checked && 
+          (document.getElementById("new-rule-simple-workflow:reject-step-name").value.length == 0 ||
+           document.getElementById("new-rule-simple-workflow:client-reject-folder_selected").value.length == 0))
+      {
+         result = false;
+      }
+      
+      return result;
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-simple-workflow">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.approve_flow}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.approve_step_name}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:inputText id="approve-step-name" value="#{NewRuleWizard.actionProperties.approveStepName}" 
+                                                    onkeyup="javascript:checkButtonState();" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr><td colspan="2"><h:outputText value="#{msg.move_or_copy}"/></td>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="2" cellspacing="2" border="0">
+                                          <tr>
+                                             <td valign="top">
+                                                <h:selectOneRadio value="#{NewRuleWizard.actionProperties.approveAction}">
+                                                   <f:selectItem itemValue="move" itemLabel="#{msg.move}" />
+                                                   <f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
+                                                </h:selectOneRadio>
+                                             </td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td valign="top" style="padding-top:10px;">To:</td>
+                                             <td style="padding-left:6px;"></td>
+                                             <td style="padding-top:6px;">
+                                                <r:spaceSelector id="client-approve-folder"
+                                                        label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.approveFolder}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.reject_flow}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{msg.want_reject_step}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio id="reject-step-present" value="#{NewRuleWizard.actionProperties.rejectStepPresent}"
+                                                         onclick="javascript:checkButtonState();" >
+                                          <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
+                                          <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table cellpadding="0" cellspacing="0" border="0">
+                                          <tr>
+                                             <td style="padding-left:24px;"></td>
+                                             <td>
+                                                <table cellpadding="2" cellspacing="2" border="0">
+                                                   <tr>
+                                                      <td>
+                                                         <nobr><h:outputText value="#{msg.reject_step_name}"/>:</nobr>
+                                                         <h:inputText id="reject-step-name" value="#{NewRuleWizard.actionProperties.rejectStepName}" 
+                                                                      onkeyup="javascript:checkButtonState();" />
+                                                      </td>
+                                                   </tr>
+                                                   <tr><td class="paddingRow"></td></tr>
+                                                   <tr><td><h:outputText value="#{msg.move_or_copy}"/></td>
+                                                   <tr>
+                                                      <td>
+                                                         <table cellpadding="2" cellspacing="2" border="0">
+                                                            <tr>
+                                                               <td valign="top">
+                                                                  <h:selectOneRadio value="#{NewRuleWizard.actionProperties.rejectAction}">
+                                                                     <f:selectItem itemValue="move" itemLabel="#{msg.move}" />
+                                                                     <f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
+                                                                  </h:selectOneRadio>
+                                                               </td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td valign="top" style="padding-top:10px;"><h:outputText value="#{msg.to}"/>:</td>
+                                                               <td style="padding-left:6px;"></td>
+                                                               <td style="padding-top:6px;">
+                                                                  <r:spaceSelector id="client-reject-folder"
+                                                                          label="#{msg.select_destination_prompt}" 
+                                                                          value="#{NewRuleWizard.actionProperties.rejectFolder}"
+                                                                          initialSelection="#{NavigationBean.currentNodeId}" 
+                                                                          styleClass="selector"/>
+                                                               </td>
+                                                            </tr>
+                                                         </table>
+                                                      </td>
+                                                   </tr>
+                                                </table>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{NewRuleWizard.addAction}" 
+                                                        styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-specialise-type.jsp b/source/web/jsp/wizard/new-rule/action-specialise-type.jsp
new file mode 100644
index 0000000000..334e3e86a6
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-specialise-type.jsp
@@ -0,0 +1,158 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_specialise_type_action">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-specialise-type-action">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.select_feature}"/></nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.actionProperties.objecttype}">
+                                          <f:selectItems value="#{NewRuleWizard.objectTypes}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-transform-image.jsp b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
new file mode 100644
index 0000000000..fecac687b7
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
@@ -0,0 +1,175 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_transform_image">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-transform-image">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.required_format}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.actionProperties.imageTransformer}">
+                                          <f:selectItems value="#{NewRuleWizard.imageTransformers}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.options}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{NewRuleWizard.actionProperties.transformOptions}" size="50" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action-transform.jsp b/source/web/jsp/wizard/new-rule/action-transform.jsp
new file mode 100644
index 0000000000..b9400d6353
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action-transform.jsp
@@ -0,0 +1,169 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_transform">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-transform">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_action_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.required_format}"/>:</nobr></td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.actionProperties.transformer}">
+                                          <f:selectItems value="#{NewRuleWizard.transformers}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.destination}"/>:</td>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_destination_prompt}" 
+                                                        value="#{NewRuleWizard.actionProperties.destinationLocation}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addAction}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.actionProperties.destinationLocation == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddAction}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/action.jsp b/source/web/jsp/wizard/new-rule/action.jsp
new file mode 100644
index 0000000000..9682b8d59c
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/action.jsp
@@ -0,0 +1,266 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_action">
+
+<script language="JavaScript1.2">
+   function itemSelected(inputField)
+   {
+      if (inputField.selectedIndex == 0)
+      {
+         document.getElementById("new-rule-action:set-add-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-rule-action:set-add-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-action">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.details}" />
+                                 <a:listItem value="2" label="2. #{msg.conditions}" />
+                                 <a:listItem value="3" label="3. #{msg.actions}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewRuleWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>1.</td>
+                                    <td><h:outputText value="#{msg.select_action}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td width="98%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.action}" 
+                                          onchange="javascript:itemSelected(this);">
+                                          <f:selectItems value="#{NewRuleWizard.actions}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <div style="width: 300px">
+                                          <a:dynamicDescription selected="#{NewRuleWizard.action}">
+                                             <a:descriptions value="#{NewRuleWizard.actionDescriptions}" />
+                                          </a:dynamicDescription>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>2.</td>
+                                    <td><h:outputText value="#{msg.click_set_and_add}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td><h:commandButton id="set-add-button" value="#{msg.set_and_add_button}" 
+                                                         action="#{NewRuleWizard.promptForActionValues}"
+                                                         disabled="true"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan='2'><h:outputText value="#{msg.selected_actions}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan='2'>
+                                       <h:dataTable value="#{NewRuleWizard.allActionsDataModel}" var="row"
+                                                    rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                                                    styleClass="selectedItems" headerClass="selectedItemsHeader"
+                                                    cellspacing="0" cellpadding="4" 
+                                                    rendered="#{NewRuleWizard.allActionsDataModel.rowCount != 0}">
+                                          <h:column>
+                                             <f:facet name="header">
+                                                <h:outputText value="#{msg.summary}" />
+                                             </f:facet>
+                                             <h:outputText value="#{row.actionSummary}"/>
+                                             <h:outputText value="&nbsp;&nbsp;" escape="false"/>
+                                          </h:column>
+                                          <h:column>
+                                             <a:actionLink action="#{NewRuleWizard.removeAction}" image="/images/icons/delete.gif"
+                                                           value="#{msg.remove}" showLink="false" style="padding-left:6px;padding-right:2px" />
+                                             <a:actionLink action="#{NewRuleWizard.editAction}" image="/images/icons/edit_icon.gif"
+                                                           value="#{msg.change}" showLink="false" />
+                                          </h:column>
+                                       </h:dataTable>
+                                       <a:panel id="no-items" rendered="#{NewRuleWizard.allActionsDataModel.rowCount == 0}">
+                                          <table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>
+                                             <tr>
+                                                <td colspan='2' class='selectedItemsHeader'><h:outputText id="no-items-name" value="#{msg.summary}" /></td>
+                                             </tr>
+                                             <tr>
+                                                <td class='selectedItemsRow'><h:outputText id="no-items-msg" value="#{msg.no_selected_items}" /></td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewRuleWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewRuleWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.allActionsDataModel.rowCount == 0}"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewRuleWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewRuleWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.allActionsDataModel.rowCount == 0}" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition-contains-text.jsp b/source/web/jsp/wizard/new-rule/condition-contains-text.jsp
new file mode 100644
index 0000000000..e5248b356e
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition-contains-text.jsp
@@ -0,0 +1,184 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_cond_contains">
+
+<script language="JavaScript1.2">
+   function checkButtonState(inputField)
+   {
+      var disabled = (inputField.value.length == 0);
+      document.getElementById("new-rule-contains-text:ok-button").disabled = disabled;
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-contains-text">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{msg.set_condition_values}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{msg.condition_contains_desc}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <h:outputText value="#{msg.file_name_pattern}"/>:&nbsp;
+                                       <h:inputText id="pattern" value="#{NewRuleWizard.conditionProperties.containstext}" 
+                                                    onkeyup="javascript:checkButtonState(this);" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.conditionProperties.notcondition}"/></td>
+                                       <td><h:outputText value="#{msg.not_condition_result}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr><td><h:outputText value="#{msg.condition_contains_hints}"/>:</td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.condition_contains_hints_desc}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="ok-button" value="#{msg.ok}" action="#{NewRuleWizard.addCondition}" 
+                                                        styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.conditionProperties.containstext == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddCondition}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp b/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp
new file mode 100644
index 0000000000..296e515e5d
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp
@@ -0,0 +1,167 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_cond_aspect">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-has-aspect">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_condition_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.aspect}"/>:</nobr></td>
+                                    <td width="98%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.conditionProperties.aspect}">
+                                          <f:selectItems value="#{NewRuleWizard.aspects}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.conditionProperties.notcondition}"/></td>
+                                       <td><h:outputText value="#{msg.not_condition_result}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addCondition}" styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddCondition}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp b/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp
new file mode 100644
index 0000000000..f05d520974
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp
@@ -0,0 +1,167 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_cond_mimetype">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-is-mimetype">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_condition_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.type}"/>:</nobr></td>
+                                    <td width="98%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.conditionProperties.mimetype}">
+                                          <f:selectItems value="#{NewRuleWizard.mimeTypes}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.conditionProperties.notcondition}"/></td>
+                                       <td><h:outputText value="#{msg.not_condition_result}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addCondition}" styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddCondition}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition-in-category.jsp b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
new file mode 100644
index 0000000000..7711e476b8
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
@@ -0,0 +1,168 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_cond_category">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-in-category">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_condition_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top"><h:outputText value="#{msg.category}"/>:</td>
+                                    <td width="90%">
+                                       <r:categorySelector label="#{msg.select_category_prompt}" 
+                                                        value="#{NewRuleWizard.conditionProperties.category}" 
+                                                        styleClass="selector"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.conditionProperties.notcondition}"/></td>
+                                       <td><h:outputText value="#{msg.not_condition_result}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addCondition}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.conditionProperties.category == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddCondition}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp b/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp
new file mode 100644
index 0000000000..d4e817da64
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp
@@ -0,0 +1,167 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_cond_subtype">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-is-subtype">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{msg.set_condition_values}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><nobr><h:outputText value="#{msg.type}"/>:</nobr></td>
+                                    <td width="98%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.conditionProperties.modeltype}">
+                                          <f:selectItems value="#{NewRuleWizard.modelTypes}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.conditionProperties.notcondition}"/></td>
+                                       <td><h:outputText value="#{msg.not_condition_result}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.ok}" action="#{NewRuleWizard.addCondition}" styleClass="wizardButton"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancelAddCondition}" 
+                                                        styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/condition.jsp b/source/web/jsp/wizard/new-rule/condition.jsp
new file mode 100644
index 0000000000..7623435dda
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/condition.jsp
@@ -0,0 +1,284 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_condition">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-condition">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.details}" />
+                                 <a:listItem value="2" label="2. #{msg.conditions}" />
+                                 <a:listItem value="3" label="3. #{msg.actions}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewRuleWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>1.</td>
+                                    <td><h:outputText value="#{msg.select_condition}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td width="98%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.condition}" 
+                                          onchange="javascript:itemSelected(this);">
+                                          <f:selectItems value="#{NewRuleWizard.conditions}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td valign="top">&nbsp;</td>
+                                    <td>
+                                       <div>
+                                          <a:dynamicDescription selected="#{NewRuleWizard.condition}">
+                                             <a:descriptions value="#{NewRuleWizard.conditionDescriptions}" />
+                                          </a:dynamicDescription>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>2.</td>
+                                    <td><h:outputText value="#{msg.click_set_and_add}" id="instruction-text"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>&nbsp;</td>
+                                    <td><h:commandButton id="set-add-button" value="#{msg.set_and_add_button}" 
+                                                         action="#{NewRuleWizard.promptForConditionValues}"
+                                                         disabled="true"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan='2'><h:outputText value="#{msg.selected_conditions}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan='2'>
+                                       <h:dataTable value="#{NewRuleWizard.allConditionsDataModel}" var="row"
+                                                    rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                                                    styleClass="selectedItems" headerClass="selectedItemsHeader"
+                                                    cellspacing="0" cellpadding="4" 
+                                                    rendered="#{NewRuleWizard.allConditionsDataModel.rowCount != 0}">
+                                          <h:column>
+                                             <f:facet name="header">
+                                                <h:outputText value="#{msg.summary}" />
+                                             </f:facet>
+                                             <h:outputText value="#{row.conditionSummary}"/>
+                                          </h:column>
+                                          <h:column>
+                                             <a:actionLink action="#{NewRuleWizard.removeCondition}" image="/images/icons/delete.gif"
+                                                           value="#{msg.remove}" showLink="false" style="padding-left:6px;padding-right:2px" />
+                                             <a:actionLink action="#{NewRuleWizard.editCondition}" image="/images/icons/edit_icon.gif"
+                                                           value="#{msg.change}" showLink="false" 
+                                                           rendered='#{row.conditionName != "no-condition"}'/>
+                                          </h:column>
+                                       </h:dataTable>
+                                       <a:panel id="no-items" rendered="#{NewRuleWizard.allConditionsDataModel.rowCount == 0}">
+                                          <table cellspacing='0' cellpadding='2' border='0' class='selectedItems'>
+                                             <tr>
+                                                <td colspan='2' class='selectedItemsHeader'><h:outputText id="no-items-name" value="#{msg.summary}" /></td>
+                                             </tr>
+                                             <tr>
+                                                <td class='selectedItemsRow'><h:outputText id="no-items-msg" value="#{msg.no_selected_items}" /></td>
+                                             </tr>
+                                          </table>
+                                       </a:panel>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewRuleWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewRuleWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewRuleWizard.allConditionsDataModel.rowCount == 0}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewRuleWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewRuleWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="true"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+                              
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    <script language="JavaScript1.2">
+      function itemSelected(inputField)
+      {
+         if (inputField.selectedIndex == 0)
+         {
+            document.getElementById("new-rule-condition:set-add-button").disabled = true;
+         }
+         else
+         {
+            document.getElementById("new-rule-condition:set-add-button").disabled = false;
+         }
+         
+         // also check to see if the 'no-condition' option has been selected, if it has, change
+         // the explanation text and the button label
+         var short_text = "<a:outputText value='#{msg.click_add}'/>";
+         var long_text = "<a:outputText value='#{msg.click_set_and_add}'/>";
+         var short_label = "<a:outputText value='#{msg.add_to_list_button}'/>";
+         var long_label = "<a:outputText value='#{msg.set_and_add_button}'/>";
+         
+         if (inputField.value == "no-condition")
+         {
+            document.getElementById("new-rule-condition:set-add-button").value = short_label;
+            document.getElementById("new-rule-condition:instruction-text").innerHTML = short_text;
+         }
+         else
+         {
+            document.getElementById("new-rule-condition:set-add-button").value = long_label;
+            document.getElementById("new-rule-condition:instruction-text").innerHTML = long_text;
+         }
+      }
+    </script>
+    
+   </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/details.jsp b/source/web/jsp/wizard/new-rule/details.jsp
new file mode 100644
index 0000000000..8ea798d14f
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/details.jsp
@@ -0,0 +1,230 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_details">
+
+<script language="JavaScript1.2">
+   function checkButtonState(inputField)
+   {
+      var disabled = (inputField.value.length == 0);
+      document.getElementById("new-rule-details:next-button").disabled = disabled;
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.details}" />
+                                 <a:listItem value="2" label="2. #{msg.conditions}" />
+                                 <a:listItem value="3" label="3. #{msg.actions}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewRuleWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.type}"/>:</td>
+                                    <td width="90%">
+                                       <h:selectOneMenu value="#{NewRuleWizard.type}">
+                                          <f:selectItems value="#{NewRuleWizard.types}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.title}"/>:</td>
+                                    <td>
+                                       <h:inputText id="title" value="#{NewRuleWizard.title}" size="35" maxlength="1024"
+                                                    onkeyup="javascript:checkButtonState(this);" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{NewRuleWizard.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.other_options}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.applyToSubSpaces}"/></td>
+                                       <td><h:outputText value="#{msg.apply_to_sub_spaces}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <table><tr>
+                                       <td><h:selectBooleanCheckbox value="#{NewRuleWizard.runInBackground}"/></td>
+                                       <td><h:outputText value="#{msg.run_in_background}"/></td>
+                                       </tr></table>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2">
+                                       <div id="rule-info" style="padding-left: 26px;">
+                                          <h:graphicImage alt="" value="/images/icons/info_icon.gif" style="vertical-align: middle;" />&nbsp;
+                                          <h:outputText value="#{msg.rule_background_info}" />
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewRuleWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{NewRuleWizard.next}" 
+                                                        styleClass="wizardButton" disabled="#{NewRuleWizard.title == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewRuleWizard.finish}" styleClass="wizardButton" 
+                                                        disabled="true"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-rule/summary.jsp b/source/web/jsp/wizard/new-rule/summary.jsp
new file mode 100644
index 0000000000..2129125864
--- /dev/null
+++ b/source/web/jsp/wizard/new-rule/summary.jsp
@@ -0,0 +1,176 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_rule_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-rule-summary">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight" 
+                                          value="4" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.details}" />
+                                 <a:listItem value="2" label="2. #{msg.conditions}" />
+                                 <a:listItem value="3" label="3. #{msg.actions}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewRuleWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewRuleWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewRuleWizard.summary}" escape="false"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewRuleWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewRuleWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewRuleWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewRuleWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/create-from.jsp b/source/web/jsp/wizard/new-space/create-from.jsp
new file mode 100644
index 0000000000..07883aeea8
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/create-from.jsp
@@ -0,0 +1,187 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_create-from">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+   <h:form acceptCharset="UTF-8" id="new-space-create-from">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.how_to_create_space}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{NewSpaceWizard.createFrom}" layout="pageDirection">
+                                          <f:selectItem itemValue="scratch" itemLabel="#{msg.from_scratch}" />
+                                          <f:selectItem itemValue="existing" itemLabel="#{msg.based_on_existing_space}" />
+                                          <f:selectItem itemValue="template" itemLabel="#{msg.using_a_template}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewSpaceWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" styleClass="wizardButton"
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/details.jsp b/source/web/jsp/wizard/new-space/details.jsp
new file mode 100644
index 0000000000..c78ac91f06
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/details.jsp
@@ -0,0 +1,269 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_details">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("new-space-details:name").focus();
+      checkButtonState();
+   }
+
+   function checkButtonState()
+   {
+      <%--
+      || (document.getElementById("new-space-details:saveAsTemplate").checked && 
+          document.getElementById("new-space-details:templateName").value.length == 0) )
+      --%>
+      if (document.getElementById("new-space-details:name").value.length == 0)
+      {
+         document.getElementById("new-space-details:next-button").disabled = true;
+         document.getElementById("new-space-details:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-space-details:next-button").disabled = false;
+         document.getElementById("new-space-details:finish-button").disabled = false;
+      }
+   }
+   
+   function toggleTemplateName()
+   {
+      document.getElementById('new-space-details:templateName').disabled = 
+         !document.getElementById('new-space-details:saveAsTemplate').checked;
+      
+      if (document.getElementById('new-space-details:templateName').disabled == false)
+      {
+         document.getElementById('new-space-details:templateName').focus();
+      }
+      
+      checkButtonState();
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space-details">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.title_space_details}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.name}"/>:</td>
+                                    <td>
+                                       <h:inputText id="name" value="#{NewSpaceWizard.name}" size="35" maxlength="1024"
+                                                    onkeyup="javascript:checkButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.description}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{NewSpaceWizard.description}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading">&nbsp;<h:outputText value="#{msg.other_options}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.choose_space_icon}"/>:</td>
+                                    <td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="6" spacing="4" value="#{NewSpaceWizard.icon}" id="space-icon">
+                                          <a:listItems value="#{NewSpaceWizard.icons}" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                    </td>
+                                 </tr>
+                                 <%--
+                                 <tr>
+                                    <td colspan="2">
+                                       <h:selectBooleanCheckbox id="saveAsTemplate" value="#{NewSpaceWizard.saveAsTemplate}" 
+                                          onclick="javascript:toggleTemplateName();" />&nbsp;
+                                       <span style="vertical-align:20%"><h:outputText value="#{msg.save_as_template}"/></span>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="middle"><h:outputText value="#{msg.name}"/>:</td>
+                                    <td>
+                                       <h:inputText id="templateName" value="#{NewSpaceWizard.templateName}" 
+                                                     size="35" disabled="#{!NewSpaceWizard.saveAsTemplate}" 
+                                                     onkeyup="javascript:checkButtonState();" maxlength="1024" />
+                                                     &nbsp;*
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{NewSpaceWizard.next}" 
+                                                        styleClass="wizardButton" disabled="#{NewSpaceWizard.name == null}" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewSpaceWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="finish-button" value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" 
+                                                        styleClass="wizardButton" disabled="#{NewSpaceWizard.name == null}"/>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/from-existing.jsp b/source/web/jsp/wizard/new-space/from-existing.jsp
new file mode 100644
index 0000000000..3d54d1c712
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/from-existing.jsp
@@ -0,0 +1,211 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_existing">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space-from-existing">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.existing_space}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_existing_space_prompt}" 
+                                                        value="#{NewSpaceWizard.existingSpaceId}" 
+                                                        initialSelection="#{NavigationBean.currentNodeId}"
+                                                        styleClass="selector" />
+                                    </td>
+                                 </tr>
+                                 <%-- TBD
+                                 <tr><td class="paddingRow" /></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.copy_existing_space}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{NewSpaceWizard.copyPolicy}" layout="pageDirection">
+                                          <f:selectItem itemValue="structure" itemLabel="#{msg.structure}" />
+                                          <f:selectItem itemValue="contents" itemLabel="#{msg.structure_contents}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="paddingRow" /></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.space_copy_note}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewSpaceWizard.next}" styleClass="wizardButton" 
+                                                        disabled="#{NewSpaceWizard.existingSpaceId == null}"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewSpaceWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" styleClass="wizardButton"
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="button-group-separator"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/from-scratch.jsp b/source/web/jsp/wizard/new-space/from-scratch.jsp
new file mode 100644
index 0000000000..221e250c38
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/from-scratch.jsp
@@ -0,0 +1,220 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_scratch">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space-from-scratch">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.space_type}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.space_type_create}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                                       <a:imagePickerRadio columns="4" spacing="4" value="#{NewSpaceWizard.spaceType}"
+                                                             onclick="javascript:itemSelected(this);">
+                                          <a:listItems value="#{NewSpaceWizard.folderTypes}" />
+                                       </a:imagePickerRadio>
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                                       <table border='0'>
+                                          <tr>
+                                             <td valign='top'>
+                                                <h:graphicImage id="info-icon" url="/images/icons/info_icon.gif" />
+                                             </td>
+                                             <td valign='top' align='left'>
+                                                <a:dynamicDescription selected="#{NewSpaceWizard.spaceType}">
+                                                   <a:descriptions value="#{NewSpaceWizard.folderTypeDescriptions}" />
+                                                </a:dynamicDescription>
+                                             </td>
+                                          </tr>
+                                       </table>
+                                       
+                                       <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                                    </td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.space_type_note}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" action="#{NewSpaceWizard.next}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewSpaceWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" styleClass="wizardButton"
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="button-group-separator"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/from-template.jsp b/source/web/jsp/wizard/new-space/from-template.jsp
new file mode 100644
index 0000000000..4377b69d16
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/from-template.jsp
@@ -0,0 +1,236 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_template">
+
+<script language="JavaScript1.2">
+   
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      checkButtonState( document.getElementById("new-space-from-template:templateSpaceId") );
+   }
+   
+   function checkButtonState(inputField)
+   {
+      if (inputField.selectedIndex == 0)
+      {
+         document.getElementById("new-space-from-template:next-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("new-space-from-template:next-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space-from-template">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td class="wizardSectionHeading"><h:outputText value="#{msg.template_space}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.select_template}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneMenu id="templateSpaceId" value="#{NewSpaceWizard.templateSpaceId}" 
+                                                        onchange="javascript:checkButtonState(this);">
+                                          <f:selectItems value="#{NewSpaceWizard.templateSpaces}" />
+                                       </h:selectOneMenu>
+                                    </td>
+                                 </tr>
+                                 <%-- TBD
+                                 <tr><td class="details-separator" /></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.copy_existing_space}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td>
+                                       <h:selectOneRadio value="#{NewSpaceWizard.copyPolicy}" layout="pageDirection">
+                                          <f:selectItem itemValue="structure" itemLabel="#{msg.structure}" />
+                                          <f:selectItem itemValue="contents" itemLabel="#{msg.structure_contents}" />
+                                       </h:selectOneRadio>
+                                    </td>
+                                 </tr>
+                                 --%>
+                                 <tr><td class="details-separator" /></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.space_copy_note}"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton id="next-button" value="#{msg.next_button}" action="#{NewSpaceWizard.next}" 
+                                                        styleClass="wizardButton" disabled="#{NewSpaceWizard.templateSpaceId == null}"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewSpaceWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" styleClass="wizardButton"
+                                                        disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="button-group-separator"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-space/summary.jsp b/source/web/jsp/wizard/new-space/summary.jsp
new file mode 100644
index 0000000000..9d5c265066
--- /dev/null
+++ b/source/web/jsp/wizard/new-space/summary.jsp
@@ -0,0 +1,176 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_space_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="new-space-summary">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="4" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.starting_space}" />
+                                 <a:listItem value="2" label="2. #{msg.space_options}" />
+                                 <a:listItem value="3" label="3. #{msg.space_details}" />
+                                 <a:listItem value="4" label="4. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewSpaceWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewSpaceWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.summary}" escape="false"/></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewSpaceWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewSpaceWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewSpaceWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewSpaceWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-user/person-properties.jsp b/source/web/jsp/wizard/new-user/person-properties.jsp
new file mode 100644
index 0000000000..c135aa17b1
--- /dev/null
+++ b/source/web/jsp/wizard/new-user/person-properties.jsp
@@ -0,0 +1,237 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_user_person_props">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("person-props:firstName").focus();
+      updateButtonState();
+   }
+
+   function updateButtonState()
+   {
+      if (document.getElementById("person-props:firstName").value.length == 0 ||
+          document.getElementById("person-props:lastName").value.length == 0 ||
+          document.getElementById("person-props:email").value.length == 0)
+      {
+         document.getElementById("person-props:next-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("person-props:next-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="person-props">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="1" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.person_properties}" />
+                                 <a:listItem value="2" label="2. #{msg.user_properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                           
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                           
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewUserWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="mainSubText"><h:outputText value="#{NewUserWizard.stepDescription}" /></td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.person_properties}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.first_name}"/>:</td>
+                                    <td>
+                                       <h:inputText id="firstName" value="#{NewUserWizard.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.last_name}"/>:</td>
+                                    <td>
+                                       <h:inputText id="lastName" value="#{NewUserWizard.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.email}"/>:</td>
+                                    <td>
+                                       <h:inputText id="email" value="#{NewUserWizard.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" />&nbsp;*
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.other_options}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.company_id}"/>:</td>
+                                    <td>
+                                       <h:inputText value="#{NewUserWizard.companyId}" size="35" maxlength="1024" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewUserWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" id="next-button" action="#{NewUserWizard.next}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" id="finish-button" action="#{NewUserWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewUserWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+<script>
+   updateButtonState();
+</script>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-user/summary.jsp b/source/web/jsp/wizard/new-user/summary.jsp
new file mode 100644
index 0000000000..942eff33c2
--- /dev/null
+++ b/source/web/jsp/wizard/new-user/summary.jsp
@@ -0,0 +1,176 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_user_summary">
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="person-props">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="3" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.person_properties}" />
+                                 <a:listItem value="2" label="2. #{msg.user_properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td class="mainSubTitle"><h:outputText value="#{NewUserWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td class="mainSubText"><h:outputText value="#{NewUserWizard.stepDescription}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewUserWizard.summary}" escape="false" /></td>
+                                 </tr>
+                                 <tr><td class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td><h:outputText value="#{NewUserWizard.stepInstructions}" escape="false" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" action="#{NewUserWizard.finish}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewUserWizard.back}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewUserWizard.cancel}" styleClass="wizardButton" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/wizard/new-user/user-properties.jsp b/source/web/jsp/wizard/new-user/user-properties.jsp
new file mode 100644
index 0000000000..28c903e2db
--- /dev/null
+++ b/source/web/jsp/wizard/new-user/user-properties.jsp
@@ -0,0 +1,270 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<r:page titleId="title_new_user_user_props">
+
+<script language="JavaScript1.2">
+
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      if (document.getElementById("user-props:userName") != null &&
+          document.getElementById("user-props:userName").disabled == false)
+      {
+         document.getElementById("user-props:userName").focus();
+      }
+      else
+      {
+         document.getElementById("user-props:homeSpaceName").focus();
+      }   
+      updateButtonState();
+   }
+
+   function updateButtonState()
+   {
+      if (document.getElementById("user-props:password") != null &&
+          document.getElementById("user-props:password").disabled == false)
+      {
+         if (document.getElementById("user-props:userName").value.length == 0 ||
+             document.getElementById("user-props:password").value.length == 0 ||
+             document.getElementById("user-props:confirm").value.length == 0)
+         {
+            document.getElementById("user-props:finish-button").disabled = true;
+            document.getElementById("user-props:next-button").disabled = true;
+         }
+         else
+         {
+            document.getElementById("user-props:finish-button").disabled = false;
+            document.getElementById("user-props:next-button").disabled = false;
+         }
+      }
+      else
+      {
+         document.getElementById("user-props:finish-button").disabled = false;
+         document.getElementById("user-props:next-button").disabled = false;
+      }
+   }
+</script>
+
+<f:view>
+   
+   <%-- load a bundle of properties with I18N strings --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <%-- set the form name here --%>
+   <h:form acceptCharset="UTF-8" id="user-props">
+   
+   <%-- Main outer table --%>
+   <table cellspacing="0" cellpadding="2">
+      
+      <%-- Title bar --%>
+      <tr>
+         <td colspan="2">
+            <%@ include file="../../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign="top">
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width="100%">
+            <table cellspacing="0" cellpadding="0" width="100%">
+               <%-- Breadcrumb --%>
+               <%@ include file="../../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width="4"></td>
+                  <td bgcolor="#EEEEEE">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing="4" cellpadding="0" width="100%">
+                        <tr valign="top">
+                           <td width="32">
+                              <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
+                           </td>
+                           <td>
+                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
+                              <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
+                              <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
+                           </td>
+                        </tr>
+                     </table>
+                     
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width="4" height="9"></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width="4" height="9"></td>
+               </tr>
+               
+               <%-- Details --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width="4"></td>
+                  <td>
+                     <table cellspacing="0" cellpadding="3" border="0" width="100%">
+                        <tr>
+                           <td width="20%" valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <h:outputText styleClass="mainSubTitle" value="#{msg.steps}"/><br>
+                              <a:modeList itemSpacing="3" iconColumnWidth="2" selectedStyleClass="statusListHighlight"
+                                    value="2" disabled="true">
+                                 <a:listItem value="1" label="1. #{msg.person_properties}" />
+                                 <a:listItem value="2" label="2. #{msg.user_properties}" />
+                                 <a:listItem value="3" label="3. #{msg.summary}" />
+                              </a:modeList>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                           
+                           <td width="100%" valign="top">
+                              
+                              <a:errors message="#{msg.error_wizard}" styleClass="errorMessage" />
+                              
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %>
+                              <table cellpadding="2" cellspacing="2" border="0" width="100%">
+                                 <tr>
+                                    <td colspan="2" class="mainSubTitle"><h:outputText value="#{NewUserWizard.stepTitle}" /></td>
+                                 </tr>
+                                 <tr>
+                                    <td colspan="2" class="mainSubText"><h:outputText value="#{NewUserWizard.stepDescription}" /></td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.user_properties}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.username}"/>:</td>
+                                    <td>
+                                       <h:inputText id="userName" value="#{NewUserWizard.userName}" size="35" maxlength="1024" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" disabled="#{NewUserWizard.editMode}" />&nbsp;*
+                                       &nbsp;<h:message id="errors1" for="userName" style="color:red" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.password}"/>:</td>
+                                    <td>
+                                       <h:inputSecret id="password" value="#{NewUserWizard.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" disabled="#{NewUserWizard.editMode}" redisplay="true" />&nbsp;*
+                                       &nbsp;<h:message id="errors2" for="password" style="color:red" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.confirm}"/>:</td>
+                                    <td>
+                                       <h:inputSecret id="confirm" value="#{NewUserWizard.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" disabled="#{NewUserWizard.editMode}" redisplay="true" />&nbsp;*
+                                       &nbsp;<h:message id="errors3" for="confirm" style="color:red" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2" class="wizardSectionHeading"><h:outputText value="#{msg.homespace}"/></td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.home_space_location}"/>:</td>
+                                    <td>
+                                       <r:spaceSelector label="#{msg.select_home_space_prompt}" value="#{NewUserWizard.homeSpaceLocation}" initialSelection="#{NavigationBean.currentNodeId}" style="border: 1px dashed #cccccc; padding: 2px;"/>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td><h:outputText value="#{msg.home_space_name}"/>:</td>
+                                    <td>
+                                       <h:inputText id="homeSpaceName" value="#{NewUserWizard.homeSpaceName}" size="35" maxlength="1024" onkeyup="updateButtonState();" />
+                                    </td>
+                                 </tr>
+                                 
+                                 <tr><td colspan="2" class="paddingRow"></td></tr>
+                                 <tr>
+                                    <td colspan="2"><h:outputText value="#{NewUserWizard.stepInstructions}" /></td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
+                           </td>
+                           
+                           <td valign="top">
+                              <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
+                              <table cellpadding="1" cellspacing="1" border="0">
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.next_button}" id="next-button" action="#{NewUserWizard.next}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.back_button}" action="#{NewUserWizard.back}" styleClass="wizardButton" immediate="true" />
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.finish_button}" id="finish-button" action="#{NewUserWizard.finish}" styleClass="wizardButton" disabled="true" />
+                                    </td>
+                                 </tr>
+                                 <tr><td class="wizardButtonSpacing"></td></tr>
+                                 <tr>
+                                    <td align="center">
+                                       <h:commandButton value="#{msg.cancel_button}" action="#{NewUserWizard.cancel}" styleClass="wizardButton" immediate="true" />
+                                    </td>
+                                 </tr>
+                              </table>
+                              <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                           </td>
+                        </tr>
+                     </table>
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width="4" height="4"></td>
+                  <td width="100%" align="center" style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width="4" height="4"></td>
+               </tr>
+               
+            </table>
+          </td>
+       </tr>
+    </table>
+    
+    </h:form>
+    
+</f:view>
+
+<script>
+   updateButtonState();
+</script>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/components.jsp b/source/web/jsp/zoo/components.jsp
new file mode 100644
index 0000000000..fe8aab019c
--- /dev/null
+++ b/source/web/jsp/zoo/components.jsp
@@ -0,0 +1,411 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page>
+
+<f:view>
+   <%-- load a bundle of properties I18N strings here --%>
+   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+   
+   <h:form acceptCharset="UTF-8" id="testForm">
+   
+      <h2>Components Test Page</h2>
+      
+      <%-- ModeList tests --%>
+      <b>ModeList component:</b><br>
+      Basic ModeList<br>
+      <a:modeList itemSpacing="2" iconColumnWidth="0"
+            style="background-color:#EEEEEE" selectedStyle="background-color:#FFFFFF;border:solid #444444;border-width:1px">
+         <a:listItem value="1" label="First Item" tooltip="Item Number 1" />
+         <a:listItem value="2" label="Second Item"  tooltip="Item Number 2" />
+         <a:listItem value="3" label="Third Item"  tooltip="Item Number 3" />
+      </a:modeList>
+      <br>
+      Modelist with styles applied, icons, title label and the initial value set:<br>
+      <a:modeList label="Views:" itemSpacing="2" iconColumnWidth="20" width="100"
+            style="background-color:#F3F1EB" itemStyle="font-family:Tahoma;font-size:11px"
+            selectedStyle="background-color:#EBF1FF;font-family:Tahoma;font-size:11px;border:solid #4444FF;border-width:1px"
+            value="1">
+         <a:listItem value="0" label="None" tooltip="No Icon Here" />
+         <a:listItem value="1" label="Details" image="/images/icons/BlueArrow.gif" />
+         <a:listItem value="2" label="Icons" image="/images/icons/BlueArrow.gif" />
+         <a:listItem value="3" label="List" image="/images/icons/BlueArrow.gif" />
+      </a:modeList>
+      <br>
+      ModeList rendered horizontally with first item selected:<br>
+      <a:modeList itemSpacing="2" iconColumnWidth="0" horizontal="true" value="1"
+            style="background-color:#EEEEEE" selectedStyle="background-color:#FFFFFF;border:solid #444444;border-width:1px">
+         <a:listItem value="1" label="Item 001" tooltip="Item Number 1" />
+         <a:listItem value="2" label="Item 002"  tooltip="Item Number 2" />
+         <a:listItem value="3" label="Item 003"  tooltip="Item Number 3" />
+      </a:modeList>
+      
+      <p>
+      
+      <%-- Menu tests --%>
+      <b>Menus:</b><br>
+      Simple menu:<br>
+      <a:menu id="menu1" menuStyle="background-color:#FFFFFF; border:thin solid #AAAAAA;"
+            itemSpacing="4" label="Menu" tooltip="I am a menu tooltip">
+         <a:actionLink value="Item 001" />
+         <a:actionLink value="Item 002" />
+         <a:actionLink value="Item 003" />
+         <a:actionLink value="Should not see this" rendered="false" />
+      </a:menu>
+      <p>
+      Menu with image, styles and actions with icons:<br>
+      <a:menu id="menu2" styleClass="header" itemSpacing="2" label="More..." image="/images/icons/arrow_expanded.gif" tooltip="Click Me"
+            menuStyle="background-color:#eeeeee;border-top:thin solid #FFFFFF; border-left:thin solid #FFFFFF; border-right:thin solid #444444; border-bottom:thin solid #444444;">
+         <a:actionLink value="Menu Action Link" image="/images/icons/BlueArrow.gif" />
+         <a:actionLink value="Click Me" image="/images/icons/link_small.gif" action="success" actionListener="#{TestList.clickActionLink}" styleClass="header" />
+         <a:actionLink value="No Image here" />
+      </a:menu>
+
+      <p>
+      
+      <%-- Breadcrumb tests --%>
+      <b>Breadcrumbs:</b><br>
+      Default style with modified separator and actionListener handler:<br>
+      <a:breadcrumb id="path1" value="/horse/biscuit/flibble/1234" action="success" actionListener="#{TestList.clickBreadcrumb}" separator="~" />
+      <br>
+      Path style with default separator:<br>
+      <a:breadcrumb id="path2" styleClass="path" value="/this/is/a/small/breadcrumb" tooltip="I am a tooltip" />
+      <br>
+      Root should be missing from this breadcrumb:<br>
+      <a:panel id="panelCrumb" progressive="true">
+         <a:breadcrumb id="path3" styleClass="path" value="/001/002/003/004/005" showRoot="false" />
+      </a:panel>
+      
+      <p>
+      
+      <%-- ActionLink tests --%>
+      <b>ActionLinks:</b><br>
+      <a:actionLink id="action1" value="Action Link" action="success" actionListener="#{TestList.clickActionLink}" />
+      <br>
+      <a:actionLink id="action2" value="Action Link With CSS" action="success" actionListener="#{TestList.clickActionLink}" styleClass="header" />
+      <br>
+      Action link with image and text, using vertical alignment property to centre text.<br>
+      <a:actionLink id="action3" value="Image Action Link" image="/images/icons/BlueArrow.gif" verticalAlign="40%" />
+      <br>
+      Action link with no text, just an image with title/alt text instead:<br>
+      <a:actionLink id="action4" value="Image Only Action Link" image="/images/icons/link_small.gif" showLink="false"/>
+      
+      <p>
+      
+      <%-- Progressive panel tests --%>
+      <b>Progressive Panels:</b><br>
+      <a:panel id="panel0" border="ballongrey" bgcolor="#EEEEEE" progressive="true" label="Progressive Panel Test 1" styleClass="mainTitle" expanded="false">
+         <p>
+         HTML text inside the Progressive Panel
+         <p>
+         <h:outputText id="out1" value="Text From Component with explicit ID"/>
+      </a:panel>
+      
+      <br>
+      
+      <a:panel id="panel1" border="mainwhite" bgcolor="white" progressive="true" label="Progressive Panel Test 2 (SHOULD BREAK WHEN CLOSED)" styleClass="mainTitle">
+         <p>
+         nothing exciting here
+         <b>not at all</b>
+         <p>
+         <h:outputText value="Component WITHOUT explicit ID (SHOULD BREAK THE PANEL!)"/>
+         <br>
+         <h:commandButton id="panel1-but1" value="Button with explicit ID" action="success" />
+      </a:panel>
+      
+      <p>
+      
+      <%-- RichList component test --%>
+      <%-- The RichList component is different to the data-grid in that it is
+           designed to render it's own child components. This means it is capable
+           of rendering the columns in any order and in any kind of layout. Allowing
+           the impl of details, icons and list views within a single component. --%>
+      <%-- NOTE: Suggest config of each view independantly in the config XML e.g.
+                 to allow the icon/details views to use different page sizes or styles.
+                 Otherwise you have to pick values "compatible" with all view modes! --%>
+      <b>RichList:</b><br>
+      RichList component test shown in Details view mode, including sortable columns of various data types and paging.<br>
+      <a:richList viewMode="details" pageSize="5" styleClass="" style="border:thin solid #eeeeff; padding:2px" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+            value="#{TestList.rows}" var="r" initialSortColumn="name" initialSortDescending="true">
+         <a:column primary="true" width="200" style="padding:2px" styleClass="">
+            <f:facet name="header">
+               <a:sortLink label="Name" value="name" mode="case-insensitive" styleClass="header"/>
+            </f:facet>
+            <f:facet name="large-icon">
+               <%-- this could be a clickable action image etc. --%>
+               <h:graphicImage alt="#{r.name}" title="#{r.name}" width="38" height="38" url="/images/icons/folder_large.png" />
+            </f:facet>
+            <f:facet name="small-icon">
+               <%-- example of a clickable action image as an icon --%>
+               <a:actionLink value="#{r.name}" image="/images/icons/folder.gif" actionListener="#{TestList.clickNameLink}" showLink="false">
+                  <f:param name="name" value="#{r.name}" />
+               </a:actionLink>
+            </f:facet>
+            <a:actionLink value="#{r.name}" actionListener="#{TestList.clickNameLink}">
+               <f:param name="name" value="#{r.name}" />
+            </a:actionLink>
+         </a:column>
+         
+         <a:column>
+            <f:facet name="header">
+               <a:sortLink label="Count" value="count" styleClass="header"/>
+            </f:facet>
+            <h:outputText value="#{r.count}"/>
+         </a:column>
+         
+         <a:column>
+            <f:facet name="header">
+               <a:sortLink label="Valid" value="valid" styleClass="header"/>
+            </f:facet>
+            <h:outputText value="#{r.valid}"/>
+         </a:column>
+         
+         <a:column>
+            <f:facet name="header">
+               <a:sortLink label="Relevance" value="relevance" styleClass="header"/>
+            </f:facet>
+            <h:outputText value="#{r.relevance}"/>
+         </a:column>
+         
+         <a:column>
+            <f:facet name="header">
+               <a:sortLink label="Created Date" value="created" styleClass="header"/>
+            </f:facet>
+            <h:outputText value="#{r.created}">
+               <%-- example of a DateTime converter --%>
+               <%-- can be used to convert both input and output text --%>
+               <f:convertDateTime dateStyle="short" />
+            </h:outputText>
+         </a:column>
+         
+         <a:column actions="true">
+            <f:facet name="header">
+               <h:outputText value="#{msg.actions}"/>
+            </f:facet>
+            <h:outputText value="Action | Action | Action"/>
+         </a:column>
+         
+         <%-- components other than columns added to a RichList will generally
+              be rendered as part of the list footer --%>
+         <a:dataPager/>
+      </a:richList>
+      
+      <p>
+      
+      <a:panel id="panel2" border="white" bgcolor="white" progressive="true" label="Progressive Panel Example 3" styleClass="mainSubTitle">
+         NOTE: currently all JSF components within a Progressive Panel MUST be given an explicit ID!
+         
+         <br>
+         
+         Same list shown in a different view mode (Icons). This mode renderer displays the large icon and renderers in a multi-column format. It also chooses not to display the sort header links.
+         <a:richList id="list2" viewMode="icons" pageSize="6" styleClass="" style="padding:2px" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+               value="#{TestList.rows}" var="r" initialSortColumn="name" initialSortDescending="true">
+            <a:column id="list2-col1" primary="true" width="200" style="padding:2px" styleClass="">
+               <f:facet name="header">
+                  <a:sortLink id="list2-sort1" label="Name" value="name" mode="case-insensitive" styleClass="header"/>
+               </f:facet>
+               <f:facet name="large-icon">
+                  <%-- example of a clickable action image as an icon --%>
+                  <a:actionLink id="list2-img1" value="#{r.name}" image="/images/icons/folder_large.png" actionListener="#{TestList.clickNameLink}" showLink="false">
+                     <f:param id="list2-param1-id" name="name" value="#{r.name}" />
+                  </a:actionLink>
+               </f:facet>
+               <f:facet name="small-icon">
+                  <h:graphicImage id="list2-img2" alt="#{r.name}" title="#{r.name}" width="15" height="13" url="/images/icons/folder.gif" />
+               </f:facet>
+               <%-- example of a clickable action link item --%>
+               <a:actionLink id="list2-link1" value="#{r.name}" actionListener="#{TestList.clickNameLink}">
+                  <f:param id="list2-param2-id" name="name" value="#{r.name}" />
+               </a:actionLink>
+            </a:column>
+            
+            <%-- TODO: need some way to allow columns for specific views
+            <a:column forViewMode="icon">
+               <h:outputText value="This would be a longer textual description"/>
+            </a:column>
+            --%>
+            
+            <a:column id="list2-col2">
+               <f:facet name="header">
+                  <a:sortLink id="list2-sort2" label="Count" value="count" styleClass="header"/>
+               </f:facet>
+               <h:outputText id="list2-out3" value="Count: #{r.count}"/>
+            </a:column>
+            
+            <a:column id="list2-col3">
+               <f:facet name="header">
+                  <a:sortLink id="list2-sort3" label="Created Date" value="created" styleClass="header"/>
+               </f:facet>
+               <h:outputText id="list2-out4" value="Created Date: "/>
+               <h:outputText id="list2-out5" value="#{r.created}">
+                  <%-- example of a DateTime converter --%>
+                  <%-- can be used to convert both input and output text --%>
+                  <f:convertDateTime dateStyle="short" />
+               </h:outputText>
+            </a:column>
+            
+            <a:column id="list2-col4" actions="true">
+               <f:facet name="header">
+                  <h:outputText id="list2-out6" value="#{msg.actions}"/>
+               </f:facet>
+               <h:outputText id="list2-out7" value="Action | Action | Action"/>
+            </a:column>
+            
+            <%-- components other than columns added to a RichList will generally
+                 be rendered as part of the list footer --%>
+            <a:dataPager id="list2-pager"/>
+         </a:richList>
+      
+      </a:panel>
+      
+      <p>
+      
+      <a:panel id="panel3" border="innergrey" bgcolor="#e8e8e8" progressive="false" label="Non-progressive Panel" styleClass="mainSubTitle">
+      
+         <br>
+         
+         Same list shown in a different view mode (List). This mode displays the small icon and uses single column rendering.<br>
+         <a:richList viewMode="list" pageSize="5" styleClass="" style="padding:4px" width="100%"
+               value="#{TestList.rows}" var="r" initialSortColumn="name" initialSortDescending="true">
+            <a:column primary="true">
+               <f:facet name="header">
+                  <a:sortLink label="Name" value="name" mode="case-insensitive" styleClass="header"/>
+               </f:facet>
+               <f:facet name="large-icon">
+                  <%-- this could be a clickable action image etc. --%>
+                  <h:graphicImage alt="#{r.name}" title="#{r.name}" width="38" height="38" url="/images/icons/folder_large.png" />
+               </f:facet>
+               <f:facet name="small-icon">
+                  <%-- this could be a clickable action image etc. --%>
+                  <h:graphicImage alt="#{r.name}" title="#{r.name}" width="15" height="13" url="/images/icons/folder.gif" />
+               </f:facet>
+               <a:actionLink value="#{r.name}" actionListener="#{TestList.clickNameLink}">
+                  <f:param id="list-param-id" name="name" value="#{r.name}" />
+               </a:actionLink>
+            </a:column>
+            
+            <a:column>
+               <f:facet name="header">
+                  <a:sortLink label="Count" value="count" styleClass="header"/>
+               </f:facet>
+               <h:outputText value="Count: #{r.count}"/>
+            </a:column>
+            
+            <a:column>
+               <f:facet name="header">
+                  <a:sortLink label="Created Date" value="created" styleClass="header"/>
+               </f:facet>
+               <h:outputText value="Created Date: "/>
+               <h:outputText value="#{r.created}">
+                  <%-- example of a DateTime converter --%>
+                  <%-- can be used to convert both input and output text --%>
+                  <f:convertDateTime dateStyle="short" />
+               </h:outputText>
+            </a:column>
+            
+            <a:column actions="true">
+               <f:facet name="header">
+                  <h:outputText value="#{msg.actions}"/>
+               </f:facet>
+               <h:outputText value="Action | Action | Action"/>
+            </a:column>
+            
+            <%-- components other than columns added to a RichList will generally
+                 be rendered as part of the list footer --%>
+            <a:dataPager/>
+         </a:richList>
+      
+      </a:panel>
+      
+      <p/>
+      
+      <a:panel id="panel4" expanded="true" progressive="true"
+               border="white" bgcolor="white" titleBorder="greyround" titleBgcolor="#eaeaea"
+               label="Bordered Title Area Progressive Panel" styleClass="mainSubTitle">
+         <h:outputText id="panel4-text" value="The content of a bordered title area"/> 
+      </a:panel>
+
+      <p>
+      
+      <%-- component evaluators --%>
+      <b>Evaluators:</b><br>
+      1a. Boolean Evaluator - you should see the next line of text:<br>
+      <a:booleanEvaluator value="#{TestList.rows != null}">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:booleanEvaluator>
+      <br><br>
+      1b. Boolean Evaluator - you should <i>not</i> see the next line of text:<br>
+      <a:booleanEvaluator value="#{TestList.rows == null}">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:booleanEvaluator>
+      <br><br>
+      2a. Value Set Evaluator - you should see the next line of text:<br>
+      <a:valueSetEvaluator value="#{TestList.rows}">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:valueSetEvaluator> 
+      <br><br>
+      2b. Value Set Evaluator - you should <i>not</i> see the next line of text:<br>
+      <a:valueSetEvaluator value="#{null}">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:valueSetEvaluator>
+      <br><br>
+      3a. String Equals Evaluator - you should see the next line of text:<br>
+      <a:stringEqualsEvaluator value="some string" condition="some string">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:stringEqualsEvaluator>
+      <br><br>
+      3b. String Equals Evaluator - you should <i>not</i> see the next line of text:<br>
+      <a:stringEqualsEvaluator value="some string" condition="some string123">
+         <h:outputText value="Component inside an evaluator"/>
+      </a:stringEqualsEvaluator>
+      <br><br>
+      Test evaluators around menu actions:<br>
+      <a:menu id="menuX" menuStyle="background-color:#FFFFFF; border:thin solid #AAAAAA;" itemSpacing="2" label="More...">
+         <a:actionLink value="You should only see this one item" />
+         <a:booleanEvaluator value="#{TestList.rows == null}">
+            <a:actionLink value="You should NOT see this second item" />
+         </a:booleanEvaluator>
+      </a:menu>
+      
+      <p>
+      
+      <%-- Date Picker Component --%>
+      <%-- Example of a tag utilising an Input Component with a custom renderer.
+              The renderer handles encoding and decoding of date values to UI elements --%>
+      <b>Date Picker:</b><br>
+      Basic date picker:<br>
+      <a:inputDatePicker id="date1" value="#{TestList.rows[0].created}" startYear="1996" yearCount="10"/>
+      <br>
+      Date Picker with CSS style applied:<br>
+      <a:inputDatePicker id="date2" startYear="2000" yearCount="5" styleClass="inputField" />
+      
+      <p>
+      
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+      
+   </h:form>
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/dynamic-description.jsp b/source/web/jsp/zoo/dynamic-description.jsp
new file mode 100644
index 0000000000..2c2ac2b96e
--- /dev/null
+++ b/source/web/jsp/zoo/dynamic-description.jsp
@@ -0,0 +1,69 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+
+<r:page>
+
+<f:view>
+
+   <h2>Dynamic Description</h2>
+   
+   <h:form acceptCharset="UTF-8" id="dyna-desc">
+
+      <h:selectOneMenu onchange="javascript:listItemSelected(this);">
+         <f:selectItem itemLabel="Choice One" itemValue="one" />
+         <f:selectItem itemLabel="Choice Two" itemValue="two" />
+         <f:selectItem itemLabel="Choice Three" itemValue="three" />
+         <f:selectItem itemLabel="Choice Four" itemValue="four" />
+      </h:selectOneMenu>
+      
+      <br/><br/>
+      <a:dynamicDescription selected="one" functionName="listItemSelected">
+         <a:descriptions value="#{DummyBean.properties}" />
+      </a:dynamicDescription>
+      
+      <br/><br/>
+      <a:imagePickerRadio columns="4" spacing="4" value="container"
+                            onclick="javascript:itemSelected(this);">
+         <a:listItem value="container" label="Container" tooltip="Container"
+                           image="/images/icons/space.gif" />
+         <a:listItem value="wiki" label="Wiki" tooltip="Wiki"
+                           image="/images/icons/wiki.gif" />
+         <a:listItem value="discussion" label="Discussion" tooltip="Discussion"
+                           image="/images/icons/discussion.gif" />
+      </a:imagePickerRadio>
+      
+      <br/><br/>
+      <a:dynamicDescription selected="container">
+         <a:description controlValue="container" text="Container" />
+         <a:description controlValue="wiki" text="Wiki" />
+         <a:description controlValue="discussion" text="Discussion" />
+      </a:dynamicDescription>
+      
+      <br/><br/>
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+
+   </h:form>
+
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/image-picker.jsp b/source/web/jsp/zoo/image-picker.jsp
new file mode 100644
index 0000000000..40248b236d
--- /dev/null
+++ b/source/web/jsp/zoo/image-picker.jsp
@@ -0,0 +1,62 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+
+<r:page>
+
+<f:view>
+   
+   <h2>Image Picker</h2>
+   
+   <h:form acceptCharset="UTF-8" id="imagePicker">
+   
+      <a:imagePickerRadio columns="4" spacing="5" value="#{DummyBean.properties.one}">
+         <a:listItem value="1" label="Checkin" tooltip="Checkin"
+                           image="/images/icons/check_in_large.gif" />
+         <a:listItem value="2" label="Checkout" tooltip="Checkout"
+                           image="/images/icons/check_out_large.gif" />
+         <a:listItem value="3" label="New File" tooltip="New File"
+                           image="/images/icons/large_newFile.gif" />
+      </a:imagePickerRadio>
+      <br/>
+      <h:commandButton id="submit" value="Submit" action="#{DummyBean.submit}" />
+      
+      <p/>
+      <a:imagePickerRadio columns="1" spacing="6" value="#{DummyBean.properties.two}" style="border: 1px solid black">
+         <a:listItem value="1" tooltip="Checkin" image="/images/icons/check_in_large.gif" />
+         <a:listItem value="2" tooltip="Checkout" image="/images/icons/check_out_large.gif" />
+         <a:listItem value="3" tooltip="New File" image="/images/icons/large_newFile.gif" />
+      </a:imagePickerRadio>
+      <br/>
+      <h:commandButton id="submit" value="Submit" action="#{DummyBean.submit}" />
+      
+      
+      <p/>
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+
+   </h:form>
+   
+   
+      
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/properties-auto.jsp b/source/web/jsp/zoo/properties-auto.jsp
new file mode 100644
index 0000000000..a6ae27124e
--- /dev/null
+++ b/source/web/jsp/zoo/properties-auto.jsp
@@ -0,0 +1,62 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+
+<r:page>
+
+<f:view>
+   
+   <h2>Auto configured property sheet</h2>
+   
+   <h:form acceptCharset="UTF-8" id="propertySheetForm3">
+   
+      <r:propertySheetGrid value="/sop.txt" var="node3">
+      </r:propertySheetGrid>
+
+      <div style="color:red;"><h:messages layout="table" /></div>
+      <br/>
+      <h:commandButton value="Update Properties" action="#{node3.persist}"/>
+   
+   </h:form>
+   
+   <br/><hr/>
+   
+   <h2>Config driven property sheet (WEB-INF/web-client-config.xml)</h2>
+   
+   <h:form acceptCharset="UTF-8" id="propertySheetForm4">
+   
+      <r:propertySheetGrid value="/sop.txt" var="node4" externalConfig="true">
+      </r:propertySheetGrid>
+   
+      <div style="color:red;"><h:messages layout="table" /></div>
+      <br/>
+      <h:commandButton value="Update Properties" action="#{node4.persist}"/>
+
+      <p>
+      
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+   </h:form>
+      
+   
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/properties.jsp b/source/web/jsp/zoo/properties.jsp
new file mode 100644
index 0000000000..dfd00b03a1
--- /dev/null
+++ b/source/web/jsp/zoo/properties.jsp
@@ -0,0 +1,80 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+
+<r:page>
+
+<f:view>
+   
+   <h2>Property sheet with standard JSF components</h2>
+   
+   <h:form acceptCharset="UTF-8" id="propertySheetForm">
+   
+      <r:propertySheetGrid value="/gav.doc">
+         <h:outputText value='#{MockDDService.types[node.type].propertiesMap["name"].displayName}: ' />
+         <h:inputText value="#{node.name}" />
+         <h:outputText value='#{MockDDService.types[node.type].propertiesMap["description"].displayName}: ' />
+         <h:inputText value="#{node.description}" />         
+         <h:outputText value='#{MockDDService.types[node.type].propertiesMap["created"].displayName}: ' />
+         <h:inputText value="#{node.created}" disabled='#{MockDDService.types[node.type].propertiesMap["created"].readOnly}'>
+            <f:convertDateTime dateStyle="short" pattern="d/MM/yyyy" />
+         </h:inputText>
+         <h:outputText value='#{MockDDService.types[node.type].propertiesMap["modified"].displayName}: ' />
+         <h:inputText value="#{node.modified}">
+            <f:convertDateTime dateStyle="short" pattern="d/MM/yyyy" />
+         </h:inputText>
+         <!-- TODO: Put the keywords in here to test the custom converter tag -->
+      </r:propertySheetGrid>
+   
+      <div style="color:red;"><h:messages layout="table" /></div>
+      <br/>
+      <h:commandButton value="Update Properties" action="#{node.persist}"/>  
+   
+   </h:form>
+
+   <br/><hr/>
+   
+   <h2>Property sheet with custom property components</h2>
+   
+   <h:form acceptCharset="UTF-8" id="propertySheetForm2">
+   
+      <r:propertySheetGrid value="/kev.txt" var="node2">
+         <r:property value="name" columns="1" />
+         <r:property value="description" columns="1" />
+         <r:property value="created" columns="1" />
+         <r:property value="modified" columns="2" />
+         <r:property value="non-existent" columns="1" />
+      </r:propertySheetGrid>
+
+      <div style="color:red;"><h:messages layout="table" /></div>
+      <br/>
+      <h:commandButton value="Update Properties" action="#{node2.persist}"/>
+
+      <p>
+      
+      <h:commandButton id="show-zoo-page" value="Show Zoo" action="showZoo" />
+
+   </h:form>
+      
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/jsp/zoo/zoo.jsp b/source/web/jsp/zoo/zoo.jsp
new file mode 100644
index 0000000000..29d769b7df
--- /dev/null
+++ b/source/web/jsp/zoo/zoo.jsp
@@ -0,0 +1,56 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page>
+
+<f:view>
+   
+   <h2>The Zoo</h2>
+   
+   <h:form acceptCharset="UTF-8" id="zooForm">
+      
+      <h:commandButton id="show-components-zoo" value="Component Zoo" action="showRichListZoo" />
+      <br/><br/>
+      <%--
+      <h:commandButton id="show-property-zoo" value="Property Zoo" action="showPropertyZoo" />
+      <br/><br/>
+      <h:commandButton id="show-auto-property-zoo" value="Auto Property Zoo" action="showAutoPropertyZoo" />
+      <br/><br/>
+      --%>
+      <h:commandButton id="show-image-picker" value="Image Picker Zoo" action="showImagePickerZoo" />
+      <br/><br/>
+      <h:commandButton id="dyna-desc" value="Dynamic Description Zoo" action="showDynaDescZoo" />
+      <br/><br/>
+      <h:commandButton id="show-user-list" value="UserList Test Pages" action="showUserlist" />
+      
+      <p/><p/>
+      <hr/><p/>
+      <h:commandButton id="show-web-client" value="Back to the Web Client" action="showWebClient" />
+      
+   </h:form>
+   
+</f:view>
+
+</r:page>
\ No newline at end of file
diff --git a/source/web/scripts/menu.js b/source/web/scripts/menu.js
new file mode 100644
index 0000000000..daa838480d
--- /dev/null
+++ b/source/web/scripts/menu.js
@@ -0,0 +1,50 @@
+//
+// Helper functions for common components
+// Kevin Roast 12-04-2005
+//
+
+// Menu component functions
+var _lastMenu = null;
+
+// toggle a dynamic menu dropping down
+function _toggleMenu(e, menuId)
+{
+   // hide any open menu
+   if (_lastMenu != null && _lastMenu != menuId)
+   {
+      document.getElementById(_lastMenu).style.display = 'none';
+      _lastMenu = null;
+   }
+   
+   // toggle visibility of the specified element id
+   if (document.getElementById(menuId).style.display == 'none')
+   {
+      document.getElementById(menuId).style.display = 'block';
+      
+      _lastMenu = menuId;
+      
+      // set global onclick handler to hide menu
+   	e.cancelBubble = true;
+   	if (e.stopPropagation)
+   	{
+   	   e.stopPropagation();
+   	}
+      document.onclick = _hideLastMenu;
+   }
+   else
+   {
+      document.getElementById(menuId).style.display = 'none';
+      document.onclick = null;
+   }
+}
+
+// Hide the last opened menu
+function _hideLastMenu()
+{
+   if (_lastMenu != null)
+   {
+      document.getElementById(_lastMenu).style.display = 'none';
+      _lastMenu = null;
+      document.onclick = null;
+   }
+}
diff --git a/source/web/scripts/tiny_mce/blank.htm b/source/web/scripts/tiny_mce/blank.htm
new file mode 100644
index 0000000000..a9a9192beb
--- /dev/null
+++ b/source/web/scripts/tiny_mce/blank.htm
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>blank_page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/langs/en.js b/source/web/scripts/tiny_mce/langs/en.js
new file mode 100644
index 0000000000..501fc43727
--- /dev/null
+++ b/source/web/scripts/tiny_mce/langs/en.js
@@ -0,0 +1,38 @@
+// UK lang variables
+
+tinyMCELang['lang_bold_desc'] = 'Bold';
+tinyMCELang['lang_italic_desc'] = 'Italic';
+tinyMCELang['lang_underline_desc'] = 'Underline';
+tinyMCELang['lang_striketrough_desc'] = 'Striketrough';
+tinyMCELang['lang_justifyleft_desc'] = 'Align left';
+tinyMCELang['lang_justifycenter_desc'] = 'Align center';
+tinyMCELang['lang_justifyright_desc'] = 'Align right';
+tinyMCELang['lang_justifyfull_desc'] = 'Align full';
+tinyMCELang['lang_bullist_desc'] = 'Unordered list';
+tinyMCELang['lang_numlist_desc'] = 'Ordered list';
+tinyMCELang['lang_outdent_desc'] = 'Outdent';
+tinyMCELang['lang_indent_desc'] = 'Indent';
+tinyMCELang['lang_undo_desc'] = 'Undo';
+tinyMCELang['lang_redo_desc'] = 'Redo';
+tinyMCELang['lang_link_desc'] = 'Insert/edit link';
+tinyMCELang['lang_unlink_desc'] = 'Unlink';
+tinyMCELang['lang_image_desc'] = 'Insert/edit image';
+tinyMCELang['lang_cleanup_desc'] = 'Cleanup messy code';
+tinyMCELang['lang_focus_alert'] = 'A editor instance must be focused before using this command.';
+tinyMCELang['lang_edit_confirm'] = 'Do you want to use the WYSIWYG mode for this textarea?';
+tinyMCELang['lang_insert_link_title'] = 'Insert/edit link';
+tinyMCELang['lang_insert'] = 'Insert';
+tinyMCELang['lang_update'] = 'Update';
+tinyMCELang['lang_cancel'] = 'Cancel';
+tinyMCELang['lang_insert_link_url'] = 'Link URL';
+tinyMCELang['lang_insert_link_target'] = 'Target';
+tinyMCELang['lang_insert_link_target_same'] = 'Open link in the same window';
+tinyMCELang['lang_insert_link_target_blank'] = 'Open link in a new window';
+tinyMCELang['lang_insert_image_title'] = 'Insert/edit image';
+tinyMCELang['lang_insert_image_src'] = 'Image URL';
+tinyMCELang['lang_insert_image_alt'] = 'Image description';
+tinyMCELang['lang_help_desc'] = 'Help';
+tinyMCELang['lang_bold_img'] = "bold.gif";
+tinyMCELang['lang_italic_img'] = "italic.gif";
+tinyMCELang['lang_underline_img'] = "underline.gif";
+tinyMCELang['lang_clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?';
diff --git a/source/web/scripts/tiny_mce/langs/readme.txt b/source/web/scripts/tiny_mce/langs/readme.txt
new file mode 100644
index 0000000000..e23001b44b
--- /dev/null
+++ b/source/web/scripts/tiny_mce/langs/readme.txt
@@ -0,0 +1,2 @@
+The language pack codes are based on ISO-639-2
+http://www.loc.gov/standards/iso639-2/englangn.html
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin.js
new file mode 100644
index 0000000000..3c8a0c0495
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -0,0 +1,2 @@
+/* Import plugin specific language pack */
+ tinyMCE.importPluginLanguagePack('fullscreen','en,sv');function TinyMCE_fullscreen_getControlHTML(control_name){switch(control_name){case "fullscreen":return '<img id="{$editor_id}_fullscreen" src="{$pluginurl}/images/fullscreen.gif" title="{$lang_fullscreen_desc}" width="20" height="20" class="mceButton'+(tinyMCE.getParam('fullscreen_is_enabled')?'Selected':'Normal')+'" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceFullScreen\');" />';}return "";}function TinyMCE_fullscreen_execCommand(editor_id,element,command,user_interface,value){switch(command){case "mceFullScreen":if(tinyMCE.getParam('fullscreen_is_enabled')){window.opener.tinyMCE.execInstanceCommand(tinyMCE.getParam('fullscreen_editor_id'),'mceSetContent',false,tinyMCE.getContent(editor_id));top.close();}else{tinyMCE.setWindowArg('editor_id',editor_id);var win=window.open(tinyMCE.baseURL+"/plugins/fullscreen/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);}return true;}return false;}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
new file mode 100644
index 0000000000..542b28c04b
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -0,0 +1,34 @@
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('fullscreen', 'en,sv');
+
+function TinyMCE_fullscreen_getControlHTML(control_name) {
+	switch (control_name) {
+		case "fullscreen":
+			return '<img id="{$editor_id}_fullscreen" src="{$pluginurl}/images/fullscreen.gif" title="{$lang_fullscreen_desc}" width="20" height="20" class="mceButton' + (tinyMCE.getParam('fullscreen_is_enabled') ? 'Selected' : 'Normal') + '" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceFullScreen\');" />';
+	}
+
+	return "";
+}
+
+function TinyMCE_fullscreen_execCommand(editor_id, element, command, user_interface, value) {
+	// Handle commands
+	switch (command) {
+		case "mceFullScreen":
+			if (tinyMCE.getParam('fullscreen_is_enabled')) {
+				// In fullscreen mode
+				window.opener.tinyMCE.execInstanceCommand(tinyMCE.getParam('fullscreen_editor_id'), 'mceSetContent', false, tinyMCE.getContent(editor_id));
+				top.close();
+			} else {
+				tinyMCE.setWindowArg('editor_id', editor_id);
+
+				var win = window.open(tinyMCE.baseURL + "/plugins/fullscreen/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height="  + screen.availHeight);
+			}
+	
+			return true;
+	}
+
+	// Pass to next handler in chain
+	return false;
+}
+
+
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/source/web/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm
new file mode 100644
index 0000000000..17fa81ed44
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -0,0 +1,43 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<script language="javascript" type="text/javascript" src="../../tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+	var settings = new Array();
+
+	// Clone array
+	for (var name in window.opener.tinyMCE.settings)
+		settings[name] = window.opener.tinyMCE.settings[name];
+
+	// Set options
+	settings['mode'] = 'exact';
+	settings['elements'] = 'fullscreenarea';
+	settings['ask'] = false;
+	settings['setupcontent_callback'] = 'setupContent';
+	settings['fullscreen_is_enabled'] = true;
+	settings['fullscreen_editor_id'] = window.opener.tinyMCE.getWindowArg("editor_id");
+
+	// Init
+	tinyMCE.init(settings);
+
+	function setupContent(editor_id, body, doc) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		var backInst = window.opener.tinyMCE.getInstanceById(tinyMCE.getParam('fullscreen_editor_id'));
+
+		// Setup title
+		var divElm = document.createElement("div");
+		divElm.innerHTML = tinyMCELang['lang_fullscreen_title'];
+		document.title = divElm.innerHTML;
+
+		// Get content
+		inst.getBody().innerHTML = backInst.getBody().innerHTML;
+	}
+</script>
+</head>
+<body style="margin: 0px; overflow: hidden;" scrolling="no" scroll="no" onload="window.focus();">
+
+<textarea id="fullscreenarea" style="width: 100%; height: 100%"></textarea>
+
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif b/source/web/scripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif
new file mode 100644
index 0000000000..850ff8d42d
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/fullscreen/images/fullscreen.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/langs/en.js b/source/web/scripts/tiny_mce/plugins/fullscreen/langs/en.js
new file mode 100644
index 0000000000..7cfe92d4f4
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/fullscreen/langs/en.js
@@ -0,0 +1,4 @@
+// UK lang variables
+
+tinyMCELang['lang_fullscreen_title'] = 'Fullscreen mode'
+tinyMCELang['lang_fullscreen_desc'] = 'Toggle fullscreen mode'
diff --git a/source/web/scripts/tiny_mce/plugins/fullscreen/readme.txt b/source/web/scripts/tiny_mce/plugins/fullscreen/readme.txt
new file mode 100644
index 0000000000..1be5b27eb9
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/fullscreen/readme.txt
@@ -0,0 +1,17 @@
+ Fullscreen plugin for TinyMCE
+------------------------------
+
+This plugin adds fullscreen mode to TinyMCE.
+
+Installation instructions:
+  * Add plugin to TinyMCE plugin option list example: plugins : "fullscreen".
+  * Add the fullscreen button name to button list, example: theme_advanced_buttons3_add : "fullscreen".
+
+Initialization example:
+  tinyMCE.init({
+    theme : "advanced",
+    mode : "textareas",
+    plugins : "fullscreen",
+    theme_advanced_buttons3_add : "fullscreen",
+    plaintext_create_paragraphs : false
+  });
diff --git a/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin.js b/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin.js
new file mode 100644
index 0000000000..e955159c45
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin.js
@@ -0,0 +1,2 @@
+/* Import plugin specific language pack */
+ tinyMCE.importPluginLanguagePack('iespell','cs,el,en,fr_ca,it,ko,sv,zh_cn,fr,de,pl');function TinyMCE_iespell_getControlHTML(control_name){if(control_name=="iespell"&&tinyMCE.isMSIE)return '<img id="{$editor_id}_iespell" src="{$pluginurl}/images/iespell.gif" title="{$lang_iespell_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceIESpell\');">';return "";}function TinyMCE_iespell_execCommand(editor_id,element,command,user_interface,value){if(command=="mceIESpell"){try{var ieSpell=new ActiveXObject("ieSpell.ieSpellExtension");ieSpell.CheckDocumentNode(tinyMCE.getInstanceById(editor_id).contentDocument.documentElement);}catch(e){if(e.number==-2146827859){if(confirm(tinyMCE.getLang("lang_iespell_download","",true)))window.open('http://www.iespell.com/download.php','ieSpellDownload','');}else alert("Error Loading ieSpell: Exception "+e.number);}return true;}return false;}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin_src.js b/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin_src.js
new file mode 100644
index 0000000000..e29dc62ab8
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/iespell/editor_plugin_src.js
@@ -0,0 +1,37 @@
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('iespell', 'cs,el,en,fr_ca,it,ko,sv,zh_cn,fr,de,pl');
+
+/**
+ * Returns the HTML contents of the iespell control.
+ */
+function TinyMCE_iespell_getControlHTML(control_name) {
+	// Is it the iespell control and is the brower MSIE.
+	if (control_name == "iespell" && tinyMCE.isMSIE)
+		return '<img id="{$editor_id}_iespell" src="{$pluginurl}/images/iespell.gif" title="{$lang_iespell_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceIESpell\');">';
+
+	return "";
+}
+
+/**
+ * Executes the mceIESpell command.
+ */
+function TinyMCE_iespell_execCommand(editor_id, element, command, user_interface, value) {
+	// Handle ieSpellCommand
+	if (command == "mceIESpell") {
+		try {
+			var ieSpell = new ActiveXObject("ieSpell.ieSpellExtension");
+			ieSpell.CheckDocumentNode(tinyMCE.getInstanceById(editor_id).contentDocument.documentElement);
+		} catch (e) {
+			if (e.number == -2146827859) {
+				if (confirm(tinyMCE.getLang("lang_iespell_download", "", true)))
+					window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
+			} else
+				alert("Error Loading ieSpell: Exception " + e.number);
+		}
+
+		return true;
+	}
+
+	// Pass to next handler in chain
+	return false;
+}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/plugins/iespell/images/iespell.gif b/source/web/scripts/tiny_mce/plugins/iespell/images/iespell.gif
new file mode 100644
index 0000000000..46c0c4a66a
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/iespell/images/iespell.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/iespell/langs/en.js b/source/web/scripts/tiny_mce/plugins/iespell/langs/en.js
new file mode 100644
index 0000000000..b7cc3a439f
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/iespell/langs/en.js
@@ -0,0 +1,4 @@
+// UK lang variables
+
+tinyMCELang['lang_iespell_desc'] = 'Run spell checking';
+tinyMCELang['lang_iespell_download'] = "ieSpell not detected. Click OK to go to download page."
diff --git a/source/web/scripts/tiny_mce/plugins/iespell/readme.txt b/source/web/scripts/tiny_mce/plugins/iespell/readme.txt
new file mode 100644
index 0000000000..0371a2a1bf
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/iespell/readme.txt
@@ -0,0 +1,20 @@
+ ieSpell plugin for TinyMCE
+----------------------------
+
+Installation instructions:
+  * Copy the iespell directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).
+  * Add plugin to TinyMCE plugin option list example: plugins : "iespell".
+  * Add the iespell button name to button list, example: theme_advanced_buttons3_add : "iespell".
+
+Initialization example:
+  tinyMCE.init({
+    theme : "advanced",
+    mode : "textareas",
+    plugins : "iespell",
+    theme_advanced_buttons3_add : "iespell"
+  });
+
+Requirements:
+  The end user will need MSIE on Windows with the ieSpell installed. This can be downloaded
+  from http://www.iespell.com/download.php. Notice on other browsers than MSIE the spellchecking
+  button will not be visible.
diff --git a/source/web/scripts/tiny_mce/plugins/readme.txt b/source/web/scripts/tiny_mce/plugins/readme.txt
new file mode 100644
index 0000000000..b694fdb6bf
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/readme.txt
@@ -0,0 +1 @@
+This is the location you place TinyMCE plugins.
diff --git a/source/web/scripts/tiny_mce/plugins/table/cell.htm b/source/web/scripts/tiny_mce/plugins/table/cell.htm
new file mode 100644
index 0000000000..f78bf9167f
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/cell.htm
@@ -0,0 +1,139 @@
+<html>
+<head>
+<title>{$lang_table_cell_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+// Disable auto resize
+tinyMCE.getWindowArg('mce_windowresize', false);
+
+function insertTable() {
+	if (window.opener) {
+		var args = new Array();
+
+		args["width"] = document.forms[0].width.value;
+		args["height"] = document.forms[0].height.value;
+		args["align"] = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+		args["valign"] = document.forms[0].valign.options[document.forms[0].valign.selectedIndex].value;
+		args["className"] = document.forms[0].styleSelect.options[document.forms[0].styleSelect.selectedIndex].value;
+		args["bordercolor"] = document.forms[0].bordercolor.value;
+		args["bgcolor"] = document.forms[0].bgcolor.value;
+
+		window.opener.tinyMCE.execCommand("mceTableCellProps", false, args);
+		top.close();
+	}
+}
+
+function init() {
+	if (tinyMCE.settings['table_color_fields']) {
+		document.getElementById('colors').style.display = tinyMCE.isMSIE ? 'block' : 'table-row';
+		TinyMCEPlugin_onLoad(); // Resize again
+	}
+
+	document.forms[0].bordercolor.value = tinyMCE.getWindowArg('bordercolor');
+	document.forms[0].bgcolor.value = tinyMCE.getWindowArg('bgcolor');
+
+	for (var i=0; i<document.forms[0].align.options.length; i++) {
+		if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
+			document.forms[0].align.options.selectedIndex = i;
+	}
+
+	for (var i=0; i<document.forms[0].valign.options.length; i++) {
+		if (document.forms[0].valign.options[i].value == tinyMCE.getWindowArg('valign'))
+			document.forms[0].valign.options.selectedIndex = i;
+	}
+
+	var className = tinyMCE.getWindowArg('className');
+	var styleSelectElm = document.forms[0].styleSelect;
+	var stylesAr = tinyMCE.getParam('theme_advanced_styles', false);
+	if (stylesAr) {
+		stylesAr = stylesAr.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			var key, value;
+
+			key = stylesAr[i].split('=')[0];
+			value = stylesAr[i].split('=')[1];
+
+			styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			if (value == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	} else {
+		var csses = tinyMCE.getCSSClasses(tinyMCE.getWindowArg('editor_id'));
+		for (var i=0; i<csses.length; i++) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(csses[i], csses[i]);
+			if (csses[i] == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	}
+
+	var formObj = document.forms[0];
+	formObj.width.value = tinyMCE.getWindowArg('width');
+	formObj.height.value = tinyMCE.getWindowArg('height');
+
+	// Autoresize and focus
+	TinyMCEPopup_autoResize();
+	window.focus();
+}
+
+function cancelAction() {
+	top.close();
+}
+</script>
+</head>
+<body onload="window.focus();init();">
+<form onsubmit="insertTable();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="4" class="title">{$lang_table_cell_title}</td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_align}:</td>
+            <td><select name="align">
+                <option value="">{$lang_insert_table_align_default}</option>
+                <option value="center">{$lang_insert_table_align_middle}</option>
+                <option value="left">{$lang_insert_table_align_left}</option>
+                <option value="right">{$lang_insert_table_align_right}</option>
+              </select></td>
+            <td>{$lang_insert_table_class}:</td>
+            <td><select name="styleSelect">
+                <option value="" selected="selected">-- {$lang_theme_style_select} --</option>
+            </select></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_valign}:</td>
+            <td><select name="valign">
+                <option value="">{$lang_insert_table_align_default}</option>
+                <option value="top">{$lang_insert_table_align_top}</option>
+                <option value="middle">{$lang_insert_table_align_middle}</option>
+                <option value="bottom">{$lang_insert_table_align_bottom}</option>
+            </select></td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_width}:</td>
+            <td><input name="width" type="text" id="width" value="" size="4" maxlength="4"></td>
+            <td>{$lang_insert_table_height}: </td>
+            <td><input name="height" type="text" id="height" value="" size="4" maxlength="4"></td>
+          </tr>
+          <tr id="colors" style="display: none">
+            <td>{$lang_table_bordercolor}:</td>
+            <td><input name="bordercolor" type="text" id="bordercolor" value=""	size="9" maxlength="7"></td>
+            <td>{$lang_table_bgcolor}:</td>
+            <td><input name="bgcolor" type="text" id="bgcolor" value=""	size="9" maxlength="7"></td>
+          </tr>
+          <tr>
+            <td><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="insertTable();"></td>
+            <td align="right">&nbsp;</td>
+            <td align="right">&nbsp;</td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/plugins/table/editor_plugin.js b/source/web/scripts/tiny_mce/plugins/table/editor_plugin.js
new file mode 100644
index 0000000000..a7403146f5
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/editor_plugin.js
@@ -0,0 +1,2 @@
+/* Import plugin specific language pack */
+ tinyMCE.importPluginLanguagePack('table','en,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,no,pl,pt,sv,tw,zh_cn,fr,de');function TinyMCE_table_initInstance(inst){if(tinyMCE.isGecko)tinyMCE.addEvent(inst.getDoc(),"mouseup",TinyMCE_table_mouseDownHandler);inst.tableRowClipboard=null;}function TinyMCE_table_mouseDownHandler(e){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var focusElm=tinyMCE.selectedInstance.getFocusElement();if(elm.nodeName=="BODY"&&(focusElm.nodeName=="TD"||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TD"))){window.setTimeout(function(){var tableElm=tinyMCE.getParentElement(focusElm,"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual']);},10);}}function TinyMCE_table_getControlHTML(control_name){var controls=new Array(['table','table.gif','{$lang_table_desc}','mceInsertTable',true],['delete_col','table_delete_col.gif','{$lang_table_delete_col_desc}','mceTableDeleteCol'],['delete_row','table_delete_row.gif','{$lang_table_delete_row_desc}','mceTableDeleteRow'],['col_after','table_insert_col_after.gif','{$lang_table_insert_col_after_desc}','mceTableInsertColAfter'],['col_before','table_insert_col_before.gif','{$lang_table_insert_col_before_desc}','mceTableInsertColBefore'],['row_after','table_insert_row_after.gif','{$lang_table_insert_row_after_desc}','mceTableInsertRowAfter'],['row_before','table_insert_row_before.gif','{$lang_table_insert_row_before_desc}','mceTableInsertRowBefore'],['row_props','table_row_props.gif','{$lang_table_row_desc}','mceTableRowProps',true],['cell_props','table_cell_props.gif','{$lang_table_cell_desc}','mceTableCellProps',true],['split_cells','table_split_cells.gif','{$lang_table_split_cells_desc}','mceTableSplitCells',true],['merge_cells','table_merge_cells.gif','{$lang_table_merge_cells_desc}','mceTableMergeCells',true]);for(var i=0;i<controls.length;i++){var but=controls[i];var safariPatch='" onclick="';if(tinyMCE.isSafari)safariPatch="";if(but[0]==control_name&&(tinyMCE.isMSIE||!tinyMCE.settings['button_tile_map']))return '<img id="{$editor_id}_'+but[0]+'" src="{$pluginurl}/images/'+but[1]+'" title="'+but[2]+'" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';else if(but[0]==control_name)return '<img id="{$editor_id}_'+but[0]+'" src="{$themeurl}/images/spacer.gif" style="background-image:url({$pluginurl}/images/buttons.gif); background-position: '+(0-(i*20))+'px 0px" title="'+but[2]+'" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';}if(control_name=="tablecontrols"){var html="";html+=tinyMCE.getControlHTML("table");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_props");html+=tinyMCE.getControlHTML("cell_props");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_before");html+=tinyMCE.getControlHTML("row_after");html+=tinyMCE.getControlHTML("delete_row");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("col_before");html+=tinyMCE.getControlHTML("col_after");html+=tinyMCE.getControlHTML("delete_col");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("split_cells");html+=tinyMCE.getControlHTML("merge_cells");return html;}return "";}function TinyMCE_table_execCommand(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();var trElm=tinyMCE.getParentElement(focusElm,"tr");var tdElm=tinyMCE.getParentElement(focusElm,"td");var tableElm=tinyMCE.getParentElement(focusElm,"table");var doc=inst.contentWindow.document;var tableBorder=tableElm?tableElm.getAttribute("border"):"";if(trElm&&tdElm==null)tdElm=trElm.cells[0];function inArray(ar,v){for(var i=0;i<ar.length;i++){if(ar[i].length>0&&inArray(ar[i],v))return true;if(ar[i]==v)return true;}return false;}function makeTD(){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}function getColRowSpan(td){var colspan=tinyMCE.getAttrib(td,"colspan");var rowspan=tinyMCE.getAttrib(td,"rowspan");colspan=colspan==""?1:parseInt(colspan);rowspan=rowspan==""?1:parseInt(rowspan);return{colspan:colspan,rowspan:rowspan};}function getCellPos(grid,td){for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){if(grid[y][x]==td)return{cellindex:x,rowindex:y};}}return null;}function getCell(grid,row,col){if(grid[row]&&grid[row][col])return grid[row][col];return null;}function getTableGrid(table){var grid=new Array();var rows=table.rows;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].cells.length;x++){var td=rows[y].cells[x];var sd=getColRowSpan(td);for(xstart=x;grid[y]&&grid[y][xstart];xstart++);for(var y2=y;y2<y+sd['rowspan'];y2++){if(!grid[y2])grid[y2]=new Array();for(var x2=xstart;x2<xstart+sd['colspan'];x2++){grid[y2][x2]=td;}}}}return grid;}function trimRow(table,tr,td,new_tr){var grid=getTableGrid(table);var cpos=getCellPos(grid,td);if(new_tr.cells.length!=tr.childNodes.length){var cells=tr.childNodes;var lastElm=null;for(var x=0;td=getCell(grid,cpos.rowindex,x);x++){var remove=true;var sd=getColRowSpan(td);if(inArray(cells,td)){new_tr.childNodes[x]._delete=true;}else if((lastElm==null||td!=lastElm)&&sd.colspan>1){for(var i=x;i<x+td.colSpan;i++)new_tr.childNodes[i]._delete=true;}if((lastElm==null||td!=lastElm)&&sd.rowspan>1)td.rowSpan=sd.rowspan+1;lastElm=td;}deleteMarked(tableElm);}}function prevElm(node,name){while((node=node.previousSibling)!=null){if(node.nodeName==name)return node;}return null;}function nextElm(node,name){while((node=node.nextSibling)!=null){if(node.nodeName==name)return node;}return null;}function deleteMarked(tbl){if(tbl.rows==0)return;var tr=tbl.rows[0];do{var next=nextElm(tr,"TR");if(tr._delete){tr.parentNode.removeChild(tr);continue;}var td=tr.cells[0];if(td.cells>1){do{var nexttd=nextElm(td,"TD");if(td._delete)td.parentNode.removeChild(td);}while((td=nexttd)!=null);}}while((tr=next)!=null);}function addRows(td_elm,tr_elm,rowspan){td_elm.rowSpan=1;var trNext=nextElm(tr_elm,"TR");for(var i=1;i<rowspan&&trNext;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";if(tinyMCE.isMSIE)trNext.insertBefore(newTD,trNext.cells(td_elm.cellIndex));else trNext.insertBefore(newTD,trNext.cells[td_elm.cellIndex]);trNext=nextElm(trNext,"TR");}}function copyRow(doc,table,tr){var grid=getTableGrid(table);var newTR=tr.cloneNode(false);var cpos=getCellPos(grid,tr.cells[0]);var lastCell=null;var tableBorder=tinyMCE.getAttrib(table,"border");var tdElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){var newTD=null;if(lastCell!=tdElm){for(var i=0;i<tr.cells.length;i++){if(tdElm==tr.cells[i]){newTD=tdElm.cloneNode(true);break;}}}if(newTD==null){newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}newTD.colSpan=1;newTD.rowSpan=1;newTR.appendChild(newTD);lastCell=tdElm;}return newTR;}switch(command){case "mceTableRowProps":if(trElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/row.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=220;}else{template['width']=340;template['height']=220;}tinyMCE.openWindow(template,{editor_id:inst.editorId,align:tinyMCE.getAttrib(trElm,'align'),valign:tinyMCE.getAttrib(trElm,'valign'),height:tinyMCE.getAttrib(trElm,'height'),className:tinyMCE.getVisualAidClass(tinyMCE.getAttrib(trElm,'class'),false),bordercolor:tinyMCE.getAttrib(trElm,'bordercolor'),bgcolor:tinyMCE.getAttrib(trElm,'bgcolor')});}else{inst.execCommand("mceAddUndoLevel");trElm.setAttribute('align',value['align']);trElm.setAttribute('vAlign',value['valign']);trElm.setAttribute('height',value['height']);trElm.setAttribute('bordercolor',value['bordercolor']);trElm.setAttribute('bgcolor',value['bgcolor']);tinyMCE.setAttrib(trElm,'class',value['className']);trElm.borderColor=value['bordercolor'];trElm.bgColor=value['bgcolor'];}tinyMCE.triggerNodeChange();return true;case "mceTableCellProps":if(tdElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/cell.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=240;}else{template['width']=340;template['height']=220;}tinyMCE.openWindow(template,{editor_id:inst.editorId,align:tinyMCE.getAttrib(tdElm,'align'),valign:tinyMCE.getAttrib(tdElm,'valign'),width:tinyMCE.getAttrib(tdElm,'width'),height:tinyMCE.getAttrib(tdElm,'height'),className:tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm,'class'),false),bordercolor:tinyMCE.getAttrib(tdElm,'bordercolor'),bgcolor:tinyMCE.getAttrib(tdElm,'bgcolor')});}else{inst.execCommand("mceAddUndoLevel");tdElm.setAttribute('align',value['align']);tdElm.setAttribute('vAlign',value['valign']);tdElm.setAttribute('width',value['width']);tdElm.setAttribute('height',value['height']);tdElm.setAttribute('bordercolor',value['bordercolor']);tdElm.setAttribute('bgcolor',value['bgcolor']);tinyMCE.setAttrib(tdElm,'class',tinyMCE.getVisualAidClass(value['className']));tdElm.borderColor=value['bordercolor'];tdElm.bgColor=value['bgcolor'];}tinyMCE.triggerNodeChange();return true;case "mceInsertTable":if(user_interface){var cols=2,rows=2,border=0,cellpadding="",cellspacing="",align="",width="",height="",bordercolor="",bgcolor="",action="insert",className="";tinyMCE.tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");if(tinyMCE.tableElm){var rowsAr=tinyMCE.tableElm.rows;var cols=0;for(var i=0;i<rowsAr.length;i++)if(rowsAr[i].cells.length>cols)cols=rowsAr[i].cells.length;cols=cols;rows=rowsAr.length;border=tinyMCE.getAttrib(tinyMCE.tableElm,'border',border);cellpadding=tinyMCE.getAttrib(tinyMCE.tableElm,'cellpadding',"");cellspacing=tinyMCE.getAttrib(tinyMCE.tableElm,'cellspacing',"");width=tinyMCE.getAttrib(tinyMCE.tableElm,'width',width);height=tinyMCE.getAttrib(tinyMCE.tableElm,'height',height);bordercolor=tinyMCE.getAttrib(tinyMCE.tableElm,'bordercolor',bordercolor);bgcolor=tinyMCE.getAttrib(tinyMCE.tableElm,'bgcolor',bgcolor);align=tinyMCE.getAttrib(tinyMCE.tableElm,'align',align);className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tinyMCE.tableElm,'class'),false);if(tinyMCE.isMSIE){width=tinyMCE.tableElm.style.pixelWidth==0?tinyMCE.tableElm.getAttribute("width"):tinyMCE.tableElm.style.pixelWidth;height=tinyMCE.tableElm.style.pixelHeight==0?tinyMCE.tableElm.getAttribute("height"):tinyMCE.tableElm.style.pixelHeight;}action="update";}var template=new Array();template['file']='../../plugins/table/table.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=240;}else{template['width']=340;template['height']=220;}template['width']+=tinyMCE.getLang('lang_insert_table_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_table_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,cols:cols,rows:rows,border:border,cellpadding:cellpadding,cellspacing:cellspacing,align:align,width:width,height:height,bordercolor:bordercolor,bgcolor:bgcolor,action:action,className:className});}else{var html='';var cols=2,rows=2,border=0,cellpadding=-1,cellspacing=-1,align,width,height,className;if(typeof(value)=='object'){cols=value['cols'];rows=value['rows'];border=value['border']!=""?value['border']:0;cellpadding=value['cellpadding']!=""?value['cellpadding']:-1;cellspacing=value['cellspacing']!=""?value['cellspacing']:-1;align=value['align'];width=value['width'];height=value['height'];bordercolor=value['bordercolor'];bgcolor=value['bgcolor'];className=value['className'];}if(tinyMCE.tableElm){inst.execCommand("mceAddUndoLevel");tinyMCE.setAttrib(tinyMCE.tableElm,'cellPadding',cellpadding,true);tinyMCE.setAttrib(tinyMCE.tableElm,'cellSpacing',cellspacing,true);tinyMCE.setAttrib(tinyMCE.tableElm,'border',border,true);tinyMCE.setAttrib(tinyMCE.tableElm,'width',width,true);tinyMCE.setAttrib(tinyMCE.tableElm,'height',height,true);tinyMCE.setAttrib(tinyMCE.tableElm,'bordercolor',bordercolor);tinyMCE.setAttrib(tinyMCE.tableElm,'bgcolor',bgcolor);tinyMCE.setAttrib(tinyMCE.tableElm,'align',align);tinyMCE.setAttrib(tinyMCE.tableElm,'class',className);if(tinyMCE.isMSIE){tinyMCE.tableElm.style.pixelWidth=(width==null||width=="")?0:width;tinyMCE.tableElm.style.pixelHeight=(height==null||height=="")?0:height;tinyMCE.tableElm.borderColor=bordercolor;tinyMCE.tableElm.bgColor=bgcolor;}tinyMCE.handleVisualAid(tinyMCE.tableElm,false,inst.visualAid);tinyMCE.tableElm.outerHTML=tinyMCE.tableElm.outerHTML;tinyMCE.triggerNodeChange();return true;}html+='<table border="'+border+'" ';if(cellpadding!=-1)html+='cellpadding="'+cellpadding+'" ';if(cellspacing!=-1)html+='cellspacing="'+cellspacing+'" ';if(width!=0&&width!="")html+='width="'+width+'" ';if(height!=0&&height!="")html+='height="'+height+'" ';if(bordercolor!=0&&bordercolor!="")html+='bordercolor="'+bordercolor+'" ';if(bgcolor!=0&&bgcolor!="")html+='bgcolor="'+bgcolor+'" ';if(align)html+='align="'+align+'" ';if(className)html+='class="'+tinyMCE.getVisualAidClass(className,border==0)+'" ';html+='>';for(var y=0;y<rows;y++){html+="<tr>";for(var x=0;x<cols;x++)html+='<td>&nbsp;</td>';html+="</tr>";}html+="</table>";inst.execCommand('mceInsertContent',false,html);tinyMCE.handleVisualAid(inst.getBody(),true,tinyMCE.settings['visual']);}return true;case "mceTableSplitCells":case "mceTableMergeCells":case "mceTableInsertRowBefore":case "mceTableInsertRowAfter":case "mceTableDeleteRow":case "mceTableInsertColBefore":case "mceTableInsertColAfter":case "mceTableDeleteCol":case "mceTableCutRow":case "mceTableCopyRow":case "mceTablePasteRowBefore":case "mceTablePasteRowAfter":inst.execCommand("mceAddUndoLevel");if(!tableElm)return true;if(tableElm.firstChild&&tableElm.firstChild.nodeName.toLowerCase()=="tbody")tableElm=tableElm.firstChild;if(tableElm&&trElm){switch(command){case "mceTableInsertRowBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}trElm.parentNode.insertBefore(newTR,trElm);break;case "mceTableCutRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);inst.execCommand("mceTableDeleteRow");break;case "mceTableCopyRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);break;case "mceTablePasteRowBefore":if(!trElm||!tdElm)return true;var newTR=inst.tableRowClipboard.cloneNode(true);var prevTR=prevElm(trElm,"TR");if(prevTR!=null)trimRow(tableElm,prevTR,prevTR.cells[0],newTR);trElm.parentNode.insertBefore(newTR,trElm);break;case "mceTablePasteRowAfter":if(!trElm||!tdElm)return true;var nextTR=nextElm(trElm,"TR");var newTR=inst.tableRowClipboard.cloneNode(true);trimRow(tableElm,trElm,tdElm,newTR);if(nextTR==null)trElm.parentNode.appendChild(newTR);else nextTR.parentNode.insertBefore(newTR,nextTR);break;case "mceTableInsertRowAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}if(newTR.hasChildNodes()){var nextTR=nextElm(trElm,"TR");if(nextTR)nextTR.parentNode.insertBefore(newTR,nextTR);else tableElm.appendChild(newTR);}break;case "mceTableDeleteRow":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);if(grid.length==1){tableElm.parentNode.removeChild(tableElm);return true;}var cells=trElm.cells;var nextTR=nextElm(trElm,"TR");for(var x=0;x<cells.length;x++){if(cells[x].rowSpan>1){var newTD=cells[x].cloneNode(true);var sd=getColRowSpan(cells[x]);newTD.rowSpan=sd.rowspan-1;var nextTD=nextTR.cells[x];if(nextTD==null)nextTR.appendChild(newTD);else nextTR.insertBefore(newTD,nextTD);}}var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd.rowspan>1){tdElm.rowSpan=sd.rowspan-1;}else{trElm=tdElm.parentNode;if(trElm.parentNode)trElm._delete=true;}lastTDElm=tdElm;}}deleteMarked(tableElm);cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;inst.selectNode(getCell(grid,cpos.rowindex,0),true,true);break;case "mceTableInsertColBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;tdElm.parentNode.insertBefore(newTD,tdElm);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case "mceTableInsertColAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;var nextTD=nextElm(tdElm,"TD");if(nextTD==null)tdElm.parentNode.appendChild(newTD);else nextTD.parentNode.insertBefore(newTD,nextTD);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case "mceTableDeleteCol":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;if(grid.length>1&&grid[0].length<=1){tableElm.parentNode.removeChild(tableElm);return true;}for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']>1)tdElm.colSpan=sd['colspan']-1;else{if(tdElm.parentNode)tdElm.parentNode.removeChild(tdElm);}lastTDElm=tdElm;}}cpos.cellindex--;if(cpos.cellindex<0)cpos.cellindex=0;inst.selectNode(getCell(grid,0,cpos.cellindex),true,true);break;case "mceTableSplitCells":if(!trElm||!tdElm)return true;var spandata=getColRowSpan(tdElm);var colspan=spandata["colspan"];var rowspan=spandata["rowspan"];if(colspan>1||rowspan>1){tdElm.colSpan=1;for(var i=1;i<colspan;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";trElm.insertBefore(newTD,nextElm(tdElm,"TD"));if(rowspan>1)addRows(newTD,trElm,rowspan);}addRows(tdElm,trElm,rowspan);}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");break;case "mceTableMergeCells":var rows=new Array();var sel=inst.getSel();var grid=getTableGrid(tableElm);if(tinyMCE.isMSIE||sel.rangeCount==1){if(user_interface){var template=new Array();var sp=getColRowSpan(tdElm);template['file']='../../plugins/table/merge_cells.htm';template['width']=160;template['height']=220;tinyMCE.openWindow(template,{editor_id:inst.editorId,action:"update",numcols:sp.colspan,numrows:sp.rowspan});return true;}else{var numRows=parseInt(value['numrows']);var numCols=parseInt(value['numcols']);var cpos=getCellPos(grid,tdElm);if((""+numRows)=="NaN")numRows=1;if((""+numCols)=="NaN")numCols=1;var tRows=tableElm.rows;for(var y=cpos.rowindex;y<grid.length;y++){var rowCells=new Array();for(var x=cpos.cellindex;x<grid[y].length;x++){var td=getCell(grid,y,x);if(td&&!inArray(rows,td)&&!inArray(rowCells,td)){var cp=getCellPos(grid,td);if(cp.cellindex<cpos.cellindex+numCols&&cp.rowindex<cpos.rowindex+numRows)rowCells[rowCells.length]=td;}}if(rowCells.length>0)rows[rows.length]=rowCells;}}}else{var cells=new Array();var sel=inst.getSel();var lastTR=null;var curRow=null;var x1=-1,y1=-1,x2,y2;if(sel.rangeCount<2)return true;for(var i=0;i<sel.rangeCount;i++){var rng=sel.getRangeAt(i);var tdElm=rng.startContainer.childNodes[rng.startOffset];if(!tdElm)break;if(tdElm.nodeName=="TD")cells[cells.length]=tdElm;}var tRows=tableElm.rows;for(var y=0;y<tRows.length;y++){var rowCells=new Array();for(var x=0;x<tRows[y].cells.length;x++){var td=tRows[y].cells[x];for(var i=0;i<cells.length;i++){if(td==cells[i]){rowCells[rowCells.length]=td;}}}if(rowCells.length>0)rows[rows.length]=rowCells;}var curRow=new Array();var lastTR=null;for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){grid[y][x]._selected=false;for(var i=0;i<cells.length;i++){if(grid[y][x]==cells[i]){if(x1==-1){x1=x;y1=y;}x2=x;y2=y;grid[y][x]._selected=true;}}}}for(var y=y1;y<=y2;y++){for(var x=x1;x<=x2;x++){if(!grid[y][x]._selected){alert("Invalid selection for merge.");return true;}}}}var rowSpan=1,colSpan=1;var lastRowSpan=-1;for(var y=0;y<rows.length;y++){var rowColSpan=0;for(var x=0;x<rows[y].length;x++){var sd=getColRowSpan(rows[y][x]);rowColSpan+=sd['colspan'];if(lastRowSpan!=-1&&sd['rowspan']!=lastRowSpan){alert("Invalid selection for merge.");return true;}lastRowSpan=sd['rowspan'];}if(rowColSpan>colSpan)colSpan=rowColSpan;lastRowSpan=-1;}var lastColSpan=-1;for(var x=0;x<rows[0].length;x++){var colRowSpan=0;for(var y=0;y<rows.length;y++){var sd=getColRowSpan(rows[y][x]);colRowSpan+=sd['rowspan'];if(lastColSpan!=-1&&sd['colspan']!=lastColSpan){alert("Invalid selection for merge.");return true;}lastColSpan=sd['colspan'];}if(colRowSpan>rowSpan)rowSpan=colRowSpan;lastColSpan=-1;}tdElm=rows[0][0];tdElm.rowSpan=rowSpan;tdElm.colSpan=colSpan;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].length;x++){var html=rows[y][x].innerHTML;var chk=tinyMCE.regexpReplace(html,"[ \t\r\n]","");if(chk!="<br/>"&&chk!="<br>"&&chk!="&nbsp;"&&(x+y>0))tdElm.innerHTML+=html;if(rows[y][x]!=tdElm&&!rows[y][x]._deleted){var cpos=getCellPos(grid,rows[y][x]);var tr=rows[y][x].parentNode;tr.removeChild(rows[y][x]);rows[y][x]._deleted=true;if(!tr.hasChildNodes()){tr.parentNode.removeChild(tr);var lastCell=null;for(var x=0;cellElm=getCell(grid,cpos.rowindex,x);x++){if(cellElm!=lastCell&&cellElm.rowSpan>1)cellElm.rowSpan--;lastCell=cellElm;}if(tdElm.rowSpan>1)tdElm.rowSpan--;}}}}break;}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual']);tinyMCE.triggerNodeChange();inst.repaint();}return true;}return false;}function TinyMCE_table_handleNodeChange(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var colspan="1",rowspan="1";var inst=tinyMCE.getInstanceById(editor_id);tinyMCE.switchClassSticky(editor_id+'_table','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_row_props','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_cell_props','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_row_before','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_row_after','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_delete_row','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_col_before','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_col_after','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_delete_col','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_split_cells','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_merge_cells','mceButtonDisabled',true);if(tinyMCE.getParentElement(node,"tr"))tinyMCE.switchClassSticky(editor_id+'_row_props','mceButtonSelected',false);if(tdElm=tinyMCE.getParentElement(node,"td")){tinyMCE.switchClassSticky(editor_id+'_cell_props','mceButtonSelected',false);tinyMCE.switchClassSticky(editor_id+'_row_before','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_row_after','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_delete_row','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_col_before','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_col_after','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_delete_col','mceButtonNormal',false);colspan=tinyMCE.getAttrib(tdElm,"colspan");rowspan=tinyMCE.getAttrib(tdElm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;if(colspan!="1"||rowspan!="1")tinyMCE.switchClassSticky(editor_id+'_split_cells','mceButtonNormal',false);}if(tinyMCE.getParentElement(node,"table")){tinyMCE.switchClassSticky(editor_id+'_table','mceButtonSelected');tinyMCE.switchClassSticky(editor_id+'_merge_cells','mceButtonNormal',false);}}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/plugins/table/editor_plugin_src.js b/source/web/scripts/tiny_mce/plugins/table/editor_plugin_src.js
new file mode 100644
index 0000000000..269d3c5d63
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -0,0 +1,1141 @@
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('table', 'en,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,no,pl,pt,sv,tw,zh_cn,fr,de');
+
+function TinyMCE_table_initInstance(inst) {
+	if (tinyMCE.isGecko)
+		tinyMCE.addEvent(inst.getDoc(), "mouseup", TinyMCE_table_mouseDownHandler);
+
+	inst.tableRowClipboard = null;
+}
+
+function TinyMCE_table_mouseDownHandler(e) {
+	var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+	var focusElm = tinyMCE.selectedInstance.getFocusElement();
+
+	// If press on special Mozilla create TD/TR thingie
+	if (elm.nodeName == "BODY" && (focusElm.nodeName == "TD" || (focusElm.parentNode && focusElm.parentNode.nodeName == "TD"))) {
+		window.setTimeout(function() {
+			var tableElm = tinyMCE.getParentElement(focusElm, "table");
+			tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual']);
+		}, 10);
+	}
+}
+
+/**
+ * Returns the HTML contents of the table control.
+ */
+function TinyMCE_table_getControlHTML(control_name) {
+	var controls = new Array(
+		['table', 'table.gif', '{$lang_table_desc}', 'mceInsertTable', true],
+		['delete_col', 'table_delete_col.gif', '{$lang_table_delete_col_desc}', 'mceTableDeleteCol'],
+		['delete_row', 'table_delete_row.gif', '{$lang_table_delete_row_desc}', 'mceTableDeleteRow'],
+		['col_after', 'table_insert_col_after.gif', '{$lang_table_insert_col_after_desc}', 'mceTableInsertColAfter'],
+		['col_before', 'table_insert_col_before.gif', '{$lang_table_insert_col_before_desc}', 'mceTableInsertColBefore'],
+		['row_after', 'table_insert_row_after.gif', '{$lang_table_insert_row_after_desc}', 'mceTableInsertRowAfter'],
+		['row_before', 'table_insert_row_before.gif', '{$lang_table_insert_row_before_desc}', 'mceTableInsertRowBefore'],
+		['row_props', 'table_row_props.gif', '{$lang_table_row_desc}', 'mceTableRowProps', true],
+		['cell_props', 'table_cell_props.gif', '{$lang_table_cell_desc}', 'mceTableCellProps', true],
+		['split_cells', 'table_split_cells.gif', '{$lang_table_split_cells_desc}', 'mceTableSplitCells', true],
+		['merge_cells', 'table_merge_cells.gif', '{$lang_table_merge_cells_desc}', 'mceTableMergeCells', true]);
+
+	// Render table control
+	for (var i=0; i<controls.length; i++) {
+		var but = controls[i];
+		var safariPatch = '" onclick="';
+
+		if (tinyMCE.isSafari)
+			safariPatch = "";
+
+		if (but[0] == control_name && (tinyMCE.isMSIE || !tinyMCE.settings['button_tile_map']))
+			return '<img id="{$editor_id}_' + but[0] + '" src="{$pluginurl}/images/' + but[1] + '" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+		else if (but[0] == control_name)
+			return '<img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/spacer.gif" style="background-image:url({$pluginurl}/images/buttons.gif); background-position: ' + (0-(i*20)) + 'px 0px" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+	}
+
+	// Special tablecontrols
+	if (control_name == "tablecontrols") {
+		var html = "";
+
+		html += tinyMCE.getControlHTML("table");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("row_props");
+		html += tinyMCE.getControlHTML("cell_props");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("row_before");
+		html += tinyMCE.getControlHTML("row_after");
+		html += tinyMCE.getControlHTML("delete_row");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("col_before");
+		html += tinyMCE.getControlHTML("col_after");
+		html += tinyMCE.getControlHTML("delete_col");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("split_cells");
+		html += tinyMCE.getControlHTML("merge_cells");
+
+		return html;
+	}
+
+	return "";
+}
+
+/**
+ * Executes the table commands.
+ */
+function TinyMCE_table_execCommand(editor_id, element, command, user_interface, value) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	var focusElm = inst.getFocusElement();
+	var trElm = tinyMCE.getParentElement(focusElm, "tr");
+	var tdElm = tinyMCE.getParentElement(focusElm, "td");
+	var tableElm = tinyMCE.getParentElement(focusElm, "table");
+	var doc = inst.contentWindow.document;
+	var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+
+	// Get first TD if no TD found
+	if (trElm && tdElm == null)
+		tdElm = trElm.cells[0];
+
+	// ------- Inner functions ---------
+	function inArray(ar, v) {
+		for (var i=0; i<ar.length; i++) {
+			// Is array
+			if (ar[i].length > 0 && inArray(ar[i], v))
+				return true;
+
+			// Found value
+			if (ar[i] == v)
+				return true;
+		}
+
+		return false;
+	}
+
+	function makeTD() {
+		var newTD = doc.createElement("td");
+		newTD.innerHTML = "&nbsp;";
+	}
+
+	function getColRowSpan(td) {
+		var colspan = tinyMCE.getAttrib(td, "colspan");
+		var rowspan = tinyMCE.getAttrib(td, "rowspan");
+
+		colspan = colspan == "" ? 1 : parseInt(colspan);
+		rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+
+		return {colspan : colspan, rowspan : rowspan};
+	}
+
+	function getCellPos(grid, td) {
+		for (var y=0; y<grid.length; y++) {
+			for (var x=0; x<grid[y].length; x++) {
+				if (grid[y][x] == td)
+					return {cellindex : x, rowindex : y};
+			}
+		}
+
+		return null;
+	}
+
+	function getCell(grid, row, col) {
+		if (grid[row] && grid[row][col])
+			return grid[row][col];
+
+		return null;
+	}
+
+	function getTableGrid(table) {
+		var grid = new Array();
+		var rows = table.rows;
+
+		for (var y=0; y<rows.length; y++) {
+			for (var x=0; x<rows[y].cells.length; x++) {
+				var td = rows[y].cells[x];
+				var sd = getColRowSpan(td);
+
+				// All ready filled
+				for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+
+				// Fill box
+				for (var y2=y; y2<y+sd['rowspan']; y2++) {
+					if (!grid[y2])
+						grid[y2] = new Array();
+
+					for (var x2=xstart; x2<xstart+sd['colspan']; x2++) {
+						grid[y2][x2] = td;
+					}
+				}
+			}
+		}
+
+		return grid;
+	}
+
+	function trimRow(table, tr, td, new_tr) {
+		var grid = getTableGrid(table);
+		var cpos = getCellPos(grid, td);
+
+		// Time to crop away some
+		if (new_tr.cells.length != tr.childNodes.length) {
+			var cells = tr.childNodes;
+			var lastElm = null;
+
+			for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
+				var remove = true;
+				var sd = getColRowSpan(td);
+
+				// Remove due to rowspan
+				if (inArray(cells, td)) {
+					new_tr.childNodes[x]._delete = true;
+				} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
+					for (var i=x; i<x+td.colSpan; i++)
+						new_tr.childNodes[i]._delete = true;
+				}
+
+				if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
+					td.rowSpan = sd.rowspan + 1;
+
+				lastElm = td;
+			}
+
+			deleteMarked(tableElm);
+		}
+	}
+
+	function prevElm(node, name) {
+		while ((node = node.previousSibling) != null) {
+			if (node.nodeName == name)
+				return node;
+		}
+
+		return null;
+	}
+
+	function nextElm(node, name) {
+		while ((node = node.nextSibling) != null) {
+			if (node.nodeName == name)
+				return node;
+		}
+
+		return null;
+	}
+
+	function deleteMarked(tbl) {
+		if (tbl.rows == 0)
+			return;
+
+		var tr = tbl.rows[0];
+		do {
+			var next = nextElm(tr, "TR");
+
+			// Delete row
+			if (tr._delete) {
+				tr.parentNode.removeChild(tr);
+				continue;
+			}
+
+			// Delete cells
+			var td = tr.cells[0];
+			if (td.cells > 1) {
+				do {
+					var nexttd = nextElm(td, "TD");
+
+					if (td._delete)
+						td.parentNode.removeChild(td);
+				} while ((td = nexttd) != null);
+			}
+		} while ((tr = next) != null);
+	}
+
+	function addRows(td_elm, tr_elm, rowspan) {
+		// Add rows
+		td_elm.rowSpan = 1;
+		var trNext = nextElm(tr_elm, "TR");
+		for (var i=1; i<rowspan && trNext; i++) {
+			var newTD = doc.createElement("td");
+			newTD.innerHTML = "&nbsp;";
+
+			if (tinyMCE.isMSIE)
+				trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
+			else
+				trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+
+			trNext = nextElm(trNext, "TR");
+		}
+	}
+
+	function copyRow(doc, table, tr) {
+		var grid = getTableGrid(table);
+		var newTR = tr.cloneNode(false);
+		var cpos = getCellPos(grid, tr.cells[0]);
+		var lastCell = null;
+		var tableBorder = tinyMCE.getAttrib(table, "border");
+		var tdElm = null;
+
+		for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+			var newTD = null;
+
+			if (lastCell != tdElm) {
+				for (var i=0; i<tr.cells.length; i++) {
+					if (tdElm == tr.cells[i]) {
+						newTD = tdElm.cloneNode(true);
+						break;
+					}
+				}
+			}
+
+			if (newTD == null) {
+				newTD = doc.createElement("td");
+				newTD.innerHTML = "&nbsp;";
+			}
+
+			// Reset col/row span
+			newTD.colSpan = 1;
+			newTD.rowSpan = 1;
+
+			newTR.appendChild(newTD);
+
+			lastCell = tdElm;
+		}
+
+		return newTR;
+	}
+
+	// ---- Commands -----
+
+	// Handle commands
+	switch (command) {
+		case "mceTableRowProps":
+			if (trElm == null)
+				return true;
+
+			if (user_interface) {
+				// Setup template
+				var template = new Array();
+
+				template['file'] = '../../plugins/table/row.htm';
+
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 220;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
+				}
+
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, align : tinyMCE.getAttrib(trElm, 'align'), valign : tinyMCE.getAttrib(trElm, 'valign'), height : tinyMCE.getAttrib(trElm, 'height'), className : tinyMCE.getVisualAidClass(tinyMCE.getAttrib(trElm, 'class'), false), bordercolor : tinyMCE.getAttrib(trElm, 'bordercolor'), bgcolor : tinyMCE.getAttrib(trElm, 'bgcolor')});
+			} else {
+				inst.execCommand("mceAddUndoLevel");
+
+				trElm.setAttribute('align', value['align']);
+				trElm.setAttribute('vAlign', value['valign']);
+				trElm.setAttribute('height', value['height']);
+				trElm.setAttribute('bordercolor', value['bordercolor']);
+				trElm.setAttribute('bgcolor', value['bgcolor']);
+				tinyMCE.setAttrib(trElm, 'class', value['className']);
+
+				trElm.borderColor = value['bordercolor'];
+				trElm.bgColor = value['bgcolor'];
+			}
+
+			tinyMCE.triggerNodeChange();
+			return true;
+
+		case "mceTableCellProps":
+			if (tdElm == null)
+				return true;
+
+			if (user_interface) {
+				// Setup template
+				var template = new Array();
+
+				template['file'] = '../../plugins/table/cell.htm';
+
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 240;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
+				}
+
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, align : tinyMCE.getAttrib(tdElm, 'align'), valign : tinyMCE.getAttrib(tdElm, 'valign'), width : tinyMCE.getAttrib(tdElm, 'width'), height : tinyMCE.getAttrib(tdElm, 'height'), className : tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm, 'class'), false), bordercolor : tinyMCE.getAttrib(tdElm, 'bordercolor'), bgcolor : tinyMCE.getAttrib(tdElm, 'bgcolor')});
+			} else {
+				inst.execCommand("mceAddUndoLevel");
+
+				tdElm.setAttribute('align', value['align']);
+				tdElm.setAttribute('vAlign', value['valign']);
+				tdElm.setAttribute('width', value['width']);
+				tdElm.setAttribute('height', value['height']);
+				tdElm.setAttribute('bordercolor', value['bordercolor']);
+				tdElm.setAttribute('bgcolor', value['bgcolor']);
+				tinyMCE.setAttrib(tdElm, 'class', tinyMCE.getVisualAidClass(value['className']));
+
+				tdElm.borderColor = value['bordercolor'];
+				tdElm.bgColor = value['bgcolor'];
+			}
+
+			tinyMCE.triggerNodeChange();
+			return true;
+
+		case "mceInsertTable":
+			if (user_interface) {
+				var cols = 2, rows = 2, border = 0, cellpadding = "", cellspacing = "", align = "", width = "", height = "", bordercolor = "", bgcolor = "", action = "insert", className = "";
+
+				tinyMCE.tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+
+				if (tinyMCE.tableElm) {
+					var rowsAr = tinyMCE.tableElm.rows;
+					var cols = 0;
+					for (var i=0; i<rowsAr.length; i++)
+						if (rowsAr[i].cells.length > cols)
+							cols = rowsAr[i].cells.length;
+
+					cols = cols;
+					rows = rowsAr.length;
+
+					border = tinyMCE.getAttrib(tinyMCE.tableElm, 'border', border);
+					cellpadding = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellpadding', "");
+					cellspacing = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellspacing', "");
+					width = tinyMCE.getAttrib(tinyMCE.tableElm, 'width', width);
+					height = tinyMCE.getAttrib(tinyMCE.tableElm, 'height', height);
+					bordercolor = tinyMCE.getAttrib(tinyMCE.tableElm, 'bordercolor', bordercolor);
+					bgcolor = tinyMCE.getAttrib(tinyMCE.tableElm, 'bgcolor', bgcolor);
+					align = tinyMCE.getAttrib(tinyMCE.tableElm, 'align', align);
+					className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tinyMCE.tableElm, 'class'), false);
+
+					if (tinyMCE.isMSIE) {
+						width = tinyMCE.tableElm.style.pixelWidth == 0 ? tinyMCE.tableElm.getAttribute("width") : tinyMCE.tableElm.style.pixelWidth;
+						height = tinyMCE.tableElm.style.pixelHeight == 0 ? tinyMCE.tableElm.getAttribute("height") : tinyMCE.tableElm.style.pixelHeight;
+					}
+
+					action = "update";
+				}
+
+				// Setup template
+				var template = new Array();
+
+				template['file'] = '../../plugins/table/table.htm';
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 240;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
+				}
+
+				// Language specific width and height addons
+				template['width'] += tinyMCE.getLang('lang_insert_table_delta_width', 0);
+				template['height'] += tinyMCE.getLang('lang_insert_table_delta_height', 0);
+
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, cols : cols, rows : rows, border : border, cellpadding : cellpadding, cellspacing : cellspacing, align : align, width : width, height : height, bordercolor : bordercolor, bgcolor : bgcolor, action : action, className : className});
+			} else {
+				var html = '';
+				var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className;
+
+				if (typeof(value) == 'object') {
+					cols = value['cols'];
+					rows = value['rows'];
+					border = value['border'] != "" ? value['border'] : 0;
+					cellpadding = value['cellpadding'] != "" ? value['cellpadding'] : -1;
+					cellspacing = value['cellspacing'] != "" ? value['cellspacing'] : -1;
+					align = value['align'];
+					width = value['width'];
+					height = value['height'];
+					bordercolor = value['bordercolor'];
+					bgcolor = value['bgcolor'];
+					className = value['className'];
+				}
+
+				// Update table
+				if (tinyMCE.tableElm) {
+					inst.execCommand("mceAddUndoLevel");
+
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'cellPadding', cellpadding, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'cellSpacing', cellspacing, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'border', border, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'width', width, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'height', height, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'bordercolor', bordercolor);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'bgcolor', bgcolor);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'align', align);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'class', className);
+
+					if (tinyMCE.isMSIE) {
+						tinyMCE.tableElm.style.pixelWidth = (width == null || width == "") ? 0 : width;
+						tinyMCE.tableElm.style.pixelHeight = (height == null || height == "") ? 0 : height;
+						tinyMCE.tableElm.borderColor = bordercolor;
+						tinyMCE.tableElm.bgColor = bgcolor;
+					}
+
+					tinyMCE.handleVisualAid(tinyMCE.tableElm, false, inst.visualAid);
+
+					// Fix for stange MSIE align bug
+					tinyMCE.tableElm.outerHTML = tinyMCE.tableElm.outerHTML;
+
+					//inst.contentWindow.dispatchEvent(createEvent("click"));
+
+					tinyMCE.triggerNodeChange();
+					return true;
+				}
+
+				// Create new table
+				html += '<table border="' + border + '" ';
+
+				if (cellpadding != -1)
+					html += 'cellpadding="' + cellpadding + '" ';
+
+				if (cellspacing != -1)
+					html += 'cellspacing="' + cellspacing + '" ';
+
+				if (width != 0 && width != "")
+					html += 'width="' + width + '" ';
+
+				if (height != 0 && height != "")
+					html += 'height="' + height + '" ';
+
+				if (bordercolor != 0 && bordercolor != "")
+					html += 'bordercolor="' + bordercolor + '" ';
+
+				if (bgcolor != 0 && bgcolor != "")
+					html += 'bgcolor="' + bgcolor + '" ';
+
+				if (align)
+					html += 'align="' + align + '" ';
+
+				if (className)
+					html += 'class="' + tinyMCE.getVisualAidClass(className, border == 0) + '" ';
+
+				html += '>';
+
+				for (var y=0; y<rows; y++) {
+					html += "<tr>";
+
+					for (var x=0; x<cols; x++)
+						html += '<td>&nbsp;</td>';
+
+					html += "</tr>";
+				}
+
+				html += "</table>";
+
+				inst.execCommand('mceInsertContent', false, html);
+				tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual']);
+			}
+
+			return true;
+
+		case "mceTableSplitCells":
+		case "mceTableMergeCells":
+		case "mceTableInsertRowBefore":
+		case "mceTableInsertRowAfter":
+		case "mceTableDeleteRow":
+		case "mceTableInsertColBefore":
+		case "mceTableInsertColAfter":
+		case "mceTableDeleteCol":
+		case "mceTableCutRow":
+		case "mceTableCopyRow":
+		case "mceTablePasteRowBefore":
+		case "mceTablePasteRowAfter":
+			inst.execCommand("mceAddUndoLevel");
+
+			// No table just return (invalid command)
+			if (!tableElm)
+				return true;
+
+			// Table has a tbody use that reference
+			if (tableElm.firstChild && tableElm.firstChild.nodeName.toLowerCase() == "tbody")
+				tableElm = tableElm.firstChild;
+
+			if (tableElm && trElm) {
+				switch (command) {
+					case "mceTableInsertRowBefore":
+						if (!trElm || !tdElm)
+							return true;
+
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var newTR = doc.createElement("tr");
+						var lastTDElm = null;
+
+						cpos.rowindex--;
+						if (cpos.rowindex < 0)
+							cpos.rowindex = 0;
+
+						// Create cells
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['rowspan'] == 1) {
+									var newTD = doc.createElement("td");
+
+									newTD.innerHTML = "&nbsp;";
+									newTD.colSpan = tdElm.colSpan;
+
+									newTR.appendChild(newTD);
+								} else
+									tdElm.rowSpan = sd['rowspan'] + 1;
+
+								lastTDElm = tdElm;
+							}
+						}
+
+						trElm.parentNode.insertBefore(newTR, trElm);
+					break;
+
+					case "mceTableCutRow":
+						if (!trElm || !tdElm)
+							return true;
+
+						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+						inst.execCommand("mceTableDeleteRow");
+						break;
+
+					case "mceTableCopyRow":
+						if (!trElm || !tdElm)
+							return true;
+
+						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+						break;
+
+					case "mceTablePasteRowBefore":
+						if (!trElm || !tdElm)
+							return true;
+
+						var newTR = inst.tableRowClipboard.cloneNode(true);
+
+						var prevTR = prevElm(trElm, "TR");
+						if (prevTR != null)
+							trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+
+						trElm.parentNode.insertBefore(newTR, trElm);
+						break;
+
+					case "mceTablePasteRowAfter":
+						if (!trElm || !tdElm)
+							return true;
+						
+						var nextTR = nextElm(trElm, "TR");
+						var newTR = inst.tableRowClipboard.cloneNode(true);
+
+						trimRow(tableElm, trElm, tdElm, newTR);
+
+						if (nextTR == null)
+							trElm.parentNode.appendChild(newTR);
+						else
+							nextTR.parentNode.insertBefore(newTR, nextTR);
+
+						break;
+
+					case "mceTableInsertRowAfter":
+						if (!trElm || !tdElm)
+							return true;
+
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var newTR = doc.createElement("tr");
+						var lastTDElm = null;
+
+						// Create cells
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['rowspan'] == 1) {
+									var newTD = doc.createElement("td");
+
+									newTD.innerHTML = "&nbsp;";
+									newTD.colSpan = tdElm.colSpan;
+
+									newTR.appendChild(newTD);
+								} else
+									tdElm.rowSpan = sd['rowspan'] + 1;
+
+								lastTDElm = tdElm;
+							}
+						}
+
+						if (newTR.hasChildNodes()) {
+							var nextTR = nextElm(trElm, "TR");
+							if (nextTR)
+								nextTR.parentNode.insertBefore(newTR, nextTR);
+							else
+								tableElm.appendChild(newTR);
+						}
+					break;
+
+					case "mceTableDeleteRow":
+						if (!trElm || !tdElm)
+							return true;
+	
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+
+						// Only one row, remove whole table
+						if (grid.length == 1) {
+							tableElm.parentNode.removeChild(tableElm);
+							return true;
+						}
+
+						// Move down row spanned cells
+						var cells = trElm.cells;
+						var nextTR = nextElm(trElm, "TR");
+						for (var x=0; x<cells.length; x++) {
+							if (cells[x].rowSpan > 1) {
+								var newTD = cells[x].cloneNode(true);
+								var sd = getColRowSpan(cells[x]);
+
+								newTD.rowSpan = sd.rowspan - 1;
+
+								var nextTD = nextTR.cells[x];
+
+								if (nextTD == null)
+									nextTR.appendChild(newTD);
+								else
+									nextTR.insertBefore(newTD, nextTD);
+							}
+						}
+
+						// Delete cells
+						var lastTDElm = null;
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd.rowspan > 1) {
+									tdElm.rowSpan = sd.rowspan - 1;
+								} else {
+									trElm = tdElm.parentNode;
+
+									if (trElm.parentNode)
+										trElm._delete = true;
+								}
+
+								lastTDElm = tdElm;
+							}
+						}
+
+						deleteMarked(tableElm);
+
+						cpos.rowindex--;
+						if (cpos.rowindex < 0)
+							cpos.rowindex = 0;
+
+						inst.selectNode(getCell(grid, cpos.rowindex, 0), true, true);
+					break;
+
+					case "mceTableInsertColBefore":
+						if (!trElm || !tdElm)
+							return true;
+
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
+
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['colspan'] == 1) {
+									var newTD = doc.createElement("td");
+
+									newTD.innerHTML = "&nbsp;";
+									newTD.rowSpan = tdElm.rowSpan;
+
+									tdElm.parentNode.insertBefore(newTD, tdElm);
+								} else
+									tdElm.colSpan++;
+
+								lastTDElm = tdElm;
+							}
+						}
+					break;
+
+					case "mceTableInsertColAfter":
+						if (!trElm || !tdElm)
+							return true;
+
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
+
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['colspan'] == 1) {
+									var newTD = doc.createElement("td");
+
+									newTD.innerHTML = "&nbsp;";
+									newTD.rowSpan = tdElm.rowSpan;
+
+									var nextTD = nextElm(tdElm, "TD");
+									if (nextTD == null)
+										tdElm.parentNode.appendChild(newTD);
+									else
+										nextTD.parentNode.insertBefore(newTD, nextTD);
+								} else
+									tdElm.colSpan++;
+
+								lastTDElm = tdElm;
+							}
+						}
+					break;
+
+					case "mceTableDeleteCol":
+						if (!trElm || !tdElm)
+							return true;
+
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
+
+						// Only one col, remove whole table
+						if (grid.length > 1 && grid[0].length <= 1) {
+							tableElm.parentNode.removeChild(tableElm);
+							return true;
+						}
+
+						// Delete cells
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['colspan'] > 1)
+									tdElm.colSpan = sd['colspan'] - 1;
+								else {
+									if (tdElm.parentNode)
+										tdElm.parentNode.removeChild(tdElm);
+								}
+
+								lastTDElm = tdElm;
+							}
+						}
+
+						cpos.cellindex--;
+						if (cpos.cellindex < 0)
+							cpos.cellindex = 0;
+
+						inst.selectNode(getCell(grid, 0, cpos.cellindex), true, true);
+					break;
+
+				case "mceTableSplitCells":
+					if (!trElm || !tdElm)
+						return true;
+
+					var spandata = getColRowSpan(tdElm);
+
+					var colspan = spandata["colspan"];
+					var rowspan = spandata["rowspan"];
+
+					// Needs splitting
+					if (colspan > 1 || rowspan > 1) {
+						// Generate cols
+						tdElm.colSpan = 1;
+						for (var i=1; i<colspan; i++) {
+							var newTD = doc.createElement("td");
+
+							newTD.innerHTML = "&nbsp;";
+
+							trElm.insertBefore(newTD, nextElm(tdElm, "TD"));
+
+							if (rowspan > 1)
+								addRows(newTD, trElm, rowspan);
+						}
+
+						addRows(tdElm, trElm, rowspan);
+					}
+
+					// Apply visual aids
+					tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+					break;
+
+				case "mceTableMergeCells":
+					var rows = new Array();
+					var sel = inst.getSel();
+					var grid = getTableGrid(tableElm);
+
+					if (tinyMCE.isMSIE || sel.rangeCount == 1) {
+						if (user_interface) {
+							// Setup template
+							var template = new Array();
+							var sp = getColRowSpan(tdElm);
+
+							template['file'] = '../../plugins/table/merge_cells.htm';
+							template['width'] = 160;
+							template['height'] = 220;
+
+							// Open window
+							tinyMCE.openWindow(template, {editor_id : inst.editorId, action : "update", numcols : sp.colspan, numrows : sp.rowspan});
+
+							return true;
+						} else {
+							var numRows = parseInt(value['numrows']);
+							var numCols = parseInt(value['numcols']);
+							var cpos = getCellPos(grid, tdElm);
+
+							if (("" + numRows) == "NaN")
+								numRows = 1;
+
+							if (("" + numCols) == "NaN")
+								numCols = 1;
+
+							// Get rows and cells
+							var tRows = tableElm.rows;
+							for (var y=cpos.rowindex; y<grid.length; y++) {
+								var rowCells = new Array();
+
+								for (var x=cpos.cellindex; x<grid[y].length; x++) {
+									var td = getCell(grid, y, x);
+
+									if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
+										var cp = getCellPos(grid, td);
+
+										// Within range
+										if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
+											rowCells[rowCells.length] = td;
+									}
+								}
+
+								if (rowCells.length > 0)
+									rows[rows.length] = rowCells;
+							}
+
+							//return true;
+						}
+					} else {
+						var cells = new Array();
+						var sel = inst.getSel();
+						var lastTR = null;
+						var curRow = null;
+						var x1 = -1, y1 = -1, x2, y2;
+
+						// Only one cell selected, whats the point?
+						if (sel.rangeCount < 2)
+							return true;
+
+						// Get all selected cells
+						for (var i=0; i<sel.rangeCount; i++) {
+							var rng = sel.getRangeAt(i);
+							var tdElm = rng.startContainer.childNodes[rng.startOffset];
+
+							if (!tdElm)
+								break;
+
+							if (tdElm.nodeName == "TD")
+								cells[cells.length] = tdElm;
+						}
+
+						// Get rows and cells
+						var tRows = tableElm.rows;
+						for (var y=0; y<tRows.length; y++) {
+							var rowCells = new Array();
+
+							for (var x=0; x<tRows[y].cells.length; x++) {
+								var td = tRows[y].cells[x];
+
+								for (var i=0; i<cells.length; i++) {
+									if (td == cells[i]) {
+										rowCells[rowCells.length] = td;
+									}
+								}
+							}
+
+							if (rowCells.length > 0)
+								rows[rows.length] = rowCells;
+						}
+
+						// Find selected cells in grid and box
+						var curRow = new Array();
+						var lastTR = null;
+						for (var y=0; y<grid.length; y++) {
+							for (var x=0; x<grid[y].length; x++) {
+								grid[y][x]._selected = false;
+
+								for (var i=0; i<cells.length; i++) {
+									if (grid[y][x] == cells[i]) {
+										// Get start pos
+										if (x1 == -1) {
+											x1 = x;
+											y1 = y;
+										}
+
+										// Get end pos
+										x2 = x;
+										y2 = y;
+
+										grid[y][x]._selected = true;
+									}
+								}
+							}
+						}
+
+						// Is there gaps, if so deny
+						for (var y=y1; y<=y2; y++) {
+							for (var x=x1; x<=x2; x++) {
+								if (!grid[y][x]._selected) {
+									alert("Invalid selection for merge.");
+									return true;
+								}
+							}
+						}
+					}
+
+					// Validate selection and get total rowspan and colspan
+					var rowSpan = 1, colSpan = 1;
+
+					// Validate horizontal and get total colspan
+					var lastRowSpan = -1;
+					for (var y=0; y<rows.length; y++) {
+						var rowColSpan = 0;
+
+						for (var x=0; x<rows[y].length; x++) {
+							var sd = getColRowSpan(rows[y][x]);
+
+							rowColSpan += sd['colspan'];
+
+							if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
+								alert("Invalid selection for merge.");
+								return true;
+							}
+
+							lastRowSpan = sd['rowspan'];
+						}
+
+						if (rowColSpan > colSpan)
+							colSpan = rowColSpan;
+
+						lastRowSpan = -1;
+					}
+
+					// Validate vertical and get total rowspan
+					var lastColSpan = -1;
+					for (var x=0; x<rows[0].length; x++) {
+						var colRowSpan = 0;
+
+						for (var y=0; y<rows.length; y++) {
+							var sd = getColRowSpan(rows[y][x]);
+
+							colRowSpan += sd['rowspan'];
+
+							if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
+								alert("Invalid selection for merge.");
+								return true;
+							}
+
+							lastColSpan = sd['colspan'];
+						}
+
+						if (colRowSpan > rowSpan)
+							rowSpan = colRowSpan;
+
+						lastColSpan = -1;
+					}
+
+					// Setup td
+					tdElm = rows[0][0];
+					tdElm.rowSpan = rowSpan;
+					tdElm.colSpan = colSpan;
+
+					// Merge cells
+					for (var y=0; y<rows.length; y++) {
+						for (var x=0; x<rows[y].length; x++) {
+							var html = rows[y][x].innerHTML;
+							var chk = tinyMCE.regexpReplace(html, "[ \t\r\n]", "");
+
+							if (chk != "<br/>" && chk != "<br>" && chk != "&nbsp;" && (x+y > 0))
+								tdElm.innerHTML += html;
+
+							// Not current cell
+							if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
+								var cpos = getCellPos(grid, rows[y][x]);
+								var tr = rows[y][x].parentNode;
+
+								tr.removeChild(rows[y][x]);
+								rows[y][x]._deleted = true;
+
+								// Empty TR, remove it
+								if (!tr.hasChildNodes()) {
+									tr.parentNode.removeChild(tr);
+
+									var lastCell = null;
+									for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
+										if (cellElm != lastCell && cellElm.rowSpan > 1)
+											cellElm.rowSpan--;
+
+										lastCell = cellElm;
+									}
+
+									if (tdElm.rowSpan > 1)
+										tdElm.rowSpan--;
+								}
+							}
+						}
+					}
+
+					break;
+				}
+
+				tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+				tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual']);
+				tinyMCE.triggerNodeChange();
+				inst.repaint();
+			}
+
+		return true;
+	}
+
+	// Pass to next handler in chain
+	return false;
+}
+
+function TinyMCE_table_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	var colspan = "1", rowspan = "1";
+
+	var inst = tinyMCE.getInstanceById(editor_id);
+
+	// Reset table controls
+	tinyMCE.switchClassSticky(editor_id + '_table', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_row_props', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_cell_props', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_row_before', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_row_after', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_delete_row', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_col_before', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_col_after', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_delete_col', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_split_cells', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_merge_cells', 'mceButtonDisabled', true);
+
+	// Within a tr element
+	if (tinyMCE.getParentElement(node, "tr"))
+		tinyMCE.switchClassSticky(editor_id + '_row_props', 'mceButtonSelected', false);
+
+	// Within a td element
+	if (tdElm = tinyMCE.getParentElement(node, "td")) {
+		tinyMCE.switchClassSticky(editor_id + '_cell_props', 'mceButtonSelected', false);
+		tinyMCE.switchClassSticky(editor_id + '_row_before', 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_row_after', 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_delete_row', 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_col_before', 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_col_after', 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_delete_col', 'mceButtonNormal', false);
+
+		colspan = tinyMCE.getAttrib(tdElm, "colspan");
+		rowspan = tinyMCE.getAttrib(tdElm, "rowspan");
+
+		colspan = colspan == "" ? "1" : colspan;
+		rowspan = rowspan == "" ? "1" : rowspan;
+
+		if (colspan != "1" || rowspan != "1")
+			tinyMCE.switchClassSticky(editor_id + '_split_cells', 'mceButtonNormal', false);
+	}
+
+	// Within table
+	if (tinyMCE.getParentElement(node, "table")) {
+		tinyMCE.switchClassSticky(editor_id + '_table', 'mceButtonSelected');
+		tinyMCE.switchClassSticky(editor_id + '_merge_cells', 'mceButtonNormal', false);
+	}
+}
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/buttons.gif b/source/web/scripts/tiny_mce/plugins/table/images/buttons.gif
new file mode 100644
index 0000000000..e5eacbfa73
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/buttons.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table.gif b/source/web/scripts/tiny_mce/plugins/table/images/table.gif
new file mode 100644
index 0000000000..f8a00544a9
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_cell_props.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_cell_props.gif
new file mode 100644
index 0000000000..9e0f373923
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_cell_props.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_delete_col.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_delete_col.gif
new file mode 100644
index 0000000000..0b2f0fb612
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_delete_col.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_delete_row.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_delete_row.gif
new file mode 100644
index 0000000000..1997065fb2
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_delete_row.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_after.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_after.gif
new file mode 100644
index 0000000000..c30dafab6f
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_after.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_before.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_before.gif
new file mode 100644
index 0000000000..5d1ff37afe
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_col_before.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_after.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_after.gif
new file mode 100644
index 0000000000..c3aa15f93a
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_after.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_before.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_before.gif
new file mode 100644
index 0000000000..c3271e5493
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_insert_row_before.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_merge_cells.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_merge_cells.gif
new file mode 100644
index 0000000000..494887efdd
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_merge_cells.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_row_props.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_row_props.gif
new file mode 100644
index 0000000000..a53cdd8bf6
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_row_props.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/images/table_split_cells.gif b/source/web/scripts/tiny_mce/plugins/table/images/table_split_cells.gif
new file mode 100644
index 0000000000..b86179aebc
Binary files /dev/null and b/source/web/scripts/tiny_mce/plugins/table/images/table_split_cells.gif differ
diff --git a/source/web/scripts/tiny_mce/plugins/table/langs/en.js b/source/web/scripts/tiny_mce/plugins/table/langs/en.js
new file mode 100644
index 0000000000..3679a17df6
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/langs/en.js
@@ -0,0 +1,40 @@
+// UK lang variables
+
+tinyMCELang['lang_table_desc'] = 'Inserts a new table';
+tinyMCELang['lang_table_insert_row_before_desc'] = 'Insert row before';
+tinyMCELang['lang_table_insert_row_after_desc'] = 'Insert row after';
+tinyMCELang['lang_table_delete_row_desc'] = 'Delete row';
+tinyMCELang['lang_table_insert_col_before_desc'] = 'Insert column before';
+tinyMCELang['lang_table_insert_col_after_desc'] = 'Insert column after';
+tinyMCELang['lang_table_delete_col_desc'] = 'Remove col';
+tinyMCELang['lang_insert_table_title'] = 'Insert/Modify table';
+tinyMCELang['lang_insert_table_width'] = 'Width';
+tinyMCELang['lang_insert_table_height'] = 'Height';
+tinyMCELang['lang_insert_table_cols'] = 'Columns';
+tinyMCELang['lang_insert_table_rows'] = 'Rows';
+tinyMCELang['lang_insert_table_cellspacing'] = 'Cellspacing';
+tinyMCELang['lang_insert_table_cellpadding'] = 'Cellpadding';
+tinyMCELang['lang_insert_table_border'] = 'Border';
+tinyMCELang['lang_insert_table_align'] = 'Alignment';
+tinyMCELang['lang_insert_table_align_default'] = 'Default';
+tinyMCELang['lang_insert_table_align_left'] = 'Left';
+tinyMCELang['lang_insert_table_align_right'] = 'Right';
+tinyMCELang['lang_insert_table_align_middle'] = 'Center';
+tinyMCELang['lang_insert_table_class'] = 'Class';
+tinyMCELang['lang_table_row_title'] = 'Table row properties';
+tinyMCELang['lang_table_cell_title'] = 'Table cell properties';
+tinyMCELang['lang_table_row_desc'] = 'Table row properties';
+tinyMCELang['lang_table_cell_desc'] = 'Table cell properties';
+tinyMCELang['lang_insert_table_valign'] = 'Vertical alignment';
+tinyMCELang['lang_insert_table_align_top'] = 'Top';
+tinyMCELang['lang_insert_table_align_bottom'] = 'Bottom';
+tinyMCELang['lang_table_props_desc'] = 'Table properties';
+tinyMCELang['lang_table_bordercolor'] = 'Border color';
+tinyMCELang['lang_table_bgcolor'] = 'Bg color';
+tinyMCELang['lang_table_merge_cells_title'] = 'Merge table cells';
+tinyMCELang['lang_table_split_cells_desc'] = 'Split table cells';
+tinyMCELang['lang_table_merge_cells_desc'] = 'Merge table cells';
+tinyMCELang['lang_table_cut_row_desc'] = 'Cut table row';
+tinyMCELang['lang_table_copy_row_desc'] = 'Copy table row';
+tinyMCELang['lang_table_paste_row_before_desc'] = 'Paste table row before';
+tinyMCELang['lang_table_paste_row_after_desc'] = 'Paste table row after';
diff --git a/source/web/scripts/tiny_mce/plugins/table/merge_cells.htm b/source/web/scripts/tiny_mce/plugins/table/merge_cells.htm
new file mode 100644
index 0000000000..e104d2bb60
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/merge_cells.htm
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title>{$lang_table_merge_cells_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+// Disable auto resize
+tinyMCE.getWindowArg('mce_windowresize', false);
+
+function init() {
+	var formObj = document.forms[0];
+
+	formObj.numcols.value = tinyMCE.getWindowArg('numcols', 1);
+	formObj.numrows.value = tinyMCE.getWindowArg('numrows', 1);
+
+	// Autoresize and focus
+	TinyMCEPopup_autoResize();
+	window.focus();
+}
+
+function mergeCells() {
+	if (window.opener) {
+		var args = new Array();
+		var formObj = document.forms[0];
+
+		args["numcols"] = formObj.numcols.value;
+		args["numrows"] = formObj.numrows.value;
+
+		window.opener.tinyMCE.execCommand("mceTableMergeCells", false, args);
+		top.close();
+	}
+}
+
+function cancelAction() {
+	top.close();
+}
+</script>
+</head>
+<body onload="window.focus();init();" style="margin: 8px">
+<form onsubmit="insertTable();return false;">
+<fieldset>
+<legend>{$lang_table_merge_cells_title}</legend>
+  <table border="0" cellpadding="0" cellspacing="3" width="200">
+	  <tr>
+		<td>{$lang_insert_table_cols}:</td>
+		<td align="right"><input type="text" name="numcols" value="" style="width: 30px" /></td>
+		<td>
+	  </tr>
+	  <tr>
+		<td>{$lang_insert_table_rows}:</td>
+		<td align="right"><input type="text" name="numrows" value="" style="width: 30px" /></td>
+	  </tr>
+	  <tr>
+		<td><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="mergeCells();"></td>
+		<td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+	  </tr>
+  </table>
+</fieldset>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/plugins/table/readme.txt b/source/web/scripts/tiny_mce/plugins/table/readme.txt
new file mode 100644
index 0000000000..ff2741a099
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/readme.txt
@@ -0,0 +1,44 @@
+ Table plugin for TinyMCE
+------------------------------
+
+Installation instructions:
+  * Copy the table directory to the plugins directory of TinyMCE (/jscripts/tiny_mce/plugins).
+  * Add plugin to TinyMCE plugin option list example: plugins : "table".
+  * Add the table button name to button list, example: theme_advanced_buttons3_add_before : "tablecontrols".
+
+Initialization example:
+  tinyMCE.init({
+    theme : "advanced",
+    mode : "textareas",
+    plugins : "table",
+    theme_advanced_buttons3_add_before : "tablecontrols"
+  });
+
+Table controls:
+  tablecontrols               All table control below and some separators between them.
+  table                       Insert table control.
+  row_props                   Edit row properties (tr).
+  cell_props                  Edit cell properties (td).
+  delete_col                  Delete column control.
+  delete_row                  Delete row control.
+  col_after                   Column after control.
+  col_before                  Column before control.
+  row_after                   Row after control.
+  row_before                  Row before control.
+  row_after                   Row after control.
+  row_before                  Row before control.
+
+Table plugin commands:
+  mceInsertTable            Inserts a new table at cursor location the default size is 2x2.
+                            If the value parameter is specified it should contain a name/value array,
+                            this array has the following options cols, rows, border, cellspacing, cellpadding.
+                            The default border is set to: 0.
+  mceTableInsertRowBefore   Inserts a row before/above the current cursor location.
+  mceTableInsertRowAfter    Inserts a row after/under the current cursor location.
+  mceTableDeleteRow         Deletes the row at the current cursor location.
+  mceTableInsertColBefore   Inserts a column before the current cursor location.
+  mceTableInsertColAfter    Inserts a column after the current cursor location.
+  mceTableDeleteCol         Deletes the column at the current cursor location.
+
+Options:
+ table_color_fields         If set to true, tables dialogs will have color fields.
diff --git a/source/web/scripts/tiny_mce/plugins/table/row.htm b/source/web/scripts/tiny_mce/plugins/table/row.htm
new file mode 100644
index 0000000000..dd2b584e4f
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/row.htm
@@ -0,0 +1,131 @@
+<html>
+<head>
+<title>{$lang_table_row_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+// Disable auto resize
+tinyMCE.getWindowArg('mce_windowresize', false);
+
+function insertTable() {
+	if (window.opener) {
+		var args = new Array();
+
+		args["height"] = document.forms[0].height.value;
+		args["align"] = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+		args["valign"] = document.forms[0].valign.options[document.forms[0].valign.selectedIndex].value;
+		args["className"] = document.forms[0].styleSelect.options[document.forms[0].styleSelect.selectedIndex].value;
+		args["bordercolor"] = document.forms[0].bordercolor.value;
+		args["bgcolor"] = document.forms[0].bgcolor.value;
+
+		window.opener.tinyMCE.execCommand("mceTableRowProps", false, args);
+		top.close();
+	}
+}
+
+function init() {
+	if (tinyMCE.settings['table_color_fields']) {
+		document.getElementById('colors').style.display = tinyMCE.isMSIE ? 'block' : 'table-row';
+		TinyMCEPlugin_onLoad(); // Resize again
+	}
+
+	document.forms[0].bordercolor.value = tinyMCE.getWindowArg('bordercolor');
+	document.forms[0].bgcolor.value = tinyMCE.getWindowArg('bgcolor');
+
+	for (var i=0; i<document.forms[0].align.options.length; i++) {
+		if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
+			document.forms[0].align.options.selectedIndex = i;
+	}
+
+	for (var i=0; i<document.forms[0].valign.options.length; i++) {
+		if (document.forms[0].valign.options[i].value == tinyMCE.getWindowArg('valign'))
+			document.forms[0].valign.options.selectedIndex = i;
+	}
+
+	var className = tinyMCE.getWindowArg('className');
+	var styleSelectElm = document.forms[0].styleSelect;
+	var stylesAr = tinyMCE.getParam('theme_advanced_styles', false);
+	if (stylesAr) {
+		stylesAr = stylesAr.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			var key, value;
+
+			key = stylesAr[i].split('=')[0];
+			value = stylesAr[i].split('=')[1];
+
+			styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			if (value == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	} else {
+		var csses = tinyMCE.getCSSClasses(tinyMCE.getWindowArg('editor_id'));
+		for (var i=0; i<csses.length; i++) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(csses[i], csses[i]);
+			if (csses[i] == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	}
+
+	var formObj = document.forms[0];
+	formObj.height.value = tinyMCE.getWindowArg('height');
+
+	// Autoresize and focus
+	TinyMCEPopup_autoResize();
+	window.focus();
+}
+
+function cancelAction() {
+	top.close();
+}
+</script>
+</head>
+<body onload="window.focus();init();">
+<form onsubmit="insertTable();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="4" class="title">{$lang_table_row_title}</td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_align}:</td>
+            <td><select name="align">
+                <option value="">{$lang_insert_table_align_default}</option>
+                <option value="center">{$lang_insert_table_align_middle}</option>
+                <option value="left">{$lang_insert_table_align_left}</option>
+                <option value="right">{$lang_insert_table_align_right}</option>
+              </select></td>
+            <td>{$lang_insert_table_class}:</td>
+            <td><select name="styleSelect">
+                <option value="" selected="selected">-- {$lang_theme_style_select} --</option>
+            </select></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_valign}:</td>
+            <td><select name="valign">
+                <option value="">{$lang_insert_table_align_default}</option>
+                <option value="top">{$lang_insert_table_align_top}</option>
+                <option value="middle">{$lang_insert_table_align_middle}</option>
+                <option value="bottom">{$lang_insert_table_align_bottom}</option>
+            </select></td>
+            <td>{$lang_insert_table_height}: </td>
+            <td><input name="height" type="text" id="height" value="" size="4" maxlength="4" /></td>
+          </tr>
+          <tr id="colors" style="display: none">
+            <td>{$lang_table_bordercolor}:</td>
+            <td><input name="bordercolor" type="text" id="bordercolor" value=""	size="9" maxlength="7"></td>
+            <td>{$lang_table_bgcolor}:</td>
+            <td><input name="bgcolor" type="text" id="bgcolor" value=""	size="9" maxlength="7"></td>
+          </tr>
+          <tr>
+            <td><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="insertTable();"></td>
+            <td align="right">&nbsp;</td>
+            <td align="right">&nbsp;</td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/plugins/table/table.htm b/source/web/scripts/tiny_mce/plugins/table/table.htm
new file mode 100644
index 0000000000..373e409d6b
--- /dev/null
+++ b/source/web/scripts/tiny_mce/plugins/table/table.htm
@@ -0,0 +1,156 @@
+<html>
+<head>
+<title>{$lang_insert_table_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+// Disable auto resize
+tinyMCE.getWindowArg('mce_windowresize', false);
+
+function insertTable() {
+	if (window.opener) {
+		var args = new Array();
+
+		args["cols"] = document.forms[0].cols.value;
+		args["rows"] = document.forms[0].rows.value;
+		args["border"] = document.forms[0].border.value;
+		args["cellpadding"] = document.forms[0].cellpadding.value;
+		args["cellspacing"] = document.forms[0].cellspacing.value;
+		args["width"] = document.forms[0].width.value;
+		args["height"] = document.forms[0].height.value;
+		args["bordercolor"] =	document.forms[0].bordercolor.value;
+		args["bgcolor"] =	document.forms[0].bgcolor.value;
+		args["align"] = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+		args["className"] = document.forms[0].styleSelect.options[document.forms[0].styleSelect.selectedIndex].value;
+
+		window.opener.tinyMCE.execCommand("mceInsertTable", false, args);
+		top.close();
+	}
+}
+
+function init() {
+	if (tinyMCE.settings['table_color_fields']) {
+		document.getElementById('colors').style.display = tinyMCE.isMSIE ? 'block' : 'table-row';
+		TinyMCEPlugin_onLoad(); // Resize again
+	}
+
+	for (var i=0; i<document.forms[0].align.options.length; i++) {
+		if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
+			document.forms[0].align.options.selectedIndex = i;
+	}
+
+	var className = tinyMCE.getWindowArg('className');
+	var styleSelectElm = document.forms[0].styleSelect;
+	var stylesAr = tinyMCE.getParam('theme_advanced_styles', false);
+	if (stylesAr) {
+		stylesAr = stylesAr.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			var key, value;
+
+			key = stylesAr[i].split('=')[0];
+			value = stylesAr[i].split('=')[1];
+
+			styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			if (value == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	} else {
+		var csses = tinyMCE.getCSSClasses(tinyMCE.getWindowArg('editor_id'));
+		for (var i=0; i<csses.length; i++) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(csses[i], csses[i]);
+			if (csses[i] == className)
+				styleSelectElm.options.selectedIndex = styleSelectElm.options.length-1;
+		}
+	}
+
+	if (tinyMCE.getWindowArg('action') == "update") {
+		document.forms[0].cols.disabled = true;
+		document.forms[0].rows.disabled = true;
+	}
+
+	var formObj = document.forms[0];
+	formObj.cols.value = tinyMCE.getWindowArg('cols');
+	formObj.rows.value = tinyMCE.getWindowArg('rows');
+	formObj.border.value = tinyMCE.getWindowArg('border');
+	formObj.cellpadding.value = tinyMCE.getWindowArg('cellpadding');
+	formObj.cellspacing.value = tinyMCE.getWindowArg('cellspacing');
+	formObj.width.value = tinyMCE.getWindowArg('width');
+	formObj.height.value = tinyMCE.getWindowArg('height');
+	formObj.bordercolor.value = tinyMCE.getWindowArg('bordercolor');
+	formObj.bgcolor.value = tinyMCE.getWindowArg('bgcolor');
+	formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 
+
+	// Autoresize and focus
+	TinyMCEPopup_autoResize();
+	window.focus();
+}
+
+function cancelAction() {
+	top.close();
+}
+</script>
+</head>
+<body onload="window.focus();init();">
+<form onsubmit="insertTable();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="4" class="title">{$lang_insert_table_title}</td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_cols}:</td>
+            <td><input name="cols" type="text" id="cols" value="" size="3" maxlength="3"></td>
+            <td>{$lang_insert_table_rows}:</td>
+            <td><input name="rows" type="text" id="rows" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_cellpadding}:</td>
+            <td><input name="cellpadding" type="text" id="cellpadding" value="" size="3" maxlength="3"></td>
+            <td>{$lang_insert_table_cellspacing}:</td>
+            <td><input name="cellspacing" type="text" id="cellspacing" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_align}:</td>
+            <td><select name="align">
+                <option value="">{$lang_insert_table_align_default}</option>
+                <option value="center">{$lang_insert_table_align_middle}</option>
+                <option value="left">{$lang_insert_table_align_left}</option>
+                <option value="right">{$lang_insert_table_align_right}</option>
+              </select></td>
+            <td>{$lang_insert_table_border}:</td>
+            <td><input name="border" type="text" id="border" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_width}:</td>
+            <td><input name="width" type="text" id="width" value="" size="4" maxlength="4"></td>
+            <td>{$lang_insert_table_height}: </td>
+            <td><input name="height" type="text" id="height" value="" size="4" maxlength="4"></td>
+          </tr>
+          <tr id="colors" style="display: none">
+            <td>{$lang_table_bordercolor}:</td>
+            <td><input name="bordercolor" type="text" id="bordercolor" value=""	size="9" maxlength="7"></td>
+            <td>{$lang_table_bgcolor}:</td>
+            <td><input name="bgcolor" type="text" id="bgcolor" value=""	size="9" maxlength="7"></td>
+          </tr>
+          <tr>
+            <td>{$lang_insert_table_class}:</td>
+            <td>
+			 <select name="styleSelect">
+                <option value="" selected>-- {$lang_theme_style_select} --</option>
+             </select></td>
+            <td align="right">&nbsp;</td>
+            <td align="right">&nbsp;</td>
+          </tr>
+          <tr>
+            <td><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertTable();"></td>
+            <td align="right">&nbsp;</td>
+            <td align="right">&nbsp;</td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/anchor.htm b/source/web/scripts/tiny_mce/themes/advanced/anchor.htm
new file mode 100644
index 0000000000..0dfb892d91
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/anchor.htm
@@ -0,0 +1,52 @@
+<html>
+<head>
+<title>{$lang_insert_anchor_title}</title>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript">
+	// Disable auto resize
+	tinyMCE.getWindowArg('mce_windowresize', false);
+
+	function init() {
+		document.forms[0].anchorName.value = tinyMCE.getWindowArg('name');
+		document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true);
+
+		// Autoresize and focus
+		TinyMCEPopup_autoResize();
+		window.focus();
+	}
+
+	function insertAnchor() {
+		if (window.opener) {
+			tinyMCE.execInstanceCommand(tinyMCE.getWindowArg('editor_id'), 'mceAnchor', false, document.forms[0].anchorName.value);
+			top.close();
+		}
+	}
+
+	function cancelAction() {
+		top.close();
+	}
+</script>
+</head>
+<body onload="init();">
+<form onsubmit="insertAnchor();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="2" class="title">{$lang_insert_anchor_title}</td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_anchor_name}:</td>
+            <td><input name="anchorName" type="text" id="anchorName" value="" style="width: 200px"></td>
+          </tr>
+          <tr>
+            <td><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertAnchor();">
+            </td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/charmap.htm b/source/web/scripts/tiny_mce/themes/advanced/charmap.htm
new file mode 100644
index 0000000000..8e275f897d
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/charmap.htm
@@ -0,0 +1,380 @@
+<html>
+<head>
+<title>{$lang_theme_charmap_title}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+<!--
+	var charmap = new Array();
+
+	// for mor details please see w3c.org
+	// now here is the complete list ;)
+
+	charmap = [
+		['&nbsp;',    '&#160;',  true, 'no-break space'],
+		['&amp;',     '&#38;',   true, 'ampersand'],
+		['&quot;',    '&#34;',   true, 'quotation mark'],
+	// finance
+		['&cent;',    '&#162;',  true, 'cent sign'],
+		['&euro;',    '&#8364;', true, 'euro sign'],
+		['&pound;',   '&#163;',  true, 'pound sign'],
+		['&yen;',     '&#165;',  true, 'yen sign'],
+	// signs
+		['&copy;',    '&#169;',  true, 'copyright sign'],
+		['&reg;',     '&#174;',  true, 'registered sign'],
+		['&trade;',   '&#8482;', true, 'trade mark sign'],
+		['&permil;',  '&#8240;', true, 'per mille sign'],
+		['&micro;',   '&#181;',  true, 'micro sign'],
+		['&middot;',  '&#183;',  true, 'middle dot'],
+		['&bull;',    '&#8226;', true, 'bullet'],
+		['&hellip;',  '&#8230;', true, 'three dot leader'],
+		['&prime;',   '&#8242;', true, 'minutes / feet'],
+		['&Prime;',   '&#8243;', true, 'seconds / inches'],
+		['&sect;',    '&#167;',  true, 'section sign'],
+		['&para;',    '&#182;',  true, 'paragraph sign'],
+		['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
+	// quotations
+		['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
+		['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
+		['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
+		['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
+		['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
+		['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
+		['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
+		['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
+		['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
+		['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
+		['&lt;',      '&#60;',   true, 'less-than sign'],
+		['&gt;',      '&#62;',   true, 'greater-than sign'],
+		['&le;',      '&#8804;', true, 'less-than or equal to'],
+		['&ge;',      '&#8805;', true, 'greater-than or equal to'],
+		['&ndash;',   '&#8211;', true, 'en dash'],
+		['&mdash;',   '&#8212;', true, 'em dash'],
+		['&macr;',    '&#175;',  true, 'macron'],
+		['&oline;',   '&#8254;', true, 'overline'],
+		['&curren;',  '&#164;',  true, 'currency sign'],
+		['&brvbar;',  '&#166;',  true, 'broken bar'],
+		['&uml;',     '&#168;',  true, 'diaeresis'],
+		['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
+		['&iquest;',  '&#191;',  true, 'turned question mark'],
+		['&circ;',    '&#710;',  true, 'circumflex accent'],
+		['&tilde;',   '&#732;',  true, 'small tilde'],
+		['&deg;',     '&#176;',  true, 'degree sign'],
+		['&minus;',   '&#8722;', true, 'minus sign'],
+		['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
+		['&divide;',  '&#247;',  true, 'division sign'],
+		['&frasl;',   '&#8260;', true, 'fraction slash'],
+		['&times;',   '&#215;',  true, 'multiplication sign'],
+		['&sup1;',    '&#185;',  true, 'superscript one'],
+		['&sup2;',    '&#178;',  true, 'superscript two'],
+		['&sup3;',    '&#179;',  true, 'superscript three'],
+		['&frac14;',  '&#188;',  true, 'fraction one quarter'],
+		['&frac12;',  '&#189;',  true, 'fraction one half'],
+		['&frac34;',  '&#190;',  true, 'fraction three quarters'],
+	// math / logical
+		['&fnof;',    '&#402;',  true, 'function / florin'],
+		['&int;',     '&#8747;', true, 'integral'],
+		['&sum;',     '&#8721;', true, 'n-ary sumation'],
+		['&infin;',   '&#8734;', true, 'infinity'],
+		['&radic;',   '&#8730;', true, 'square root'],
+		['&sim;',     '&#8764;', false,'similar to'],
+		['&cong;',    '&#8773;', false,'approximately equal to'],
+		['&asymp;',   '&#8776;', true, 'almost equal to'],
+		['&ne;',      '&#8800;', true, 'not equal to'],
+		['&equiv;',   '&#8801;', true, 'identical to'],
+		['&isin;',    '&#8712;', false,'element of'],
+		['&notin;',   '&#8713;', false,'not an element of'],
+		['&ni;',      '&#8715;', false,'contains as member'],
+		['&prod;',    '&#8719;', true, 'n-ary product'],
+		['&and;',     '&#8743;', false,'logical and'],
+		['&or;',      '&#8744;', false,'logical or'],
+		['&not;',     '&#172;',  true, 'not sign'],
+		['&cap;',     '&#8745;', true, 'intersection'],
+		['&cup;',     '&#8746;', false,'union'],
+		['&part;',    '&#8706;', true, 'partial differential'],
+		['&forall;',  '&#8704;', false,'for all'],
+		['&exist;',   '&#8707;', false,'there exists'],
+		['&empty;',   '&#8709;', false,'diameter'],
+		['&nabla;',   '&#8711;', false,'backward difference'],
+		['&lowast;',  '&#8727;', false,'asterisk operator'],
+		['&prop;',    '&#8733;', false,'proportional to'],
+		['&ang;',     '&#8736;', false,'angle'],
+	// undefined
+		['&acute;',   '&#180;',  true, 'acute accent'],
+		['&cedil;',   '&#184;',  true, 'cedilla'],
+		['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
+		['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
+		['&dagger;',  '&#8224;', true, 'dagger'],
+		['&Dagger;',  '&#8225;', true, 'double dagger'],
+	// alphabetical special chars
+		['&Agrave;',  '&#192;',  true, 'A - grave'],
+		['&Aacute;',  '&#193;',  true, 'A - acute'],
+		['&Acirc;',   '&#194;',  true, 'A - circumflex'],
+		['&Atilde;',  '&#195;',  true, 'A - tilde'],
+		['&Auml;',    '&#196;',  true, 'A - diaeresis'],
+		['&Aring;',   '&#197;',  true, 'A - ring above'],
+		['&AElig;',   '&#198;',  true, 'ligature AE'],
+		['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
+		['&Egrave;',  '&#200;',  true, 'E - grave'],
+		['&Eacute;',  '&#201;',  true, 'E - acute'],
+		['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
+		['&Euml;',    '&#203;',  true, 'E - diaeresis'],
+		['&Igrave;',  '&#204;',  true, 'I - grave'],
+		['&Iacute;',  '&#205;',  true, 'I - acute'],
+		['&Icirc;',   '&#206;',  true, 'I - circumflex'],
+		['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
+		['&ETH;',     '&#208;',  true, 'ETH'],
+		['&Ntilde;',  '&#209;',  true, 'N - tilde'],
+		['&Ograve;',  '&#210;',  true, 'O - grave'],
+		['&Oacute;',  '&#211;',  true, 'O - acute'],
+		['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
+		['&Otilde;',  '&#213;',  true, 'O - tilde'],
+		['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
+		['&Oslash;',  '&#216;',  true, 'O - slash'],
+		['&OElig;',   '&#338;',  true, 'ligature OE'],
+		['&Scaron;',  '&#352;',  true, 'S - caron'],
+		['&Ugrave;',  '&#217;',  true, 'U - grave'],
+		['&Uacute;',  '&#218;',  true, 'U - acute'],
+		['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
+		['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
+		['&Yacute;',  '&#221;',  true, 'Y - acute'],
+		['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
+		['&THORN;',   '&#222;',  true, 'THORN'],
+		['&agrave;',  '&#224;',  true, 'a - grave'],
+		['&aacute;',  '&#225;',  true, 'a - acute'],
+		['&acirc;',   '&#226;',  true, 'a - circumflex'],
+		['&atilde;',  '&#227;',  true, 'a - tilde'],
+		['&auml;',    '&#228;',  true, 'a - diaeresis'],
+		['&aring;',   '&#229;',  true, 'a - ring above'],
+		['&aelig;',   '&#230;',  true, 'ligature ae'],
+		['&ccedil;',  '&#231;',  true, 'c - cedilla'],
+		['&egrave;',  '&#232;',  true, 'e - grave'],
+		['&eacute;',  '&#233;',  true, 'e - acute'],
+		['&ecirc;',   '&#234;',  true, 'e - circumflex'],
+		['&euml;',    '&#235;',  true, 'e - diaeresis'],
+		['&igrave;',  '&#236;',  true, 'i - grave'],
+		['&iacute;',  '&#237;',  true, 'i - acute'],
+		['&icirc;',   '&#238;',  true, 'i - circumflex'],
+		['&iuml;',    '&#239;',  true, 'i - diaeresis'],
+		['&eth;',     '&#240;',  true, 'eth'],
+		['&ntilde;',  '&#241;',  true, 'n - tilde'],
+		['&ograve;',  '&#242;',  true, 'o - grave'],
+		['&oacute;',  '&#243;',  true, 'o - acute'],
+		['&ocirc;',   '&#244;',  true, 'o - circumflex'],
+		['&otilde;',  '&#245;',  true, 'o - tilde'],
+		['&ouml;',    '&#246;',  true, 'o - diaeresis'],
+		['&oslash;',  '&#248;',  true, 'o slash'],
+		['&oelig;',   '&#339;',  true, 'ligature oe'],
+		['&scaron;',  '&#353;',  true, 's - caron'],
+		['&ugrave;',  '&#249;',  true, 'u - grave'],
+		['&uacute;',  '&#250;',  true, 'u - acute'],
+		['&ucirc;',   '&#251;',  true, 'u - circumflex'],
+		['&uuml;',    '&#252;',  true, 'u - diaeresis'],
+		['&yacute;',  '&#253;',  true, 'y - acute'],
+		['&thorn;',   '&#254;',  true, 'thorn'],
+		['&yuml;',    '&#255;',  true, 'y - diaeresis'],
+	// ['&Alpha;',   '&#913;',  true, 'Alpha'],
+		['&Beta;',    '&#914;',  true, 'Beta'],
+		['&Gamma;',   '&#915;',  true, 'Gamma'],
+		['&Delta;',   '&#916;',  true, 'Delta'],
+		['&Epsilon;', '&#917;',  true, 'Epsilon'],
+		['&Zeta;',    '&#918;',  true, 'Zeta'],
+		['&Eta;',     '&#919;',  true, 'Eta'],
+		['&Theta;',   '&#920;',  true, 'Theta'],
+		['&Iota;',    '&#921;',  true, 'Iota'],
+		['&Kappa;',   '&#922;',  true, 'Kappa'],
+		['&Lambda;',  '&#923;',  true, 'Lambda'],
+		['&Mu;',      '&#924;',  true, 'Mu'],
+		['&Nu;',      '&#925;',  true, 'Nu'],
+		['&Xi;',      '&#926;',  true, 'Xi'],
+		['&Omicron;', '&#927;',  true, 'Omicron'],
+		['&Pi;',      '&#928;',  true, 'Pi'],
+		['&Rho;',     '&#929;',  true, 'Rho'],
+		['&Sigma;',   '&#931;',  true, 'Sigma'],
+		['&Tau;',     '&#932;',  true, 'Tau'],
+		['&Upsilon;', '&#933;',  true, 'Upsilon'],
+		['&Phi;',     '&#934;',  true, 'Phi'],
+		['&Chi;',     '&#935;',  true, 'Chi'],
+		['&Psi;',     '&#936;',  true, 'Psi'],
+		['&Omega;',   '&#937;',  true, 'Omega'],
+		['&alpha;',   '&#945;',  true, 'alpha'],
+		['&beta;',    '&#946;',  true, 'beta'],
+		['&gamma;',   '&#947;',  true, 'gamma'],
+		['&delta;',   '&#948;',  true, 'delta'],
+		['&epsilon;', '&#949;',  true, 'epsilon'],
+		['&zeta;',    '&#950;',  true, 'zeta'],
+		['&eta;',     '&#951;',  true, 'eta'],
+		['&theta;',   '&#952;',  true, 'theta'],
+		['&iota;',    '&#953;',  true, 'iota'],
+		['&kappa;',   '&#954;',  true, 'kappa'],
+		['&lambda;',  '&#955;',  true, 'lambda'],
+		['&mu;',      '&#956;',  true, 'mu'],
+		['&nu;',      '&#957;',  true, 'nu'],
+		['&xi;',      '&#958;',  true, 'xi'],
+		['&omicron;', '&#959;',  true, 'omicron'],
+		['&pi;',      '&#960;',  true, 'pi'],
+		['&rho;',     '&#961;',  true, 'rho'],
+		['&sigmaf;',  '&#962;',  true, 'final sigma'],
+		['&sigma;',   '&#963;',  true, 'sigma'],
+		['&tau;',     '&#964;',  true, 'tau'],
+		['&upsilon;', '&#965;',  true, 'upsilon'],
+		['&phi;',     '&#966;',  true, 'phi'],
+		['&chi;',     '&#967;',  true, 'chi'],
+		['&psi;',     '&#968;',  true, 'psi'],
+		['&omega;',   '&#969;',  true, 'omega'],
+	// symbols
+		['&alefsym;', '&#8501;', false,'alef symbol'],
+		['&piv;',     '&#982;',  false,'pi symbol'],
+		['&real;',    '&#8476;', false,'real part symbol'],
+		['&thetasym;','&#977;',  false,'theta symbol'],
+		['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
+		['&weierp;',  '&#8472;', false,'Weierstrass p'],
+		['&image;',   '&#8465;', false,'imaginary part'],
+	// arrows
+		['&larr;',    '&#8592;', true, 'leftwards arrow'],
+		['&uarr;',    '&#8593;', true, 'upwards arrow'],
+		['&rarr;',    '&#8594;', true, 'rightwards arrow'],
+		['&darr;',    '&#8595;', true, 'downwards arrow'],
+		['&harr;',    '&#8596;', true, 'left right arrow'],
+		['&crarr;',   '&#8629;', false,'carriage return'],
+		['&lArr;',    '&#8656;', false,'leftwards double arrow'],
+		['&uArr;',    '&#8657;', false,'upwards double arrow'],
+		['&rArr;',    '&#8658;', false,'rightwards double arrow'],
+		['&dArr;',    '&#8659;', false,'downwards double arrow'],
+		['&hArr;',    '&#8660;', false,'left right double arrow'],
+		['&there4;',  '&#8756;', false,'therefore'],
+		['&sub;',     '&#8834;', false,'subset of'],
+		['&sup;',     '&#8835;', false,'superset of'],
+		['&nsub;',    '&#8836;', false,'not a subset of'],
+		['&sube;',    '&#8838;', false,'subset of or equal to'],
+		['&supe;',    '&#8839;', false,'superset of or equal to'],
+		['&oplus;',   '&#8853;', false,'circled plus'],
+		['&otimes;',  '&#8855;', false,'circled times'],
+		['&perp;',    '&#8869;', false,'perpendicular'],
+		['&sdot;',    '&#8901;', false,'dot operator'],
+		['&lceil;',   '&#8968;', false,'left ceiling'],
+		['&rceil;',   '&#8969;', false,'right ceiling'],
+		['&lfloor;',  '&#8970;', false,'left floor'],
+		['&rfloor;',  '&#8971;', false,'right floor'],
+		['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
+		['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
+		['&loz;',     '&#9674;', true,'lozenge'],
+		['&spades;',  '&#9824;', false,'black spade suit'],
+		['&clubs;',   '&#9827;', true, 'black club suit'],
+		['&hearts;',  '&#9829;', true, 'black heart suit'],
+		['&diams;',   '&#9830;', true, 'black diamond suit'],
+		['&ensp;',    '&#8194;', false,'en space'],
+		['&emsp;',    '&#8195;', false,'em space'],
+		['&thinsp;',  '&#8201;', false,'thin space'],
+		['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
+		['&zwj;',     '&#8205;', false,'zero width joiner'],
+		['&lrm;',     '&#8206;', false,'left-to-right mark'],
+		['&rlm;',     '&#8207;', false,'right-to-left mark'],
+		['&shy;',     '&#173;',  false,'soft hyphen']
+	];
+
+    function renderCharMapHTML() {
+        var charsPerRow = 20, tdWidth=20, tdHeight=20;
+        var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+        var cols=-1;
+        for (var i=0; i<charmap.length; i++) {
+            if (charmap[i][2]==true) {
+                cols++;
+                html += ''
+                    + '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap"'
+                    + ' onmouseover="tinyMCE.switchClass(this,\'charmapOver\');'
+                    + 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');"'
+                    + ' onmouseout="tinyMCE.restoreClass(this,\'charmapOver\');"'
+                    + ' onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');return false;"'
+                    + ' title="' + charmap[i][3] + '" nowrap="nowrap">'
+                    + charmap[i][1]
+                    + '</td>';
+                if ((cols+1) % charsPerRow == 0)
+                    html += '</tr><tr height="' + tdHeight + '">';
+            }
+         }
+        if (cols % charsPerRow > 0) {
+            var padd = charsPerRow - (cols % charsPerRow);
+            for (var i=0; i<padd-1; i++)
+                html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+        }
+        html += '</tr></table>';
+        document.write(html);
+    }
+
+    function insertChar(chr) {
+        tinyMCE.execInstanceCommand(tinyMCE.getWindowArg('editor_id'), 'mceInsertContent', false, '\&#' + chr + ';');
+        //window.close();
+        self.focus();
+    }
+
+    function previewChar(codeA, codeB, codeN) {
+        var elmA = document.getElementById('codeA');
+        var elmB = document.getElementById('codeB');
+        var elmV = document.getElementById('codeV');
+        var elmN = document.getElementById('codeN');
+
+        if (codeA=='#160;') {
+            elmV.innerHTML = '__';
+        } else {
+            elmV.innerHTML = '&' + codeA;
+        }
+
+        elmB.innerHTML = '&amp;' + codeA;
+        elmA.innerHTML = '&amp;' + codeB;
+        elmN.innerHTML = codeN;
+    }
+
+    window.focus();
+//-->
+</script>
+</head>
+<body>
+<table align="center" border="0" cellspacing="0" cellpadding="2">
+    <tr>
+        <td colspan="2" class="title">{$lang_theme_charmap_title}</td>
+    </tr>
+    <tr>
+        <td rowspan="2" align="left" valign="top">
+            <script language="javascript" type="text/javascript">
+            <!--
+                renderCharMapHTML();
+            //-->
+            </script>
+        </td>
+        <td width="100" align="center" valign="top">
+            <table border="0" cellpadding="0" cellspacing="0" width="100" height="100">
+                <tr>
+                    <td class="charmapOver" style="font-size: 40px; height:80px;" id="codeV">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 10px; font-family: Arial, Helvetica, sans-serif; text-align:center;" id="codeN">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td valign="bottom" style="padding-bottom: 3px;">
+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 1px;">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/color_picker.htm b/source/web/scripts/tiny_mce/themes/advanced/color_picker.htm
new file mode 100644
index 0000000000..c9e0cb5bcf
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/color_picker.htm
@@ -0,0 +1,272 @@
+<html>
+<head>
+<title>{$lang_theme_colorpicker_title}</title>
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+<!--
+    function selectColor() {
+        var color = document.getElementById("selectedColorBox").value;
+        if (window.opener)
+            window.opener.tinyMCE.execInstanceCommand(tinyMCE.getWindowArg('editor_id'),tinyMCE.getWindowArg('command'),false,color);
+        window.close();
+    }
+    function showColor(color) {
+        document.getElementById("selectedColor").style.backgroundColor = color;
+        document.getElementById("selectedColorBox").value = color;
+    }
+
+    window.focus();
+
+    var colorPicker = "";
+    var colors = new Array(
+        "#000000",
+        "#000033",
+        "#000066",
+        "#000099",
+        "#0000cc",
+        "#0000ff",
+        "#330000",
+        "#330033",
+        "#330066",
+        "#330099",
+        "#3300cc",
+        "#3300ff",
+        "#660000",
+        "#660033",
+        "#660066",
+        "#660099",
+        "#6600cc",
+        "#6600ff",
+        "#990000",
+        "#990033",
+        "#990066",
+        "#990099",
+        "#9900cc",
+        "#9900ff",
+        "#cc0000",
+        "#cc0033",
+        "#cc0066",
+        "#cc0099",
+        "#cc00cc",
+        "#cc00ff",
+        "#ff0000",
+        "#ff0033",
+        "#ff0066",
+        "#ff0099",
+        "#ff00cc",
+        "#ff00ff",
+        "#003300",
+        "#003333",
+        "#003366",
+        "#003399",
+        "#0033cc",
+        "#0033ff",
+        "#333300",
+        "#333333",
+        "#333366",
+        "#333399",
+        "#3333cc",
+        "#3333ff",
+        "#663300",
+        "#663333",
+        "#663366",
+        "#663399",
+        "#6633cc",
+        "#6633ff",
+        "#993300",
+        "#993333",
+        "#993366",
+        "#993399",
+        "#9933cc",
+        "#9933ff",
+        "#cc3300",
+        "#cc3333",
+        "#cc3366",
+        "#cc3399",
+        "#cc33cc",
+        "#cc33ff",
+        "#ff3300",
+        "#ff3333",
+        "#ff3366",
+        "#ff3399",
+        "#ff33cc",
+        "#ff33ff",
+        "#006600",
+        "#006633",
+        "#006666",
+        "#006699",
+        "#0066cc",
+        "#0066ff",
+        "#336600",
+        "#336633",
+        "#336666",
+        "#336699",
+        "#3366cc",
+        "#3366ff",
+        "#666600",
+        "#666633",
+        "#666666",
+        "#666699",
+        "#6666cc",
+        "#6666ff",
+        "#996600",
+        "#996633",
+        "#996666",
+        "#996699",
+        "#9966cc",
+        "#9966ff",
+        "#cc6600",
+        "#cc6633",
+        "#cc6666",
+        "#cc6699",
+        "#cc66cc",
+        "#cc66ff",
+        "#ff6600",
+        "#ff6633",
+        "#ff6666",
+        "#ff6699",
+        "#ff66cc",
+        "#ff66ff",
+        "#009900",
+        "#009933",
+        "#009966",
+        "#009999",
+        "#0099cc",
+        "#0099ff",
+        "#339900",
+        "#339933",
+        "#339966",
+        "#339999",
+        "#3399cc",
+        "#3399ff",
+        "#669900",
+        "#669933",
+        "#669966",
+        "#669999",
+        "#6699cc",
+        "#6699ff",
+        "#999900",
+        "#999933",
+        "#999966",
+        "#999999",
+        "#9999cc",
+        "#9999ff",
+        "#cc9900",
+        "#cc9933",
+        "#cc9966",
+        "#cc9999",
+        "#cc99cc",
+        "#cc99ff",
+        "#ff9900",
+        "#ff9933",
+        "#ff9966",
+        "#ff9999",
+        "#ff99cc",
+        "#ff99ff",
+        "#00cc00",
+        "#00cc33",
+        "#00cc66",
+        "#00cc99",
+        "#00cccc",
+        "#00ccff",
+        "#33cc00",
+        "#33cc33",
+        "#33cc66",
+        "#33cc99",
+        "#33cccc",
+        "#33ccff",
+        "#66cc00",
+        "#66cc33",
+        "#66cc66",
+        "#66cc99",
+        "#66cccc",
+        "#66ccff",
+        "#99cc00",
+        "#99cc33",
+        "#99cc66",
+        "#99cc99",
+        "#99cccc",
+        "#99ccff",
+        "#cccc00",
+        "#cccc33",
+        "#cccc66",
+        "#cccc99",
+        "#cccccc",
+        "#ccccff",
+        "#ffcc00",
+        "#ffcc33",
+        "#ffcc66",
+        "#ffcc99",
+        "#ffcccc",
+        "#ffccff",
+        "#00ff00",
+        "#00ff33",
+        "#00ff66",
+        "#00ff99",
+        "#00ffcc",
+        "#00ffff",
+        "#33ff00",
+        "#33ff33",
+        "#33ff66",
+        "#33ff99",
+        "#33ffcc",
+        "#33ffff",
+        "#66ff00",
+        "#66ff33",
+        "#66ff66",
+        "#66ff99",
+        "#66ffcc",
+        "#66ffff",
+        "#99ff00",
+        "#99ff33",
+        "#99ff66",
+        "#99ff99",
+        "#99ffcc",
+        "#99ffff",
+        "#ccff00",
+        "#ccff33",
+        "#ccff66",
+        "#ccff99",
+        "#ccffcc",
+        "#ccffff",
+        "#ffff00",
+        "#ffff33",
+        "#ffff66",
+        "#ffff99",
+        "#ffffcc",
+        "#ffffff"
+    );
+
+    colorPicker += '<table border="0" cellspacing="1" cellpadding="0">'
+        + '<tr>';
+    for (var i=0; i<colors.length; i++) {
+        colorPicker += '<td bgcolor="' + colors[i] + '">'
+            + '<a href="#top" onclick="selectColor();return false;" onmouseover="showColor(\'' + colors[i] +  '\');">'
+            + '<img border="0" src="images/spacer.gif" width="10" height="10" /></a></td>';
+        if ((i+1) % 18 == 0)
+            colorPicker += '</tr><tr>';
+    }
+    colorPicker += '<tr><td colspan="18">'
+        + '<table width="100%" border="0" cellspacing="0" cellpadding="0">'
+        + '<tr><td>'
+        + '<img id="selectedColor" style="background-color:' + tinyMCE.getWindowArg('input_color') + '" border="0" src="images/spacer.gif" width="80" height="16" />'
+        + '</td><td align="right">'
+        + '<input id="selectedColorBox" name="selectedColorBox" type="text" size="7" maxlength="7" style="width:65px" value="' + tinyMCE.getWindowArg('input_color') + '" />'
+        + '</td></tr>'
+        + '</table>'
+        + '<input type="button" id="insert" name="insert" value="{$lang_theme_colorpicker_apply}" style="margin-top:3px" onclick="selectColor();">'
+        + '</td></tr>'
+        + '</table>';
+//-->
+</script>
+</head>
+<body marginheight="3" topmargin="3" leftmargin="3" marginwidth="3">
+<div align="center">
+    <script language="javascript" type="text/javascript">
+    <!--
+        document.write(colorPicker);
+    //-->
+    </script>
+</div>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/about.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/about.htm
new file mode 100644
index 0000000000..984a990288
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/about.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>About TinyMCE</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">About TinyMCE</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+TinyMCE is a small WYSIWYG editor control for web browsers such as MSIE or Mozilla 
+that enables you to edit HTML contents in a more user friendly way. It has common 
+features that are found in most word processors and should not be difficult to 
+use.<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm
new file mode 100644
index 0000000000..c63d7dc435
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/common_buttons.htm
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Common buttons</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Common buttons</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+Below is a short description about each button.<img src="../../images/spacer.gif" width="1" height="1"> 
+<br>
+<br>
+<table border="1" cellpadding="3" cellspacing="0">
+  <tr>
+    <td><img src="../../images/bold.gif" width="20" height="20"></td>
+    <td>Bold text style.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/italic.gif" width="20" height="20"></td>
+    <td>Italic text style.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/underline.gif" width="20" height="20"></td>
+    <td>Underline text style.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/strikethrough.gif" width="20" height="20"></td>
+    <td>Strikethrough text style.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/left.gif" width="20" height="20"></td>
+    <td>Align left.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/center.gif" width="20" height="20"></td>
+    <td>Align center.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/right.gif" width="20" height="20"></td>
+    <td>Align right.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/full.gif" width="20" height="20"></td>
+    <td>Align full.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/bullist.gif" width="20" height="20"></td>
+    <td>Unordered list/bullet list.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/numlist.gif" width="20" height="20"></td>
+    <td>Ordered list/numbered list</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/outdent.gif" width="20" height="20"></td>
+    <td>Outdent/decrease indentation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/indent.gif" width="20" height="20"></td>
+    <td>Indent/incread indentation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/undo.gif" width="20" height="20"></td>
+    <td>Undo the last operation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/redo.gif" width="20" height="20"></td>
+    <td>Redo the last operation.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/link.gif" width="20" height="20"></td>
+    <td>Insert a new link, read more about this function in the <a href="insert_link_button.htm">Insert 
+      link section</a>.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/unlink.gif" width="20" height="20"></td>
+    <td>Unlinks the current selection/removes all selected links.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/anchor.gif" width="20" height="20"></td>
+    <td>Insert a new anchor, read more about this function in the <a href="insert_anchor_button.htm">Insert anchor section.</a></td>
+  </tr>
+  <tr>
+    <td><img src="../../images/image.gif" width="20" height="20"></td>
+    <td>Insert a new image, read more about this function in the <a href="insert_image_button.htm">Insert 
+      image section</a>.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/cleanup.gif" width="20" height="20"></td>
+    <td>Cleanup code/Removes unwanted formating. This function is useful when 
+      you copy contents from for example a office product.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/help.gif" width="20" height="20"></td>
+    <td>Shows this help window.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/code.gif" width="20" height="20"></td>
+    <td>Opens HTML source code editor. </td>
+  </tr>
+  <tr>
+    <td><img src="../images/table.gif" width="20" height="20"></td>
+    <td>Inserts a new 2x2 table at the current location. </td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_insert_row_before.gif" width="20" height="20"></td>
+    <td>Adds a row above the current one. </td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_insert_row_after.gif" width="20" height="20"></td>
+    <td>Adds a row under the current one. </td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_delete_row.gif" width="20" height="20"></td>
+    <td>Removes the row. </td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_insert_col_before.gif" width="20" height="20"></td>
+    <td>Adds a column before the current one.</td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_insert_col_after.gif" width="20" height="20"></td>
+    <td>Adds a column after the current one.</td>
+  </tr>
+  <tr>
+    <td><img src="../images/table_delete_col.gif" width="20" height="20"></td>
+    <td>Removes the current  column.</td>
+  </tr>
+  <tr>
+    <td><img src="../../images/hr.gif" width="20" height="20"></td>
+    <td>Inserts a new horizontal ruler </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/removeformat.gif" width="20" height="20"></td>
+    <td>Removes formatting from the selection. </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/sub.gif" width="20" height="20"></td>
+    <td>Makes the selection to be subscript. </td>
+  </tr>
+  <tr>
+    <td><img src="../../images/sup.gif" width="20" height="20"></td>
+    <td>Makes the selection to be superscripted. </td>
+  </tr>
+</table>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif
new file mode 100644
index 0000000000..5b5f528dd5
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif
new file mode 100644
index 0000000000..cdc617eab3
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif
new file mode 100644
index 0000000000..7bad7583ab
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif
new file mode 100644
index 0000000000..6a032c5ae8
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/index.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/index.htm
new file mode 100644
index 0000000000..0b0526af00
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/index.htm
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Help Index</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+<BODY onload="window.focus();">
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Table of contents</span></td>
+    <td align="right">&nbsp;</td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+Click the links below to go to the different help sections. 
+<ul class="toc_ul">
+  <li class="toc_li"><a href="about.htm">About TinyMCE</a></li>
+  <li class="toc_li"><a href="common_buttons.htm">Common buttons</a></li>
+  <li class="toc_li"><a href="insert_image_button.htm">Insert image button</a></li>
+  <li class="toc_li"><a href="insert_link_button.htm">Insert link button</a></li>
+  <li class="toc_li"><a href="insert_anchor_button.htm">Insert anchor button</a></li>
+  <li class="toc_li"><a href="insert_table_button.htm">Insert table button</a></li>
+</ul>
+<hr noshade>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm
new file mode 100644
index 0000000000..e1118a289d
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Insert anchor button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert anchor button</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+This button opens a new window with the insert/edit anchor function.<br>
+<br>
+<img src="images/insert_anchor_window.gif" width="330" height="139"><br>
+<br>
+There are one field in this window, this is where you enter the name of you anchor point. Remember the anchor name needs to be unique. <br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm
new file mode 100644
index 0000000000..e101fff851
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_image_button.htm
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Insert image button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert image button</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+The insert image button opens the window shown below.<br>
+<br>
+<img src="images/insert_image_window.gif"><br>
+<br>
+You simply enter a URL to the image you want to link to and enter a image description, 
+this is then displayed as an alternative text descripton of the image on the page.<br>
+<br>
+<strong>Field descriptions:</strong><br>
+<table border="1" cellspacing="0">
+  <tr>
+    <td width="150"><strong>Image URL </strong></td>
+    <td>URL/path to the image.</td>
+  </tr>
+  <tr>
+    <td width="150"><strong>Image description </strong></td>
+    <td>Alternative description of image contents.</td>
+  </tr>
+  <tr>
+    <td><strong>Dimentions</strong></td>
+    <td>Image width/height. </td>
+  </tr>
+  <tr>
+    <td><strong>Alignment</strong></td>
+    <td>Image alignment, useful when wrapping text around images.</td>
+  </tr>
+  <tr>
+    <td><strong>Border</strong></td>
+    <td>Border thickness. </td>
+  </tr>
+  <tr>
+    <td><strong>VSpace</strong></td>
+    <td>Vertical space, useful when wrapping text around images.</td>
+  </tr>
+  <tr>
+    <td><strong>HSpace</strong></td>
+    <td>Horizontal space, useful when wrapping text around images.</td>
+  </tr>
+</table>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm
new file mode 100644
index 0000000000..ddfeb3af09
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_link_button.htm
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Insert link button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert link button</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+This button opens a new window with the insert/edit link function.<br>
+<br>
+<img src="images/insert_link_window.gif" width="330" height="159"><br>
+<br>
+There are two fields in this window the first one &quot;Link URL&quot; is the 
+URL of the link. The target enables you to select how the link is to be opened.<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm
new file mode 100644
index 0000000000..d3bd196ed9
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/insert_table_button.htm
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Insert table button</TITLE>
+<link href="style.css" rel="stylesheet" type="text/css">
+</HEAD>
+
+<BODY>
+
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pageheader">
+  <tr> 
+    <td><span class="title">Insert table button</span></td>
+    <td align="right"><a href="index.htm">TOC</a></td>
+  </tr>
+</table>
+<hr noshade>
+<br>
+The insert table button opens the window shown below. This action enables you to create tables. <br>
+<br>
+<img src="images/insert_table_window.gif" width="340" height="229"><br>
+<br>
+<strong>Field descriptions:</strong><br>
+<table border="1" cellspacing="0">
+  <tr>
+    <td width="150"><strong>Columns</strong></td>
+    <td>Number of columns in the  table. </td>
+  </tr>
+  <tr>
+    <td width="150"><strong>Rows</strong></td>
+    <td>Number of rows in the new table.</td>
+  </tr>
+  <tr>
+    <td><strong>Cellpadding</strong></td>
+    <td>Cellpadding of the table . </td>
+  </tr>
+  <tr>
+    <td><strong>Cellspacing</strong></td>
+    <td>Cellspacing of the table .</td>
+  </tr>
+  <tr>
+    <td><strong>Alignment</strong></td>
+    <td>Table alignment . </td>
+  </tr>
+  <tr>
+    <td><strong>Border</strong></td>
+    <td>Border thinkness of table.</td>
+  </tr>
+  <tr>
+    <td><strong>Width</strong></td>
+    <td>Width in pixels of table .</td>
+  </tr>
+  <tr>
+    <td><strong>Height</strong></td>
+    <td>Height in pixels of table.</td>
+  </tr>
+  <tr>
+    <td><strong>Class</strong></td>
+    <td>Style or CSS class of table.</td>
+  </tr>
+</table>
+<br>
+<br>
+<hr noshade>
+<table width="100%" border="0" cellpadding="1" cellspacing="3" class="pagefooter">
+  <tr> 
+    <td>Go to: <a href="index.htm">Table of contents</a></td>
+    <td align="right"><a href="#">Top</a></td>
+  </tr>
+</table>
+<br>
+</BODY>
+</HTML>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/docs/en/style.css b/source/web/scripts/tiny_mce/themes/advanced/docs/en/style.css
new file mode 100644
index 0000000000..722f537a1e
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/docs/en/style.css
@@ -0,0 +1,28 @@
+body { background-color: #FFFFFF; }
+body, td, .content { font-family: Verdana, Arial, helvetica, sans-serif; font-size: 12px; }
+.title { font-family: Verdana, Arial, helvetica, sans-serif; font-size: 16px; font-weight: bold; }
+.subtitle { font-size: 12px; font-weight: bold; }
+
+.toc_ul, .toc_li { margin-left: 8 px; line-height: 16px; }
+.step_ol, .step_li { margin-left: 11 px; line-height: 16px; }
+img { border: #000000 solid 1px; }
+
+a:visited { color: #666666; text-decoration: underline; }
+a:active { color: #666666; text-decoration: underline; }
+a:hover { color: #666666; text-decoration: underline; }
+a { color: #666666; text-decoration: underline; }
+
+.pageheader { border: #E0E0E0 solid 1px; }
+.pagefooter { border: #E0E0E0 solid 1px; }
+.sample { background-color: #FFFFFF; border: #000000 solid 1px; }
+.samplecontent { font-size: 10px; }
+
+.code { background-color: #FFFFFF; border: #000000 solid 1px; }
+.codecontent { font-size: 10px; }
+.codecontent a:visited { color: #666666; text-decoration: none; font-weight: bold }
+.codecontent a:active { color: #666666; text-decoration: none; font-weight: bold  }
+.codecontent a:hover { color: #666666; text-decoration: none; font-weight: bold  }
+.codecontent a { color: #666666; text-decoration: none; font-weight: bold  }
+
+hr { height: 1px; }
+
diff --git a/source/web/scripts/tiny_mce/themes/advanced/editor_content.css b/source/web/scripts/tiny_mce/themes/advanced/editor_content.css
new file mode 100644
index 0000000000..75290eed1e
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/editor_content.css
@@ -0,0 +1,27 @@
+body {
+	background-color: #FFFFFF;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+}
+
+td {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+.mceVisualAid {
+	border: 1px dashed #BBBBBB;
+}
diff --git a/source/web/scripts/tiny_mce/themes/advanced/editor_popup.css b/source/web/scripts/tiny_mce/themes/advanced/editor_popup.css
new file mode 100644
index 0000000000..d51982cdc9
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/editor_popup.css
@@ -0,0 +1,121 @@
+body {
+	background-color: #F0F0EE;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;
+}
+
+td {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+
+input {
+	background: #FFFFFF;
+	border: 1px solid #cccccc;
+}
+
+td, input, select, textarea {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+input, select, textarea {
+	border: 1px solid #808080;
+}
+
+.input_noborder {
+	border: 0px solid #808080;
+}
+
+#insert {
+   font-weight: bold;
+}
+
+#cancel {
+   font-weight: bold;
+}
+
+.title {
+	font-size: 12px;
+	font-weight: bold;
+}
+
+table.charmap {
+	border-style: solid;
+	border-width: 1px;
+	border-color: #AAAAAA;
+}
+
+td.charmap, td.charmapOver {
+	color: #000000;
+	border-color: #AAAAAA;
+	border-style: solid;
+	border-width: 1px;
+	text-align: center;
+	font-size: 12px;
+}
+
+td.charmapOver {
+	background-color: #CCCCCC;
+	cursor: arrow;
+}
+
+a.charmap {
+	color: #000000;
+	text-decoration: none
+}
+
+.wordWrapCode {
+	vertical-align: middle;
+	border: 1px none #000000;
+	background-color: transparent;
+}
+
+input.radio {
+	border: 1px none #000000;
+	background-color: transparent;
+	vertical-align: middle;
+}
+
+input.checkbox {
+	border: 1px none #000000;
+	background-color: transparent;
+	vertical-align: middle;
+}
+
+.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
+	margin-left: 1px;
+}
+
+.mceButtonNormal {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: arrow;
+}
+
+.mceButtonOver {
+	border: 1px solid #0A246A;
+	cursor: arrow;
+	background-color: #B6BDD2;
+}
+
+.mceButtonDown {
+	cursor: arrow;
+	border: 1px solid #0A246A;
+	background-color: #8592B5;
+}
+
+legend {
+	font-weight: bold;
+}
diff --git a/source/web/scripts/tiny_mce/themes/advanced/editor_template.js b/source/web/scripts/tiny_mce/themes/advanced/editor_template.js
new file mode 100644
index 0000000000..e94ee3a018
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/editor_template.js
@@ -0,0 +1,23 @@
+/* Import theme specific language pack */
+ tinyMCE.importThemeLanguagePack('advanced');var TinyMCE_advanced_autoImportCSSClasses=true;var TinyMCE_advanced_foreColor="#000000";var TinyMCE_advanced_anchorName="";var TinyMCE_advanced_buttons=[['bold','{$lang_bold_img}','{$lang_bold_desc}','Bold'],['italic','{$lang_italic_img}','{$lang_italic_desc}','Italic'],['underline','{$lang_underline_img}','{$lang_underline_desc}','Underline'],['strikethrough','strikethrough.gif','{$lang_striketrough_desc}','Strikethrough'],['justifyleft','left.gif','{$lang_justifyleft_desc}','JustifyLeft'],['justifycenter','center.gif','{$lang_justifycenter_desc}','JustifyCenter'],['justifyright','right.gif','{$lang_justifyright_desc}','JustifyRight'],['justifyfull','full.gif','{$lang_justifyfull_desc}','JustifyFull'],['bullist','bullist.gif','{$lang_bullist_desc}','InsertUnorderedList'],['numlist','numlist.gif','{$lang_numlist_desc}','InsertOrderedList'],['outdent','outdent.gif','{$lang_outdent_desc}','Outdent'],['indent','indent.gif','{$lang_indent_desc}','Indent'],['cut','cut.gif','{$lang_cut_desc}','Cut'],['copy','copy.gif','{$lang_copy_desc}','Copy'],['paste','paste.gif','{$lang_paste_desc}','Paste'],['undo','undo.gif','{$lang_undo_desc}','Undo'],['redo','redo.gif','{$lang_redo_desc}','Redo'],['link','link.gif','{$lang_link_desc}','mceLink',true],['unlink','unlink.gif','{$lang_unlink_desc}','unlink'],['image','image.gif','{$lang_image_desc}','mceImage',true],['cleanup','cleanup.gif','{$lang_cleanup_desc}','mceCleanup'],['help','help.gif','{$lang_help_desc}','mceHelp'],['code','code.gif','{$lang_theme_code_desc}','mceCodeEditor'],['hr','hr.gif','{$lang_theme_hr_desc}','inserthorizontalrule'],['removeformat','removeformat.gif','{$lang_theme_removeformat_desc}','removeformat'],['sub','sub.gif','{$lang_theme_sub_desc}','subscript'],['sup','sup.gif','{$lang_theme_sup_desc}','superscript'],['forecolor','forecolor.gif','{$lang_theme_forecolor_desc}','mceForeColor',true],['backcolor','backcolor.gif','{$lang_theme_backcolor_desc}','mceBackColor',true],['charmap','charmap.gif','{$lang_theme_charmap_desc}','mceCharMap'],['visualaid','visualaid.gif','{$lang_theme_visualaid_desc}','mceToggleVisualAid'],['anchor','anchor.gif','{$lang_theme_anchor_desc}','mceInsertAnchor'],['newdocument','newdocument.gif','{$lang_newdocument_desc}','mceSetContent',false,'']];function TinyMCE_advanced_getControlHTML(button_name){var buttonTileMap=new Array('anchor.gif','backcolor.gif','bullist.gif','center.gif','charmap.gif','cleanup.gif','code.gif','copy.gif','custom_1.gif','cut.gif','forecolor.gif','full.gif','help.gif','hr.gif','image.gif','indent.gif','left.gif','link.gif','numlist.gif','outdent.gif','paste.gif','redo.gif','removeformat.gif','right.gif','strikethrough.gif','sub.gif','sup.gif','undo.gif','unlink.gif','visualaid.gif');for(var i=0;i<TinyMCE_advanced_buttons.length;i++){var but=TinyMCE_advanced_buttons[i];if(but[0]==button_name){var safariPatch='" onclick="';if(tinyMCE.isSafari)safariPatch="";if(tinyMCE.settings['button_tile_map']){for(var x=0;!tinyMCE.isMSIE&&x<buttonTileMap.length;x++){if(buttonTileMap[x]==but[1])return '<img id="{$editor_id}_'+but[0]+'" src="{$themeurl}/images/spacer.gif" style="background-image:url({$themeurl}/images/buttons.gif); background-position: '+(0-(x*20))+'px 0px" title="'+but[2]+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';}}return '<img id="{$editor_id}_'+but[0]+'" src="{$themeurl}/images/'+but[1]+'" title="'+but[2]+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';}}switch(button_name){case "formatselect":var html='<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';var formats=tinyMCE.getParam("theme_advanced_blockformats","p,address,pre,h1,h2,h3,h4,h5,h6",true).split(',');var lookup=[['p','{$lang_theme_paragraph}'],['address','{$lang_theme_address}'],['pre','{$lang_theme_pre}'],['h1','{$lang_theme_h1}'],['h2','{$lang_theme_h2}'],['h3','{$lang_theme_h3}'],['h4','{$lang_theme_h4}'],['h5','{$lang_theme_h5}'],['h6','{$lang_theme_h6}']];for(var i=0;i<formats.length;i++){for(var x=0;x<lookup.length;x++){if(formats[i]==lookup[x][0])html+='<option value="<'+lookup[x][0]+'>">'+lookup[x][1]+'</option>';}}html+='</select>';return html;case "styleselect":return '<select id="{$editor_id}_styleSelect" onmousedown="TinyMCE_advanced_setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';case "fontselect":return '<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+					<option value="">{$lang_theme_fontdefault}</option>\
+					<option value="arial,helvetica,sans-serif">Arial</option>\
+					<option value="times new roman,times,serif">Times New Roman</option>\
+					<option value="verdana,arial,helvetica,sans-serif">Verdana</option>\
+					<option value="courier new,courier,monospace">Courier</option>\
+					<option value="georgia,times new roman,times,serif">Georgia</option>\
+					<option value="tahoma,arial,helvetica,sans-serif">Tahoma</option>\
+					</select>';case "fontsizeselect":return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+					<option value="0">-- {$lang_theme_font_size} --</option>\
+					<option value="1">1 (8 pt)</option>\
+					<option value="2">2 (10 pt)</option>\
+					<option value="3">3 (12 pt)</option>\
+					<option value="4">4 (14 pt)</option>\
+					<option value="5">5 (18 pt)</option>\
+					<option value="6">6 (24 pt)</option>\
+					<option value="7">7 (36 pt)</option>\
+					</select>';case "|":case "separator":return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" class="mceSeparatorLine">';case "spacer":return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';case "rowseparator":return '<br />';}return "";}function TinyMCE_advanced_execCommand(editor_id,element,command,user_interface,value){switch(command){case "mceForeColor":var template=new Array();var inputColor=TinyMCE_advanced_foreColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=210;template['height']=200;tinyMCE.openWindow(template,{editor_id:editor_id,command:"forecolor",input_color:inputColor});return true;case "mceBackColor":var template=new Array();var inputColor=TinyMCE_advanced_foreColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=210;template['height']=200;tinyMCE.openWindow(template,{editor_id:editor_id,command:"HiliteColor",input_color:inputColor});return true;case "mceCodeEditor":var template=new Array();template['file']='source_editor.htm';template['width']=tinyMCE.getParam("theme_advanced_source_editor_width",500);template['height']=tinyMCE.getParam("theme_advanced_source_editor_height",400);tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"no"});return true;case "mceCharMap":var template=new Array();template['file']='charmap.htm';template['width']=550;template['height']=280;tinyMCE.openWindow(template,{editor_id:editor_id});return true;case "mceInsertAnchor":var template=new Array();template['file']='anchor.htm';template['width']=320;template['height']=130;tinyMCE.openWindow(template,{editor_id:editor_id,name:TinyMCE_advanced_anchorName,action:(TinyMCE_advanced_anchorName==""?"insert":"update")});return true;}return false;}function TinyMCE_advanced_getEditorTemplate(settings){function removeFromArray(in_array,remove_array){var outArray=new Array();for(var i=0;i<in_array.length;i++){skip=false;for(var j=0;j<remove_array.length;j++){if(in_array[i]==remove_array[j])skip=true;}if(!skip)outArray[outArray.length]=in_array[i];}return outArray;}function addToArray(in_array,add_array){for(var i=0;i<add_array.length;i++)in_array[in_array.length]=add_array[i];return in_array;}var template=new Array();var deltaHeight=0;var pathHTML='{$lang_theme_path}: <span id="{$editor_id}_path">&nbsp;</span>';var layoutManager=tinyMCE.getParam("theme_advanced_layout_manager","SimpleLayout");switch(layoutManager){case "SimpleLayout":var toolbarHTML="";var toolbarLocation=tinyMCE.getParam("theme_advanced_toolbar_location","bottom");var toolbarAlign=tinyMCE.getParam("theme_advanced_toolbar_align","center");var pathLocation=tinyMCE.getParam("theme_advanced_path_location","none");var buttonNamesRow1=tinyMCE.getParam("theme_advanced_buttons1","bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",true,',');buttonNamesRow1=removeFromArray(buttonNamesRow1,tinyMCE.getParam("theme_advanced_disable","",true,','));buttonNamesRow1=addToArray(buttonNamesRow1,tinyMCE.getParam("theme_advanced_buttons1_add","",true,','));buttonNamesRow1=addToArray(tinyMCE.getParam("theme_advanced_buttons1_add_before","",true,','),buttonNamesRow1);for(var i=0;i<buttonNamesRow1.length;i++)toolbarHTML+=tinyMCE.getControlHTML(buttonNamesRow1[i]);if(buttonNamesRow1.length>0){toolbarHTML+="<br />";deltaHeight-=23;}var buttonNamesRow2=tinyMCE.getParam("theme_advanced_buttons2","bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",true,',');buttonNamesRow2=removeFromArray(buttonNamesRow2,tinyMCE.getParam("theme_advanced_disable","",true,','));buttonNamesRow2=addToArray(buttonNamesRow2,tinyMCE.getParam("theme_advanced_buttons2_add","",true,','));buttonNamesRow2=addToArray(tinyMCE.getParam("theme_advanced_buttons2_add_before","",true,','),buttonNamesRow2);for(var i=0;i<buttonNamesRow2.length;i++)toolbarHTML+=tinyMCE.getControlHTML(buttonNamesRow2[i]);if(buttonNamesRow2.length>0){toolbarHTML+="<br />";deltaHeight-=23;}var buttonNamesRow3=tinyMCE.getParam("theme_advanced_buttons3","hr,removeformat,visualaid,separator,sub,sup,separator,charmap",true,',');buttonNamesRow3=removeFromArray(buttonNamesRow3,tinyMCE.getParam("theme_advanced_disable","",true,','));buttonNamesRow3=addToArray(buttonNamesRow3,tinyMCE.getParam("theme_advanced_buttons3_add","",true,','));buttonNamesRow3=addToArray(tinyMCE.getParam("theme_advanced_buttons3_add_before","",true,','),buttonNamesRow3);for(var i=0;i<buttonNamesRow3.length;i++)toolbarHTML+=tinyMCE.getControlHTML(buttonNamesRow3[i]);if(buttonNamesRow3.length>0)deltaHeight-=20;template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}"><tbody>';if(toolbarLocation=="top")template['html']+='<tr><td class="mceToolbarTop" align="'+toolbarAlign+'" height="1" nowrap="nowrap">'+toolbarHTML+'</td></tr>';if(pathLocation=="top"){template['html']+='<tr><td class="mcePathTop" height="1">'+pathHTML+'</td></tr>';deltaHeight-=23;}template['html']+='<tr><td align="center">\
+                    <span id="{$editor_id}"></span>\
+                    </td></tr>';if(toolbarLocation=="bottom")template['html']+='<tr><td class="mceToolbarBottom" align="'+toolbarAlign+'" height="1">'+toolbarHTML+'</td></tr>';if(pathLocation=="bottom"){template['html']+='<tr><td class="mcePathBottom" height="1">'+pathHTML+'</td></tr>';deltaHeight-=23;}template['html']+='</table>';break;case "RowLayout":template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}"><tbody>';var containers=tinyMCE.getParam("theme_advanced_containers","",true,",");var defaultContainerCSS=tinyMCE.getParam("theme_advanced_containers_default_class","container");var defaultContainerAlign=tinyMCE.getParam("theme_advanced_containers_default_align","center");for(var i=0;i<containers.length;i++){if(containers[i]=="mceEditor"){template['html']+='<tr><td align="center" class="mceEditor_border">\
+                        <span id="{$editor_id}"></span>\
+                        </td></tr>';}else if(containers[i]=="mceElementpath"){var pathClass="mcePath";if(i==containers.length-1)pathClass="mcePathBottom";else if(i==0)pathClass="mcePathTop";else deltaHeight-=2;template['html']+='<tr><td class="'+pathClass+'" height="1">'+pathHTML+'</td></tr>';deltaHeight-=22;}else{var curContainer=tinyMCE.getParam("theme_advanced_container_"+containers[i],"",true,',');var curContainerHTML="";var curAlign=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align",defaultContainerAlign);var curCSS=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class",defaultContainerCSS);for(var j=0;j<curContainer.length;j++)curContainerHTML+=tinyMCE.getControlHTML(curContainer[j]);if(curContainer.length>0){curContainerHTML+="<br />";deltaHeight-=23;}template['html']+='<tr><td class="'+curCSS+'" align="'+curAlign+'" height="1">'+curContainerHTML+'</td></tr>';}}template['html']+='</tbody></table>';break;case "BorderLayout":break;case "CustomLayout":var customLayout=tinyMCE.getParam("theme_advanced_custom_layout","");if(customLayout!=""&&eval("typeof("+customLayout+")")!="undefined")template=eval(customLayout+"(template);");break;default:alert('UNDEFINED LAYOUT MANAGER! PLEASE CHECK YOUR TINYMCE CONFIG!');break;}var styleSelectHTML='<option value="">-- {$lang_theme_style_select} --</option>';if(settings['theme_advanced_styles']){var stylesAr=settings['theme_advanced_styles'].split(';');for(var i=0;i<stylesAr.length;i++){var key,value;key=stylesAr[i].split('=')[0];value=stylesAr[i].split('=')[1];styleSelectHTML+='<option value="'+value+'">'+key+'</option>';}TinyMCE_advanced_autoImportCSSClasses=false;}template['html']=tinyMCE.replaceVar(template['html'],'style_select_options',styleSelectHTML);template['delta_width']=0;template['delta_height']=deltaHeight;return template;}function TinyMCE_advanced_getInsertLinkTemplate(){var template=new Array();template['file']='link.htm';template['width']=300;template['height']=150;template['width']+=tinyMCE.getLang('lang_insert_link_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_link_delta_height',0);return template;}function TinyMCE_advanced_getInsertImageTemplate(){var template=new Array();template['file']='image.htm?src={$src}';template['width']=340;template['height']=280;template['width']+=tinyMCE.getLang('lang_insert_image_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_image_delta_height',0);return template;}function TinyMCE_advanced_handleNodeChange(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){function selectByValue(select_elm,value){if(select_elm){for(var i=0;i<select_elm.options.length;i++){if(select_elm.options[i].value==value){select_elm.selectedIndex=i;return true;}}}return false;}if(node==null)return;var pathElm=document.getElementById(editor_id+"_path");if(pathElm){var parentNode=node;var path=new Array();while(parentNode){if(parentNode.nodeName.toLowerCase()=="body")break;if(parentNode.nodeType==1)path[path.length]=parentNode;parentNode=parentNode.parentNode;}var html="";for(var i=path.length-1;i>=0;i--){var nodeName=path[i].nodeName.toLowerCase();var nodeData="";var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],'class'),false);if(nodeName=="b")nodeName="strong";if(nodeName=="i")nodeName="em";if(tinyMCE.getAttrib(path[i],'id')!="")nodeData+="id: "+path[i].getAttribute('id')+" ";if(className!="")nodeData+="class: "+className+" ";if(tinyMCE.getAttrib(path[i],'src')!="")nodeData+="src: "+path[i].getAttribute('src')+" ";if(tinyMCE.getAttrib(path[i],'href')!="")nodeData+="href: "+path[i].getAttribute('href')+" ";if(nodeName=="img"&&tinyMCE.getAttrib(path[i],'name')=="mce_plugin_flash"){nodeName="flash";nodeData="";}if(tinyMCE.getAttrib(path[i],'name').indexOf("mce_")!=0){if(className!="")nodeName+="."+className;}if(tinyMCE.isMSIE||tinyMCE.isSafari)html+='<a title="'+nodeData+'" href="javascript:void(0);" onmousedown="tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');return false;" class="mcePathItem">'+nodeName+'</a>';else html+='<a title="'+nodeData+'" href="javascript:tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');" class="mcePathItem">'+nodeName+'</a>';if(i>0)html+=" &raquo; ";}pathElm.innerHTML=html+"&nbsp;";}var colorElm=tinyMCE.getParentElement(node,"font","color");if(colorElm)TinyMCE_advanced_foreColor=""+colorElm.color.toUpperCase();tinyMCE.switchClassSticky(editor_id+'_justifyleft','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifyright','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifycenter','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifyfull','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_numlist','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_sub','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_sup','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_anchor','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_link','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_unlink','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_outdent','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_image','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_hr','mceButtonNormal');var anchorName=tinyMCE.getParentElement(node,"a","name");TinyMCE_advanced_anchorName="";if(anchorName){TinyMCE_advanced_anchorName=anchorName.getAttribute("name");tinyMCE.switchClassSticky(editor_id+'_anchor','mceButtonSelected');}var anchorLink=tinyMCE.getParentElement(node,"a","href");if(anchorLink||any_selection){tinyMCE.switchClassSticky(editor_id+'_link',anchorLink?'mceButtonSelected':'mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_unlink',anchorLink?'mceButtonSelected':'mceButtonNormal',false);}tinyMCE.switchClassSticky(editor_id+'_visualaid',visual_aid?'mceButtonSelected':'mceButtonNormal',false);if(undo_levels!=-1){tinyMCE.switchClassSticky(editor_id+'_undo','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_redo','mceButtonDisabled',true);}if(tinyMCE.getParentElement(node,"li,blockquote"))tinyMCE.switchClassSticky(editor_id+'_outdent','mceButtonNormal',false);if(undo_index!=-1&&(undo_index<undo_levels-1&&undo_levels>0))tinyMCE.switchClassSticky(editor_id+'_redo','mceButtonNormal',false);if(undo_index!=-1&&(undo_index>0&&undo_levels>0))tinyMCE.switchClassSticky(editor_id+'_undo','mceButtonNormal',false);var selectElm=document.getElementById(editor_id+"_styleSelect");if(selectElm){TinyMCE_advanced_setupCSSClasses(editor_id);classNode=node;breakOut=false;var index=0;do{if(classNode&&classNode.className){for(var i=0;i<selectElm.options.length;i++){if(selectElm.options[i].value==classNode.className){index=i;breakOut=true;break;}}}}while(!breakOut&&classNode!=null&&(classNode=classNode.parentNode));selectElm.selectedIndex=index;}var selectElm=document.getElementById(editor_id+"_formatSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm){selectByValue(selectElm,"<"+elm.nodeName.toLowerCase()+">");}else selectByValue(selectElm,"<p>");}var selectElm=document.getElementById(editor_id+"_fontNameSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"font","face");if(elm)selectByValue(selectElm,elm.getAttribute("face"));else selectByValue(selectElm,"");}var selectElm=document.getElementById(editor_id+"_fontSizeSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"font","size");if(elm&&tinyMCE.getAttrib(elm,"size")!="")selectByValue(selectElm,elm.getAttribute("size"));else selectByValue(selectElm,"0");}alignNode=node;breakOut=false;do{if(!alignNode.getAttribute||!alignNode.getAttribute('align'))continue;switch(alignNode.getAttribute('align').toLowerCase()){case "left":tinyMCE.switchClassSticky(editor_id+'_justifyleft','mceButtonSelected');breakOut=true;break;case "right":tinyMCE.switchClassSticky(editor_id+'_justifyright','mceButtonSelected');breakOut=true;break;case "middle":case "center":tinyMCE.switchClassSticky(editor_id+'_justifycenter','mceButtonSelected');breakOut=true;break;case "justify":tinyMCE.switchClassSticky(editor_id+'_justifyfull','mceButtonSelected');breakOut=true;break;}}while(!breakOut&&(alignNode=alignNode.parentNode));if(tinyMCE.isGecko&&node.nodeType==3){var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();if(doc.queryCommandState("Bold"))tinyMCE.switchClassSticky(editor_id+'_bold','mceButtonSelected');if(doc.queryCommandState("Italic"))tinyMCE.switchClassSticky(editor_id+'_italic','mceButtonSelected');if(doc.queryCommandState("Underline")&&(node.parentNode==null||node.parentNode.nodeName!="A"))tinyMCE.switchClassSticky(editor_id+'_underline','mceButtonSelected');if(doc.queryCommandState("Strikethrough"))tinyMCE.switchClassSticky(editor_id+'_strikethrough','mceButtonSelected');}do{switch(node.nodeName.toLowerCase()){case "b":case "strong":tinyMCE.switchClassSticky(editor_id+'_bold','mceButtonSelected');break;case "i":case "em":tinyMCE.switchClassSticky(editor_id+'_italic','mceButtonSelected');break;case "u":tinyMCE.switchClassSticky(editor_id+'_underline','mceButtonSelected');break;case "strike":tinyMCE.switchClassSticky(editor_id+'_strikethrough','mceButtonSelected');break;case "ul":tinyMCE.switchClassSticky(editor_id+'_bullist','mceButtonSelected');break;case "ol":tinyMCE.switchClassSticky(editor_id+'_numlist','mceButtonSelected');break;case "sub":tinyMCE.switchClassSticky(editor_id+'_sub','mceButtonSelected');break;case "sup":tinyMCE.switchClassSticky(editor_id+'_sup','mceButtonSelected');break;case "hr":tinyMCE.switchClassSticky(editor_id+'_hr','mceButtonSelected');break;case "img":if(tinyMCE.getAttrib(node,'name').indexOf('mce_')!=0)tinyMCE.switchClassSticky(editor_id+'_image','mceButtonSelected');break;}}while((node=node.parentNode));}function TinyMCE_advanced_setupCSSClasses(editor_id){if(!TinyMCE_advanced_autoImportCSSClasses)return;var selectElm=document.getElementById(editor_id+'_styleSelect');if(selectElm&&selectElm.getAttribute('cssImported')!='true'){var csses=tinyMCE.getCSSClasses(editor_id);if(csses&&selectElm){for(var i=0;i<csses.length;i++)selectElm.options[selectElm.length]=new Option(csses[i],csses[i]);}if(csses!=null&&csses.length>0)selectElm.setAttribute('cssImported','true');}}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/themes/advanced/editor_template_src.js b/source/web/scripts/tiny_mce/themes/advanced/editor_template_src.js
new file mode 100644
index 0000000000..646c5adab0
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -0,0 +1,763 @@
+/* Import theme specific language pack */
+tinyMCE.importThemeLanguagePack('advanced');
+
+// Variable declarations
+var TinyMCE_advanced_autoImportCSSClasses = true;
+var TinyMCE_advanced_foreColor = "#000000";
+var TinyMCE_advanced_anchorName = "";
+var TinyMCE_advanced_buttons = [
+		// Control id, button img, button title, command, user_interface, value
+		['bold', '{$lang_bold_img}', '{$lang_bold_desc}', 'Bold'],
+		['italic', '{$lang_italic_img}', '{$lang_italic_desc}', 'Italic'],
+		['underline', '{$lang_underline_img}', '{$lang_underline_desc}', 'Underline'],
+		['strikethrough', 'strikethrough.gif', '{$lang_striketrough_desc}', 'Strikethrough'],
+		['justifyleft', 'left.gif', '{$lang_justifyleft_desc}', 'JustifyLeft'],
+		['justifycenter', 'center.gif', '{$lang_justifycenter_desc}', 'JustifyCenter'],
+		['justifyright', 'right.gif', '{$lang_justifyright_desc}', 'JustifyRight'],
+		['justifyfull', 'full.gif', '{$lang_justifyfull_desc}', 'JustifyFull'],
+		['bullist', 'bullist.gif', '{$lang_bullist_desc}', 'InsertUnorderedList'],
+		['numlist', 'numlist.gif', '{$lang_numlist_desc}', 'InsertOrderedList'],
+		['outdent', 'outdent.gif', '{$lang_outdent_desc}', 'Outdent'],
+		['indent', 'indent.gif', '{$lang_indent_desc}', 'Indent'],
+		['cut', 'cut.gif', '{$lang_cut_desc}', 'Cut'],
+		['copy', 'copy.gif', '{$lang_copy_desc}', 'Copy'],
+		['paste', 'paste.gif', '{$lang_paste_desc}', 'Paste'],
+		['undo', 'undo.gif', '{$lang_undo_desc}', 'Undo'],
+		['redo', 'redo.gif', '{$lang_redo_desc}', 'Redo'],
+		['link', 'link.gif', '{$lang_link_desc}', 'mceLink', true],
+		['unlink', 'unlink.gif', '{$lang_unlink_desc}', 'unlink'],
+		['image', 'image.gif', '{$lang_image_desc}', 'mceImage', true],
+		['cleanup', 'cleanup.gif', '{$lang_cleanup_desc}', 'mceCleanup'],
+		['help', 'help.gif', '{$lang_help_desc}', 'mceHelp'],
+		['code', 'code.gif', '{$lang_theme_code_desc}', 'mceCodeEditor'],
+		['hr', 'hr.gif', '{$lang_theme_hr_desc}', 'inserthorizontalrule'],
+		['removeformat', 'removeformat.gif', '{$lang_theme_removeformat_desc}', 'removeformat'],
+		['sub', 'sub.gif', '{$lang_theme_sub_desc}', 'subscript'],
+		['sup', 'sup.gif', '{$lang_theme_sup_desc}', 'superscript'],
+		['forecolor', 'forecolor.gif', '{$lang_theme_forecolor_desc}', 'mceForeColor', true],
+		['backcolor', 'backcolor.gif', '{$lang_theme_backcolor_desc}', 'mceBackColor', true],
+		['charmap', 'charmap.gif', '{$lang_theme_charmap_desc}', 'mceCharMap'],
+		['visualaid', 'visualaid.gif', '{$lang_theme_visualaid_desc}', 'mceToggleVisualAid'],
+		['anchor', 'anchor.gif', '{$lang_theme_anchor_desc}', 'mceInsertAnchor'],
+		['newdocument', 'newdocument.gif', '{$lang_newdocument_desc}', 'mceSetContent', false, '']
+	];
+
+
+/**
+ * Returns HTML code for the specificed control.
+ */
+function TinyMCE_advanced_getControlHTML(button_name) {
+	var buttonTileMap = new Array('anchor.gif','backcolor.gif','bullist.gif','center.gif','charmap.gif','cleanup.gif','code.gif','copy.gif','custom_1.gif','cut.gif','forecolor.gif','full.gif','help.gif','hr.gif','image.gif','indent.gif','left.gif','link.gif','numlist.gif','outdent.gif','paste.gif','redo.gif','removeformat.gif','right.gif','strikethrough.gif','sub.gif','sup.gif','undo.gif','unlink.gif','visualaid.gif');
+
+	// Lookup button in button list
+	for (var i=0; i<TinyMCE_advanced_buttons.length; i++) {
+		var but = TinyMCE_advanced_buttons[i];
+		if (but[0] == button_name) {
+			var safariPatch = '" onclick="';
+
+			if (tinyMCE.isSafari)
+				safariPatch = "";
+
+			// Check for it in tilemap
+			if (tinyMCE.settings['button_tile_map']) {
+				for (var x=0; !tinyMCE.isMSIE && x<buttonTileMap.length; x++) {
+					if (buttonTileMap[x] == but[1])
+						return '<img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/spacer.gif" style="background-image:url({$themeurl}/images/buttons.gif); background-position: ' + (0-(x*20)) + 'px 0px" title="' + but[2] + '" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+				}
+			}
+
+			// Old style
+			return '<img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/' + but[1] + '" title="' + but[2] + '" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+		}
+	}
+
+	// Custom controlls other than buttons
+	switch (button_name) {
+		case "formatselect":
+			var html = '<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';
+			var formats = tinyMCE.getParam("theme_advanced_blockformats", "p,address,pre,h1,h2,h3,h4,h5,h6", true).split(',');
+			var lookup = [
+				['p', '{$lang_theme_paragraph}'],
+				['address', '{$lang_theme_address}'],
+				['pre', '{$lang_theme_pre}'],
+				['h1', '{$lang_theme_h1}'],
+				['h2', '{$lang_theme_h2}'],
+				['h3', '{$lang_theme_h3}'],
+				['h4', '{$lang_theme_h4}'],
+				['h5', '{$lang_theme_h5}'],
+				['h6', '{$lang_theme_h6}']
+			];
+
+			// Build format select
+			for (var i=0; i<formats.length; i++) {
+				for (var x=0; x<lookup.length; x++) {
+					if (formats[i] == lookup[x][0])
+						html += '<option value="<' + lookup[x][0] + '>">' + lookup[x][1] + '</option>';
+				}
+			}
+
+			html += '</select>';
+
+			return html;
+
+
+		case "styleselect":
+			return '<select id="{$editor_id}_styleSelect" onmousedown="TinyMCE_advanced_setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';
+
+		case "fontselect":
+			return '<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+					<option value="">{$lang_theme_fontdefault}</option>\
+					<option value="arial,helvetica,sans-serif">Arial</option>\
+					<option value="times new roman,times,serif">Times New Roman</option>\
+					<option value="verdana,arial,helvetica,sans-serif">Verdana</option>\
+					<option value="courier new,courier,monospace">Courier</option>\
+					<option value="georgia,times new roman,times,serif">Georgia</option>\
+					<option value="tahoma,arial,helvetica,sans-serif">Tahoma</option>\
+					</select>';
+
+		case "fontsizeselect":
+			return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+					<option value="0">-- {$lang_theme_font_size} --</option>\
+					<option value="1">1 (8 pt)</option>\
+					<option value="2">2 (10 pt)</option>\
+					<option value="3">3 (12 pt)</option>\
+					<option value="4">4 (14 pt)</option>\
+					<option value="5">5 (18 pt)</option>\
+					<option value="6">6 (24 pt)</option>\
+					<option value="7">7 (36 pt)</option>\
+					</select>';
+
+		case "|":
+		case "separator":
+			return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" class="mceSeparatorLine">';
+
+        case "spacer":
+			return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';
+
+		case "rowseparator":
+			return '<br />';
+	}
+
+	return "";
+}
+
+/**
+ * Theme specific exec command handeling.
+ */
+function TinyMCE_advanced_execCommand(editor_id, element, command, user_interface, value) {
+	switch (command) {
+		case "mceForeColor":
+			var template = new Array();
+			var inputColor = TinyMCE_advanced_foreColor;
+
+			if (!inputColor)
+				inputColor = "#000000";
+
+			template['file'] = 'color_picker.htm';
+			template['width'] = 210;
+			template['height'] = 200;
+
+			tinyMCE.openWindow(template, {editor_id : editor_id, command : "forecolor", input_color : inputColor});
+			return true;
+
+		case "mceBackColor":
+			var template = new Array();
+			var inputColor = TinyMCE_advanced_foreColor;
+
+			if (!inputColor)
+				inputColor = "#000000";
+
+			template['file'] = 'color_picker.htm';
+			template['width'] = 210;
+			template['height'] = 200;
+
+			tinyMCE.openWindow(template, {editor_id : editor_id, command : "HiliteColor", input_color : inputColor});
+			return true;
+
+		case "mceCodeEditor":
+			var template = new Array();
+
+			template['file'] = 'source_editor.htm';
+			template['width'] = tinyMCE.getParam("theme_advanced_source_editor_width", 500);
+			template['height'] = tinyMCE.getParam("theme_advanced_source_editor_height", 400);
+
+			tinyMCE.openWindow(template, {editor_id : editor_id, resizable : "yes", scrollbars : "no"});
+			return true;
+
+		case "mceCharMap":
+			var template = new Array();
+
+			template['file'] = 'charmap.htm';
+			template['width'] = 550;
+			template['height'] = 280;
+
+			tinyMCE.openWindow(template, {editor_id : editor_id});
+			return true;
+
+		case "mceInsertAnchor":
+			var template = new Array();
+
+			template['file'] = 'anchor.htm';
+			template['width'] = 320;
+			template['height'] = 130;
+
+			tinyMCE.openWindow(template, {editor_id : editor_id, name : TinyMCE_advanced_anchorName, action : (TinyMCE_advanced_anchorName == "" ? "insert" : "update")});
+			return true;
+	}
+
+	// Default behavior
+	return false;
+}
+
+/**
+ * Editor instance template function.
+ */
+function TinyMCE_advanced_getEditorTemplate(settings) {
+	function removeFromArray(in_array, remove_array) {
+		var outArray = new Array();
+		for (var i=0; i<in_array.length; i++) {
+			skip = false;
+
+			for (var j=0; j<remove_array.length; j++) {
+				if (in_array[i] == remove_array[j])
+					skip = true;
+			}
+
+			if (!skip)
+				outArray[outArray.length] = in_array[i];
+		}
+
+		return outArray;
+	}
+
+	function addToArray(in_array, add_array) {
+		for (var i=0; i<add_array.length; i++)
+			in_array[in_array.length] = add_array[i];
+
+		return in_array;
+	}
+
+	var template = new Array();
+	var deltaHeight = 0;
+
+	//###########################################################################################################
+	// <Layout Manager Modification by SlyD, 14.1.2005>
+	//###########################################################################################################
+
+  	var pathHTML = '{$lang_theme_path}: <span id="{$editor_id}_path">&nbsp;</span>';
+	var layoutManager = tinyMCE.getParam("theme_advanced_layout_manager", "SimpleLayout");
+
+	switch(layoutManager) {
+		case "SimpleLayout" : //the default TinyMCE Layout (for backwards compatibility)...
+                var toolbarHTML = "";
+                var toolbarLocation = tinyMCE.getParam("theme_advanced_toolbar_location", "bottom");
+                var toolbarAlign = tinyMCE.getParam("theme_advanced_toolbar_align", "center");
+                var pathLocation = tinyMCE.getParam("theme_advanced_path_location", "none");
+
+                // Render row 1
+                var buttonNamesRow1 = tinyMCE.getParam("theme_advanced_buttons1", "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect", true, ',');
+                buttonNamesRow1 = removeFromArray(buttonNamesRow1, tinyMCE.getParam("theme_advanced_disable", "", true, ','));
+                buttonNamesRow1 = addToArray(buttonNamesRow1, tinyMCE.getParam("theme_advanced_buttons1_add", "", true, ','));
+                buttonNamesRow1 = addToArray(tinyMCE.getParam("theme_advanced_buttons1_add_before", "", true, ','), buttonNamesRow1);
+                for (var i=0; i<buttonNamesRow1.length; i++)
+                    toolbarHTML += tinyMCE.getControlHTML(buttonNamesRow1[i]);
+
+                if (buttonNamesRow1.length > 0) {
+                    toolbarHTML += "<br />";
+					deltaHeight -= 23;
+				}
+
+                // Render row 2
+                var buttonNamesRow2 = tinyMCE.getParam("theme_advanced_buttons2", "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code", true, ',');
+                buttonNamesRow2 = removeFromArray(buttonNamesRow2, tinyMCE.getParam("theme_advanced_disable", "", true, ','));
+                buttonNamesRow2 = addToArray(buttonNamesRow2, tinyMCE.getParam("theme_advanced_buttons2_add", "", true, ','));
+                buttonNamesRow2 = addToArray(tinyMCE.getParam("theme_advanced_buttons2_add_before", "", true, ','), buttonNamesRow2);
+                for (var i=0; i<buttonNamesRow2.length; i++)
+                    toolbarHTML += tinyMCE.getControlHTML(buttonNamesRow2[i]);
+
+                if (buttonNamesRow2.length > 0) {
+                    toolbarHTML += "<br />";
+					deltaHeight -= 23;
+				}
+
+                // Render row 3
+                var buttonNamesRow3 = tinyMCE.getParam("theme_advanced_buttons3", "hr,removeformat,visualaid,separator,sub,sup,separator,charmap", true, ',');
+                buttonNamesRow3 = removeFromArray(buttonNamesRow3, tinyMCE.getParam("theme_advanced_disable", "", true, ','));
+                buttonNamesRow3 = addToArray(buttonNamesRow3, tinyMCE.getParam("theme_advanced_buttons3_add", "", true, ','));
+                buttonNamesRow3 = addToArray(tinyMCE.getParam("theme_advanced_buttons3_add_before", "", true, ','), buttonNamesRow3);
+                for (var i=0; i<buttonNamesRow3.length; i++)
+                    toolbarHTML += tinyMCE.getControlHTML(buttonNamesRow3[i]);
+
+				if (buttonNamesRow3.length > 0)
+					deltaHeight -= 20;
+
+                // Setup template html
+                template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}"><tbody>';
+
+                if (toolbarLocation == "top")
+                    template['html'] += '<tr><td class="mceToolbarTop" align="' + toolbarAlign + '" height="1" nowrap="nowrap">' + toolbarHTML + '</td></tr>';
+
+                if (pathLocation == "top") {
+                    template['html'] += '<tr><td class="mcePathTop" height="1">' + pathHTML + '</td></tr>';
+					deltaHeight -= 23;
+				}
+
+            /*  template['html'] += '<tr><td align="center">\
+                    <iframe id="{$editor_id}" class="mceEditorArea" border="1" frameborder="0" src="{$default_document}" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" style="width:{$area_width};height:{$area_height}" width="{$area_width}" height="{$area_height}"></iframe>\
+                    </td></tr>';*/
+                template['html'] += '<tr><td align="center">\
+                    <span id="{$editor_id}"></span>\
+                    </td></tr>';
+
+                if (toolbarLocation == "bottom")
+                    template['html'] += '<tr><td class="mceToolbarBottom" align="' + toolbarAlign + '" height="1">' + toolbarHTML + '</td></tr>';
+
+                if (pathLocation == "bottom") {
+                    template['html'] += '<tr><td class="mcePathBottom" height="1">' + pathHTML + '</td></tr>';
+					deltaHeight -= 23;
+				}
+
+                template['html'] += '</table>';
+		break;
+
+		case "RowLayout" : //Container Layout - containers defined in "theme_advanced_containers" are rendered from top to bottom.
+            template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}"><tbody>';
+
+            var containers = tinyMCE.getParam("theme_advanced_containers", "", true, ",");
+            var defaultContainerCSS = tinyMCE.getParam("theme_advanced_containers_default_class", "container");
+            var defaultContainerAlign = tinyMCE.getParam("theme_advanced_containers_default_align", "center");
+
+            //Render Containers:
+            for(var i = 0; i < containers.length; i++)
+            {
+                if(containers[i] == "mceEditor") //Exceptions for mceEditor and ...
+                {
+                    template['html'] += '<tr><td align="center" class="mceEditor_border">\
+                        <span id="{$editor_id}"></span>\
+                        </td></tr>';
+                }
+                else if(containers[i] == "mceElementpath") // ... mceElementpath:
+                {
+					var pathClass = "mcePath";
+
+					if (i == containers.length-1)
+						pathClass = "mcePathBottom";
+					else if (i == 0)
+						pathClass = "mcePathTop";
+					else
+						deltaHeight-=2;
+
+                    template['html'] += '<tr><td class="' + pathClass + '" height="1">' + pathHTML + '</td></tr>';
+					deltaHeight -= 22;
+                }
+                else //Render normal Container:
+                {
+                    var curContainer = tinyMCE.getParam("theme_advanced_container_"+containers[i], "", true, ',');
+                    var curContainerHTML = "";
+                    var curAlign = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align", defaultContainerAlign);
+                    var curCSS = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class", defaultContainerCSS);
+
+                    for (var j=0; j<curContainer.length; j++)
+                        curContainerHTML += tinyMCE.getControlHTML(curContainer[j]);
+
+                    if (curContainer.length > 0) {
+                        curContainerHTML += "<br />";
+						deltaHeight -= 23;
+					}
+
+                    template['html'] += '<tr><td class="' + curCSS + '" align="' + curAlign + '" height="1">' + curContainerHTML + '</td></tr>';
+                }
+            }
+
+            template['html'] += '</tbody></table>';
+		break;
+		case "BorderLayout" : //will be like java.awt.BorderLayout of SUN Java...
+			// Not implemented yet... 
+		break;
+		case "CustomLayout" : //User defined layout callback...
+				var customLayout = tinyMCE.getParam("theme_advanced_custom_layout","");
+				if (customLayout != "" && eval("typeof(" + customLayout + ")") != "undefined")
+				template = eval(customLayout + "(template);");
+		break;
+		default:
+			alert('UNDEFINED LAYOUT MANAGER! PLEASE CHECK YOUR TINYMCE CONFIG!');
+		break;
+	}
+
+	//###########################################################################################################
+	// </Modification by SlyD, 14.1.2005>
+	//###########################################################################################################
+
+	// Setup style select options
+	var styleSelectHTML = '<option value="">-- {$lang_theme_style_select} --</option>';
+	if (settings['theme_advanced_styles']) {
+		var stylesAr = settings['theme_advanced_styles'].split(';');
+		for (var i=0; i<stylesAr.length; i++) {
+			var key, value;
+
+			key = stylesAr[i].split('=')[0];
+			value = stylesAr[i].split('=')[1];
+
+			styleSelectHTML += '<option value="' + value + '">' + key + '</option>';
+		}
+
+		TinyMCE_advanced_autoImportCSSClasses = false;
+	}
+
+	template['html'] = tinyMCE.replaceVar(template['html'], 'style_select_options', styleSelectHTML);
+	template['delta_width'] = 0;
+	template['delta_height'] = deltaHeight;
+
+	return template;
+}
+
+/**
+ * Insert link template function.
+ */
+function TinyMCE_advanced_getInsertLinkTemplate() {
+	var template = new Array();
+
+	template['file'] = 'link.htm';
+	template['width'] = 300;
+	template['height'] = 150;
+
+	// Language specific width and height addons
+	template['width'] += tinyMCE.getLang('lang_insert_link_delta_width', 0);
+	template['height'] += tinyMCE.getLang('lang_insert_link_delta_height', 0);
+
+	return template;
+}
+
+/**
+ * Insert image template function.
+ */
+function TinyMCE_advanced_getInsertImageTemplate() {
+	var template = new Array();
+
+	template['file'] = 'image.htm?src={$src}';
+	template['width'] = 340;
+	template['height'] = 280;
+
+	// Language specific width and height addons
+	template['width'] += tinyMCE.getLang('lang_insert_image_delta_width', 0);
+	template['height'] += tinyMCE.getLang('lang_insert_image_delta_height', 0);
+
+	return template;
+}
+
+/**
+ * Node change handler.
+ */
+function TinyMCE_advanced_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	function selectByValue(select_elm, value) {
+		if (select_elm) {
+			for (var i=0; i<select_elm.options.length; i++) {
+				if (select_elm.options[i].value == value) {
+					select_elm.selectedIndex = i;
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	// No node provided
+	if (node == null)
+		return;
+
+	// Update path
+	var pathElm = document.getElementById(editor_id + "_path");
+	if (pathElm) {
+		// Get node path
+		var parentNode = node;
+		var path = new Array();
+		while (parentNode) {
+			if (parentNode.nodeName.toLowerCase() == "body")
+				break;
+
+			// Only append element nodes to path
+			if (parentNode.nodeType == 1)
+				path[path.length] = parentNode;
+
+			parentNode = parentNode.parentNode;
+		}
+
+		// Setup HTML
+		var html = "";
+		for (var i=path.length-1; i>=0; i--) {
+			var nodeName = path[i].nodeName.toLowerCase();
+			var nodeData = "";
+			var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], 'class'), false);
+
+			if (nodeName == "b")
+				nodeName = "strong";
+
+			if (nodeName == "i")
+				nodeName = "em";
+
+			if (tinyMCE.getAttrib(path[i], 'id') != "")
+				nodeData += "id: " + path[i].getAttribute('id') + " ";
+
+			if (className != "")
+				nodeData += "class: " + className + " ";
+
+			if (tinyMCE.getAttrib(path[i], 'src') != "")
+				nodeData += "src: " + path[i].getAttribute('src') + " ";
+
+			if (tinyMCE.getAttrib(path[i], 'href') != "")
+				nodeData += "href: " + path[i].getAttribute('href') + " ";
+
+			if (nodeName == "img" && tinyMCE.getAttrib(path[i], 'name') == "mce_plugin_flash") {
+				nodeName = "flash";
+				nodeData = "";
+			}
+
+			if (tinyMCE.getAttrib(path[i], 'name').indexOf("mce_") != 0) {
+				if (className != "")
+					nodeName += "." + className;
+			}
+
+			if (tinyMCE.isMSIE || tinyMCE.isSafari)
+				html += '<a title="' + nodeData + '" href="javascript:void(0);" onmousedown="tinyMCE.execInstanceCommand(\'' + editor_id + '\',\'mceSelectNodeDepth\',false,\'' + i + '\');return false;" class="mcePathItem">' + nodeName + '</a>';
+			else
+				html += '<a title="' + nodeData + '" href="javascript:tinyMCE.execInstanceCommand(\'' + editor_id + '\',\'mceSelectNodeDepth\',false,\'' + i + '\');" class="mcePathItem">' + nodeName + '</a>';
+
+			if (i > 0)
+				html += " &raquo; ";
+		}
+
+		pathElm.innerHTML = html + "&nbsp;";
+	}
+
+	// Get element color
+	var colorElm = tinyMCE.getParentElement(node, "font", "color");
+	if (colorElm)
+		TinyMCE_advanced_foreColor = "" + colorElm.color.toUpperCase();
+
+	// Reset old states
+	tinyMCE.switchClassSticky(editor_id + '_justifyleft', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_justifyright', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_justifycenter', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_justifyfull', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_bold', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_italic', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_underline', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_strikethrough', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_bullist', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_numlist', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_sub', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_sup', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_anchor', 'mceButtonNormal');
+	tinyMCE.switchClassSticky(editor_id + '_link', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_unlink', 'mceButtonDisabled', true);
+	tinyMCE.switchClassSticky(editor_id + '_outdent', 'mceButtonDisabled', true);
+    tinyMCE.switchClassSticky(editor_id + '_image', 'mceButtonNormal');
+    tinyMCE.switchClassSticky(editor_id + '_hr', 'mceButtonNormal');
+
+	// Get anchor name
+	var anchorName = tinyMCE.getParentElement(node, "a", "name");
+	TinyMCE_advanced_anchorName = "";
+	if (anchorName) {
+		TinyMCE_advanced_anchorName = anchorName.getAttribute("name");
+		tinyMCE.switchClassSticky(editor_id + '_anchor', 'mceButtonSelected');
+	}
+
+	// Get link
+	var anchorLink = tinyMCE.getParentElement(node, "a", "href");
+	if (anchorLink || any_selection) {
+		tinyMCE.switchClassSticky(editor_id + '_link', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal', false);
+		tinyMCE.switchClassSticky(editor_id + '_unlink', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal', false);
+	}
+
+	// Handle visual aid
+	tinyMCE.switchClassSticky(editor_id + '_visualaid', visual_aid ? 'mceButtonSelected' : 'mceButtonNormal', false);
+
+	if (undo_levels != -1) {
+		tinyMCE.switchClassSticky(editor_id + '_undo', 'mceButtonDisabled', true);
+		tinyMCE.switchClassSticky(editor_id + '_redo', 'mceButtonDisabled', true);
+	}
+
+	// Within li, blockquote
+	if (tinyMCE.getParentElement(node, "li,blockquote"))
+		tinyMCE.switchClassSticky(editor_id + '_outdent', 'mceButtonNormal', false);
+
+	// Has redo levels
+	if (undo_index != -1 && (undo_index < undo_levels-1 && undo_levels > 0))
+		tinyMCE.switchClassSticky(editor_id + '_redo', 'mceButtonNormal', false);
+
+	// Has undo levels
+	if (undo_index != -1 && (undo_index > 0 && undo_levels > 0))
+		tinyMCE.switchClassSticky(editor_id + '_undo', 'mceButtonNormal', false);
+
+	// Select class in select box
+	var selectElm = document.getElementById(editor_id + "_styleSelect");
+	if (selectElm) {
+		TinyMCE_advanced_setupCSSClasses(editor_id);
+
+		classNode = node;
+		breakOut = false;
+		var index = 0;
+
+		do {
+			if (classNode && classNode.className) {
+				for (var i=0; i<selectElm.options.length; i++) {
+					if (selectElm.options[i].value == classNode.className) {
+						index = i;
+						breakOut = true;
+						break;
+					}
+				}
+			}
+		} while (!breakOut && classNode != null && (classNode = classNode.parentNode));
+
+		selectElm.selectedIndex = index;
+	}
+
+	// Select formatblock
+	var selectElm = document.getElementById(editor_id + "_formatSelect");
+	if (selectElm) {
+		var elm = tinyMCE.getParentElement(node, "p,div,h1,h2,h3,h4,h5,h6,pre,address");
+		if (elm) {
+			selectByValue(selectElm, "<" + elm.nodeName.toLowerCase() + ">");
+		} else
+			selectByValue(selectElm, "<p>");
+	}
+
+	// Select fontselect
+	var selectElm = document.getElementById(editor_id + "_fontNameSelect");
+	if (selectElm) {
+		var elm = tinyMCE.getParentElement(node, "font", "face");
+		if (elm)
+			selectByValue(selectElm, elm.getAttribute("face"));
+		else
+			selectByValue(selectElm, "");
+	}
+
+	// Select fontsize
+	var selectElm = document.getElementById(editor_id + "_fontSizeSelect");
+	if (selectElm) {
+		var elm = tinyMCE.getParentElement(node, "font", "size");
+		if (elm && tinyMCE.getAttrib(elm, "size") != "")
+			selectByValue(selectElm, elm.getAttribute("size"));
+		else
+			selectByValue(selectElm, "0");
+	}
+
+	// Handle align attributes
+	alignNode = node;
+	breakOut = false;
+	do {
+		if (!alignNode.getAttribute || !alignNode.getAttribute('align'))
+			continue;
+
+		switch (alignNode.getAttribute('align').toLowerCase()) {
+			case "left":
+				tinyMCE.switchClassSticky(editor_id + '_justifyleft', 'mceButtonSelected');
+				breakOut = true;
+			break;
+
+			case "right":
+				tinyMCE.switchClassSticky(editor_id + '_justifyright', 'mceButtonSelected');
+				breakOut = true;
+			break;
+
+			case "middle":
+			case "center":
+				tinyMCE.switchClassSticky(editor_id + '_justifycenter', 'mceButtonSelected');
+				breakOut = true;
+			break;
+
+			case "justify":
+				tinyMCE.switchClassSticky(editor_id + '_justifyfull', 'mceButtonSelected');
+				breakOut = true;
+			break;
+		}
+	} while (!breakOut && (alignNode = alignNode.parentNode));
+
+	// Do special text
+	if (tinyMCE.isGecko && node.nodeType == 3) {
+		var inst = tinyMCE.getInstanceById(editor_id);
+		var doc = inst.getDoc();
+
+		if (doc.queryCommandState("Bold"))
+			tinyMCE.switchClassSticky(editor_id + '_bold', 'mceButtonSelected');
+
+		if (doc.queryCommandState("Italic"))
+			tinyMCE.switchClassSticky(editor_id + '_italic', 'mceButtonSelected');
+
+		if (doc.queryCommandState("Underline") && (node.parentNode == null || node.parentNode.nodeName != "A"))
+			tinyMCE.switchClassSticky(editor_id + '_underline', 'mceButtonSelected');
+
+		if (doc.queryCommandState("Strikethrough"))
+			tinyMCE.switchClassSticky(editor_id + '_strikethrough', 'mceButtonSelected');
+	}
+
+	// Handle elements
+	do {
+		switch (node.nodeName.toLowerCase()) {
+			case "b":
+			case "strong":
+				tinyMCE.switchClassSticky(editor_id + '_bold', 'mceButtonSelected');
+			break;
+
+			case "i":
+			case "em":
+				tinyMCE.switchClassSticky(editor_id + '_italic', 'mceButtonSelected');
+			break;
+
+			case "u":
+				tinyMCE.switchClassSticky(editor_id + '_underline', 'mceButtonSelected');
+			break;
+
+			case "strike":
+				tinyMCE.switchClassSticky(editor_id + '_strikethrough', 'mceButtonSelected');
+			break;
+
+			case "ul":
+				tinyMCE.switchClassSticky(editor_id + '_bullist', 'mceButtonSelected');
+			break;
+
+			case "ol":
+				tinyMCE.switchClassSticky(editor_id + '_numlist', 'mceButtonSelected');
+			break;
+
+			case "sub":
+				tinyMCE.switchClassSticky(editor_id + '_sub', 'mceButtonSelected');
+			break;
+
+			case "sup":
+				tinyMCE.switchClassSticky(editor_id + '_sup', 'mceButtonSelected');
+			break;
+
+            case "hr":
+                tinyMCE.switchClassSticky(editor_id + '_hr', 'mceButtonSelected');
+            break;
+
+            case "img":
+				if (tinyMCE.getAttrib(node, 'name').indexOf('mce_') != 0)
+					tinyMCE.switchClassSticky(editor_id + '_image', 'mceButtonSelected');
+            break;
+		}
+	} while ((node = node.parentNode));
+}
+
+// This function auto imports CSS classes into the class selection droplist
+function TinyMCE_advanced_setupCSSClasses(editor_id) {
+	if (!TinyMCE_advanced_autoImportCSSClasses)
+		return;
+
+	var selectElm = document.getElementById(editor_id + '_styleSelect');
+
+	if (selectElm && selectElm.getAttribute('cssImported') != 'true') {
+		var csses = tinyMCE.getCSSClasses(editor_id);
+		if (csses && selectElm) {
+			for (var i=0; i<csses.length; i++)
+				selectElm.options[selectElm.length] = new Option(csses[i], csses[i]);
+		}
+
+		// Only do this once
+		if (csses != null && csses.length > 0)
+			selectElm.setAttribute('cssImported', 'true');
+	}
+}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/themes/advanced/editor_ui.css b/source/web/scripts/tiny_mce/themes/advanced/editor_ui.css
new file mode 100644
index 0000000000..693ab5de0e
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/editor_ui.css
@@ -0,0 +1,148 @@
+.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
+	margin-top: 1px;
+	margin-left: 1px;
+}
+
+.mceButtonNormal {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: arrow;
+}
+
+.mceButtonOver {
+/*	border-top: 1px solid buttonhighlight;
+	border-left: 1px solid buttonhighlight;
+	border-bottom: 1px solid buttonshadow;
+	border-right: 1px solid buttonshadow;*/
+	border: 1px solid #0A246A;
+	cursor: arrow;
+	background-color: #B6BDD2;
+}
+
+.mceButtonDown {
+/*	border-bottom: 1px solid buttonhighlight;
+	border-right: 1px solid buttonhighlight;
+	border-top: 1px solid buttonshadow;
+	border-left: 1px solid buttonshadow;*/
+	cursor: arrow;
+	border: 1px solid #0A246A;
+	background-color: #8592B5;
+}
+
+.mceButtonSelected {
+	border: 1px solid;
+	border-color: #C0C0BB;
+	cursor: arrow;
+}
+
+.mceButtonDisabled {
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+	-moz-opacity:0.3;
+	opacity: 0.3;
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: arrow;
+}
+
+.mceSeparator {
+	border-top: 1px solid buttonhighlight;
+	border-left: 1px solid buttonhighlight;
+	border-bottom: 1px solid buttonshadow;
+	border-right: 1px solid buttonshadow;
+	margin-right: 2px;
+	margin-left: 2px;
+}
+
+.mceSeparatorLine {
+	margin:2px;
+	margin-left: 4px;
+	background-color: #F0F0EE;
+	border-top: 1px solid buttonshadow;
+	border-left: 1px solid buttonshadow;
+	border-bottom: 1px solid buttonhighlight;
+	border-right: 1px solid buttonhighlight;
+	width: 0px;
+	height: 15px;
+}
+
+.mceSelectList {
+	font-family: "MS Sans Serif";
+	font-size: 7pt;
+	font-weight: normal;
+	margin-top: 3px;
+	padding: 0px;
+	display: inline;
+	vertical-align: top;
+	background-color: #F0F0EE
+}
+
+.mceLabel, .mceLabelDisabled {
+	font-family: "MS Sans Serif";
+	font-size: 9pt;
+}
+
+.mceLabel {
+	color: #000000;
+}
+
+.mceLabelDisabled {
+	cursor: text;
+	color: #999999;
+}
+
+.mceEditor {
+	background: #F0F0EE;
+	border: 1px solid #cccccc;
+}
+
+.mceEditorArea {
+	font-family: "MS Sans Serif";
+	background: #FFFFFF;
+}
+
+.mceToolbarTop, .mceToolbarBottom {
+	background: #F0F0EE;
+}
+
+.mceToolbarTop {
+	border-bottom: 1px solid #cccccc;
+}
+
+.mceToolbarBottom {
+	border-top: 1px solid #cccccc;
+}
+
+.mcePathTop, .mcePathBottom, .mcePath {
+	font-family: "MS Sans Serif";
+	font-size: 9pt;
+	padding: 2px;
+	height: 20px;
+}
+
+.mcePathTop {
+	border-bottom: 1px solid #cccccc;
+}
+
+.mcePathBottom {
+	border-top: 1px solid #cccccc;
+}
+
+.mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {
+	text-decoration: none;
+	font-family: "MS Sans Serif";
+	font-size: 9pt;
+}
+
+.mcePathItem:hover {
+	text-decoration: underline;
+}
+
+.mcePath {
+	border-bottom: 1px solid #cccccc;
+}
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/themes/advanced/image.htm b/source/web/scripts/tiny_mce/themes/advanced/image.htm
new file mode 100644
index 0000000000..04a8258fd8
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/image.htm
@@ -0,0 +1,193 @@
+<html>
+<head>
+<title>{$lang_insert_image_title}</title>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript">
+var url = tinyMCE.getParam("external_image_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/')
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '?rnd=' + new Date().getTime() + '"></sc'+'ript>');
+}
+</script>
+<script language="javascript">
+	// Disable auto resize
+	tinyMCE.getWindowArg('mce_windowresize', false);
+
+	function insertImage() {
+		if (window.opener) {
+			var src = document.forms[0].src.value;
+			var alt = document.forms[0].alt.value;
+			var border = document.forms[0].border.value;
+			var vspace = document.forms[0].vspace.value;
+			var hspace = document.forms[0].hspace.value;
+			var width = document.forms[0].width.value;
+			var height = document.forms[0].height.value;
+			var align = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+
+			window.opener.tinyMCE.insertImage(src, alt, border, hspace, vspace, width, height, align);
+			top.close();
+		}
+	}
+
+	function init() {
+		var formObj = document.forms[0];
+
+		for (var i=0; i<document.forms[0].align.options.length; i++) {
+			if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
+				document.forms[0].align.options.selectedIndex = i;
+		}
+
+		formObj.src.value = tinyMCE.getWindowArg('src');
+		formObj.alt.value = tinyMCE.getWindowArg('alt');
+		formObj.border.value = tinyMCE.getWindowArg('border');
+		formObj.vspace.value = tinyMCE.getWindowArg('vspace');
+		formObj.hspace.value = tinyMCE.getWindowArg('hspace');
+		formObj.width.value = tinyMCE.getWindowArg('width');
+		formObj.height.value = tinyMCE.getWindowArg('height');
+		formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 
+
+		// Handle file browser
+		if (tinyMCE.getParam("file_browser_callback") != null) {
+			document.getElementById('src').style.width = '180px';
+
+			var html = '';
+
+			html += '<img id="browserBtn" src="images/browse.gif"';
+			html += ' onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');"';
+			html += ' onmouseout="tinyMCE.restoreClass(this);"';
+			html += ' onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');"';
+			html += ' onclick="javascript:tinyMCE.openFileBrowser(\'src\',document.forms[0].src.value,\'image\',window);"';
+			html += ' width="20" height="18" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';
+			html += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" />';
+
+			document.getElementById('browser').innerHTML = html;
+		}
+
+		// Auto select image in list
+		if (typeof(tinyMCEImageList) != "undefined" && tinyMCEImageList.length > 0) {
+			for (var i=0; i<formObj.image_list.length; i++) {
+				if (formObj.image_list.options[i].value == tinyMCE.getWindowArg('src'))
+					formObj.image_list.options[i].selected = true;
+			}
+		}
+
+		// Autoresize and focus
+		TinyMCEPopup_autoResize();
+		window.focus();
+	}
+
+	function cancelAction() {
+		top.close();
+	}
+
+	var preloadImg = new Image();
+
+	function resetImageData() {
+		var formObj = document.forms[0];
+		formObj.width.value = formObj.height.value = "";	
+	}
+
+	function updateImageData() {
+		var formObj = document.forms[0];
+
+		if (formObj.width.value == "")
+			formObj.width.value = preloadImg.width;
+
+		if (formObj.height.value == "")
+			formObj.height.value = preloadImg.height;
+	}
+
+	function getImageData() {
+		preloadImg = new Image();
+		tinyMCE.addEvent(preloadImg, "load", updateImageData);
+		tinyMCE.addEvent(preloadImg, "error", function () {var formObj = document.forms[0];formObj.width.value = formObj.height.value = "";});
+		preloadImg.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], document.forms[0].src.value);
+	}
+</script>
+</head>
+<body onload="window.focus();init();">
+<form onsubmit="insertImage();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="2" class="title" nowrap="nowrap">{$lang_insert_image_title}</td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_src}:</td>
+            <td><table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td><input name="src" type="text" id="src" value="" style="width: 200px" onchange="getImageData();"></td>
+                  <td id="browser"></td>
+                </tr>
+              </table></td>
+          </tr>
+		  <!-- Image list -->
+		  <script language="javascript">
+			if (typeof(tinyMCEImageList) != "undefined" && tinyMCEImageList.length > 0) {
+				var html = "";
+
+				html += '<tr><td>{$lang_image_list}:</td>';
+				html += '<td><select name="image_list" style="width: 200px" onchange="this.form.src.value=this.options[this.selectedIndex].value;resetImageData();getImageData();">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCEImageList.length; i++)
+					html += '<option value="' + tinyMCEImageList[i][1] + '">' + tinyMCEImageList[i][0] + '</option>';
+
+				html += '</select></td></tr>';
+
+				document.write(html);
+			}
+		  </script>
+		  <!-- /Image list -->
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_alt}:</td>
+            <td><input name="alt" type="text" id="alt" value="" style="width: 200px"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_align}:</td>
+            <td><select name="align">
+                <option value="">{$lang_insert_image_align_default}</option>
+                <option value="baseline">{$lang_insert_image_align_baseline}</option>
+                <option value="top">{$lang_insert_image_align_top}</option>
+                <option value="middle">{$lang_insert_image_align_middle}</option>
+                <option value="bottom">{$lang_insert_image_align_bottom}</option>
+                <option value="texttop">{$lang_insert_image_align_texttop}</option>
+                <option value="absmiddle">{$lang_insert_image_align_absmiddle}</option>
+                <option value="absbottom">{$lang_insert_image_align_absbottom}</option>
+                <option value="left">{$lang_insert_image_align_left}</option>
+                <option value="right">{$lang_insert_image_align_right}</option>
+              </select></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_dimensions}:</td>
+            <td><input name="width" type="text" id="width" value="" size="3" maxlength="3">
+              x
+              <input name="height" type="text" id="height" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_border}:</td>
+            <td><input name="border" type="text" id="border" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_vspace}:</td>
+            <td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_hspace}:</td>
+            <td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3"></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertImage();">
+            </td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/anchor.gif b/source/web/scripts/tiny_mce/themes/advanced/images/anchor.gif
new file mode 100644
index 0000000000..ae7b2f3959
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/anchor.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/backcolor.gif b/source/web/scripts/tiny_mce/themes/advanced/images/backcolor.gif
new file mode 100644
index 0000000000..d44277dd6c
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/backcolor.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/bold.gif b/source/web/scripts/tiny_mce/themes/advanced/images/bold.gif
new file mode 100644
index 0000000000..31f004b24f
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/bold.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/bold_de_se.gif b/source/web/scripts/tiny_mce/themes/advanced/images/bold_de_se.gif
new file mode 100644
index 0000000000..2d86b00314
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/bold_de_se.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/bold_fr.gif b/source/web/scripts/tiny_mce/themes/advanced/images/bold_fr.gif
new file mode 100644
index 0000000000..7782282838
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/bold_fr.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/bold_ru.gif b/source/web/scripts/tiny_mce/themes/advanced/images/bold_ru.gif
new file mode 100644
index 0000000000..c9e89b27e5
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/bold_ru.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/browse.gif b/source/web/scripts/tiny_mce/themes/advanced/images/browse.gif
new file mode 100644
index 0000000000..590f2de43f
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/browse.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/bullist.gif b/source/web/scripts/tiny_mce/themes/advanced/images/bullist.gif
new file mode 100644
index 0000000000..12d0ec2299
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/bullist.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/buttons.gif b/source/web/scripts/tiny_mce/themes/advanced/images/buttons.gif
new file mode 100644
index 0000000000..b5e454c17e
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/buttons.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/center.gif b/source/web/scripts/tiny_mce/themes/advanced/images/center.gif
new file mode 100644
index 0000000000..a9e13e004c
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/center.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/charmap.gif b/source/web/scripts/tiny_mce/themes/advanced/images/charmap.gif
new file mode 100644
index 0000000000..b826f88823
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/charmap.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/cleanup.gif b/source/web/scripts/tiny_mce/themes/advanced/images/cleanup.gif
new file mode 100644
index 0000000000..87b8f87a2f
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/cleanup.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/code.gif b/source/web/scripts/tiny_mce/themes/advanced/images/code.gif
new file mode 100644
index 0000000000..e16da11e91
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/code.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/copy.gif b/source/web/scripts/tiny_mce/themes/advanced/images/copy.gif
new file mode 100644
index 0000000000..f0b51871e2
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/copy.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/custom_1.gif b/source/web/scripts/tiny_mce/themes/advanced/images/custom_1.gif
new file mode 100644
index 0000000000..5e385c0549
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/custom_1.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/cut.gif b/source/web/scripts/tiny_mce/themes/advanced/images/cut.gif
new file mode 100644
index 0000000000..6a969e55bd
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/cut.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/forecolor.gif b/source/web/scripts/tiny_mce/themes/advanced/images/forecolor.gif
new file mode 100644
index 0000000000..db21e1cbee
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/forecolor.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/full.gif b/source/web/scripts/tiny_mce/themes/advanced/images/full.gif
new file mode 100644
index 0000000000..5a78c63067
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/full.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/help.gif b/source/web/scripts/tiny_mce/themes/advanced/images/help.gif
new file mode 100644
index 0000000000..a5d67714bc
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/help.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/hr.gif b/source/web/scripts/tiny_mce/themes/advanced/images/hr.gif
new file mode 100644
index 0000000000..8e6b34dc68
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/hr.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/image.gif b/source/web/scripts/tiny_mce/themes/advanced/images/image.gif
new file mode 100644
index 0000000000..36109de73c
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/image.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/indent.gif b/source/web/scripts/tiny_mce/themes/advanced/images/indent.gif
new file mode 100644
index 0000000000..7a17288c55
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/indent.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/italic.gif b/source/web/scripts/tiny_mce/themes/advanced/images/italic.gif
new file mode 100644
index 0000000000..ec03278f34
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/italic.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/italic_de_se.gif b/source/web/scripts/tiny_mce/themes/advanced/images/italic_de_se.gif
new file mode 100644
index 0000000000..6ce0d8d466
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/italic_de_se.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/italic_ru.gif b/source/web/scripts/tiny_mce/themes/advanced/images/italic_ru.gif
new file mode 100644
index 0000000000..5c2f7fec27
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/italic_ru.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/left.gif b/source/web/scripts/tiny_mce/themes/advanced/images/left.gif
new file mode 100644
index 0000000000..4225e00775
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/left.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/link.gif b/source/web/scripts/tiny_mce/themes/advanced/images/link.gif
new file mode 100644
index 0000000000..0de427490e
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/link.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/newdocument.gif b/source/web/scripts/tiny_mce/themes/advanced/images/newdocument.gif
new file mode 100644
index 0000000000..79a93da5cc
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/newdocument.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/numlist.gif b/source/web/scripts/tiny_mce/themes/advanced/images/numlist.gif
new file mode 100644
index 0000000000..7ff907be75
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/numlist.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/outdent.gif b/source/web/scripts/tiny_mce/themes/advanced/images/outdent.gif
new file mode 100644
index 0000000000..53e89a77f4
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/outdent.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/paste.gif b/source/web/scripts/tiny_mce/themes/advanced/images/paste.gif
new file mode 100644
index 0000000000..a676604cf6
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/paste.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/redo.gif b/source/web/scripts/tiny_mce/themes/advanced/images/redo.gif
new file mode 100644
index 0000000000..26a146bdaf
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/redo.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/removeformat.gif b/source/web/scripts/tiny_mce/themes/advanced/images/removeformat.gif
new file mode 100644
index 0000000000..38a9cdf96c
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/removeformat.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/right.gif b/source/web/scripts/tiny_mce/themes/advanced/images/right.gif
new file mode 100644
index 0000000000..88bfaf2542
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/right.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/spacer.gif b/source/web/scripts/tiny_mce/themes/advanced/images/spacer.gif
new file mode 100644
index 0000000000..fc2560981e
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/spacer.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/strikethrough.gif b/source/web/scripts/tiny_mce/themes/advanced/images/strikethrough.gif
new file mode 100644
index 0000000000..ce7b65304e
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/strikethrough.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/sub.gif b/source/web/scripts/tiny_mce/themes/advanced/images/sub.gif
new file mode 100644
index 0000000000..481840702b
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/sub.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/sup.gif b/source/web/scripts/tiny_mce/themes/advanced/images/sup.gif
new file mode 100644
index 0000000000..03f8efc63d
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/sup.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table.gif
new file mode 100644
index 0000000000..f8a00544a9
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_col.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_col.gif
new file mode 100644
index 0000000000..0b2f0fb612
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_col.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_row.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_row.gif
new file mode 100644
index 0000000000..1997065fb2
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_delete_row.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_after.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_after.gif
new file mode 100644
index 0000000000..c30dafab6f
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_after.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_before.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_before.gif
new file mode 100644
index 0000000000..5d1ff37afe
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_col_before.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_after.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_after.gif
new file mode 100644
index 0000000000..c3aa15f93a
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_after.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_before.gif b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_before.gif
new file mode 100644
index 0000000000..c3271e5493
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/table_insert_row_before.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/underline.gif b/source/web/scripts/tiny_mce/themes/advanced/images/underline.gif
new file mode 100644
index 0000000000..d6b8afdabd
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/underline.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/underline_fr.gif b/source/web/scripts/tiny_mce/themes/advanced/images/underline_fr.gif
new file mode 100644
index 0000000000..a8e3018a18
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/underline_fr.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/underline_ru.gif b/source/web/scripts/tiny_mce/themes/advanced/images/underline_ru.gif
new file mode 100644
index 0000000000..2a517e8b6b
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/underline_ru.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/undo.gif b/source/web/scripts/tiny_mce/themes/advanced/images/undo.gif
new file mode 100644
index 0000000000..b0722d06c6
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/undo.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/unlink.gif b/source/web/scripts/tiny_mce/themes/advanced/images/unlink.gif
new file mode 100644
index 0000000000..dd073a2b44
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/unlink.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/images/visualaid.gif b/source/web/scripts/tiny_mce/themes/advanced/images/visualaid.gif
new file mode 100644
index 0000000000..188b3487ad
Binary files /dev/null and b/source/web/scripts/tiny_mce/themes/advanced/images/visualaid.gif differ
diff --git a/source/web/scripts/tiny_mce/themes/advanced/langs/en.js b/source/web/scripts/tiny_mce/themes/advanced/langs/en.js
new file mode 100644
index 0000000000..f5ef50b569
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/langs/en.js
@@ -0,0 +1,59 @@
+// UK lang variables
+
+tinyMCELang['lang_theme_style_select'] = 'Styles';
+tinyMCELang['lang_theme_code_desc'] = 'Edit HTML Source';
+tinyMCELang['lang_theme_code_title'] = 'HTML Source Editor';
+tinyMCELang['lang_theme_code_wordwrap'] = 'Word wrap';
+tinyMCELang['lang_theme_sub_desc'] = 'Subscript';
+tinyMCELang['lang_theme_sup_desc'] = 'Superscript';
+tinyMCELang['lang_theme_hr_desc'] = 'Insert horizontal ruler';
+tinyMCELang['lang_theme_removeformat_desc'] = 'Remove formatting';
+tinyMCELang['lang_theme_custom1_desc'] = 'Your custom description here';
+tinyMCELang['lang_insert_image_border'] = 'Border';
+tinyMCELang['lang_insert_image_dimensions'] = 'Dimensions';
+tinyMCELang['lang_insert_image_vspace'] = 'VSpace';
+tinyMCELang['lang_insert_image_hspace'] = 'HSpace';
+tinyMCELang['lang_insert_image_align'] = 'Alignment';
+tinyMCELang['lang_insert_image_align_default'] = 'Default';
+tinyMCELang['lang_insert_image_align_baseline'] = 'Baseline';
+tinyMCELang['lang_insert_image_align_top'] = 'Top';
+tinyMCELang['lang_insert_image_align_middle'] = 'Middle';
+tinyMCELang['lang_insert_image_align_bottom'] = 'Bottom';
+tinyMCELang['lang_insert_image_align_texttop'] = 'TextTop';
+tinyMCELang['lang_insert_image_align_absmiddle'] = 'Absolute Middle';
+tinyMCELang['lang_insert_image_align_absbottom'] = 'Absolute Bottom';
+tinyMCELang['lang_insert_image_align_left'] = 'Left';
+tinyMCELang['lang_insert_image_align_right'] = 'Right';
+tinyMCELang['lang_theme_font_size'] = 'Font size';
+tinyMCELang['lang_theme_fontdefault'] = 'Default';
+tinyMCELang['lang_theme_paragraph'] = 'Paragraph';
+tinyMCELang['lang_theme_div'] = 'Div';
+tinyMCELang['lang_theme_address'] = 'Address';
+tinyMCELang['lang_theme_pre'] = 'Preformatted';
+tinyMCELang['lang_theme_h1'] = 'Heading 1';
+tinyMCELang['lang_theme_h2'] = 'Heading 2';
+tinyMCELang['lang_theme_h3'] = 'Heading 3';
+tinyMCELang['lang_theme_h4'] = 'Heading 4';
+tinyMCELang['lang_theme_h5'] = 'Heading 5';
+tinyMCELang['lang_theme_h6'] = 'Heading 6';
+tinyMCELang['lang_theme_colorpicker_title'] = 'Select a color';
+tinyMCELang['lang_theme_colorpicker_apply'] = 'Apply';
+tinyMCELang['lang_theme_forecolor_desc'] = 'Select text color';
+tinyMCELang['lang_theme_backcolor_desc'] = 'Select background color';
+tinyMCELang['lang_theme_charmap_title'] = 'Select custom character';
+tinyMCELang['lang_theme_charmap_desc'] = 'Insert custom character';
+tinyMCELang['lang_theme_visualaid_desc'] = 'Toggle guidelines/invisible elements';
+tinyMCELang['lang_insert_anchor_title'] = 'Insert/edit anchor';
+tinyMCELang['lang_insert_anchor_name'] = 'Anchor name';
+tinyMCELang['lang_theme_anchor_desc'] = 'Insert/edit anchor';
+tinyMCELang['lang_theme_insert_link_titlefield'] = 'Title';
+tinyMCELang['lang_theme_clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?';
+tinyMCELang['lang_theme_path'] = 'Path';
+tinyMCELang['lang_cut_desc'] = 'Cut';
+tinyMCELang['lang_copy_desc'] = 'Copy';
+tinyMCELang['lang_paste_desc'] = 'Paste';
+tinyMCELang['lang_link_list'] = 'Link list';
+tinyMCELang['lang_image_list'] = 'Image list';
+tinyMCELang['lang_browse'] = 'Browse';
+tinyMCELang['lang_image_props_desc'] = 'Image properties';
+tinyMCELang['lang_newdocument_desc'] = 'New document';
diff --git a/source/web/scripts/tiny_mce/themes/advanced/langs/readme.txt b/source/web/scripts/tiny_mce/themes/advanced/langs/readme.txt
new file mode 100644
index 0000000000..ef48d2ba4a
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/langs/readme.txt
@@ -0,0 +1,4 @@
+Theme specific language packs.
+
+The language pack codes are based on ISO-639-2
+http://www.loc.gov/standards/iso639-2/englangn.html
diff --git a/source/web/scripts/tiny_mce/themes/advanced/link.htm b/source/web/scripts/tiny_mce/themes/advanced/link.htm
new file mode 100644
index 0000000000..bff34c2afa
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/link.htm
@@ -0,0 +1,135 @@
+<html>
+<head>
+<title>{$lang_insert_link_title}</title>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript">
+var url = tinyMCE.getParam("external_link_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/')
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '?rnd=' + new Date().getTime() + '"></sc'+'ript>');
+}
+</script>
+<script language="javascript">
+	// Disable auto resize
+	tinyMCE.getWindowArg('mce_windowresize', false);
+
+	function init() {
+		for (var i=0; i<document.forms[0].target.options.length; i++) {
+			var option = document.forms[0].target.options[i];
+
+			if (option.value == tinyMCE.getWindowArg('target'))
+				option.selected = true;
+		}
+
+		document.forms[0].href.value = tinyMCE.getWindowArg('href');
+		document.forms[0].linktitle.value = tinyMCE.getWindowArg('title');
+		document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 
+
+		// Handle file browser
+		if (tinyMCE.getParam("file_browser_callback") != null) {
+			document.getElementById('href').style.width = '180px';
+
+			var html = '';
+
+			html += '<img id="browserBtn" src="images/browse.gif"';
+			html += ' onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');"';
+			html += ' onmouseout="tinyMCE.restoreClass(this);"';
+			html += ' onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');"';
+			html += ' onclick="javascript:tinyMCE.openFileBrowser(\'href\',document.forms[0].href.value,\'file\',window);"';
+			html += ' width="20" height="18" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';
+			html += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" />';
+
+			document.getElementById('browser').innerHTML = html;
+		}
+
+		// Auto select link in list
+		if (typeof(tinyMCELinkList) != "undefined" && tinyMCELinkList.length > 0) {
+			var formObj = document.forms[0];
+
+			for (var i=0; i<formObj.link_list.length; i++) {
+				if (formObj.link_list.options[i].value == tinyMCE.getWindowArg('href'))
+					formObj.link_list.options[i].selected = true;
+			}
+		}
+
+		// Autoresize and focus
+		TinyMCEPopup_autoResize();
+		window.focus();
+	}
+
+	function insertLink() {
+		if (window.opener) {
+			var href = document.forms[0].href.value;
+			var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
+			var title = document.forms[0].linktitle.value;
+
+			window.opener.tinyMCE.insertLink(href, target, title);
+			top.close();
+		}
+	}
+
+	function cancelAction() {
+		top.close();
+	}
+</script>
+</head>
+<body onload="init();">
+<form onsubmit="insertLink();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="100">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td colspan="2" class="title" nowrap="nowrap">{$lang_insert_link_title}</td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_link_url}:</td>
+            <td>              <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td><input name="href" type="text" id="href" value="" style="width: 200px"></td>
+                  <td id="browser"></td>
+                </tr>
+              </table></td>
+          </tr>
+		  <!-- Link list -->
+		  <script language="javascript">
+			if (typeof(tinyMCELinkList) != "undefined" && tinyMCELinkList.length > 0) {
+				var html = "";
+
+				html += '<tr><td>{$lang_link_list}:</td>';
+				html += '<td><select name="link_list" style="width: 200px" onchange="this.form.href.value=this.options[this.selectedIndex].value;">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCELinkList.length; i++)
+					html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+				html += '</select></td></tr>';
+
+				document.write(html);
+			}
+		  </script>
+		  <!-- /Link list -->
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_link_target}:</td>
+            <td><select name="target" style="width: 200px">
+                <option value="_self">{$lang_insert_link_target_same}</option>
+                <option value="_blank">{$lang_insert_link_target_blank}</option>
+            </select></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_theme_insert_link_titlefield}:</td>
+            <td><input name="linktitle" type="text" id="linktitle" value="" style="width: 200px"></td>
+          </tr>
+          <tr>
+            <td><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertLink();">
+            </td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/themes/advanced/source_editor.htm b/source/web/scripts/tiny_mce/themes/advanced/source_editor.htm
new file mode 100644
index 0000000000..f3a9991be3
--- /dev/null
+++ b/source/web/scripts/tiny_mce/themes/advanced/source_editor.htm
@@ -0,0 +1,88 @@
+<html>
+<head>
+<title>{$lang_theme_code_title}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript" type="text/javascript">
+<!--
+	tinyMCE.setWindowArg('mce_windowresize', false);
+
+    function saveContent() {
+        if (window.opener) {
+            window.opener.tinyMCE.setContent(document.getElementById('htmlSource').value);
+            window.close();
+        }
+    }
+
+    // Fixes some charcode issues
+    function fixContent(html) {
+        html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
+        html = html.replace(new RegExp('<\/(p|ol|ul|li|table|tr|td|blockquote|object)>', 'gi'),'</$1>\n');
+        html = tinyMCE.regexpReplace(html, '<br />','<br />\n','gi');
+        html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');
+        return html;
+    }
+
+    function onLoadInit() {
+        document.forms[0].htmlSource.value = fixContent(tinyMCE.getContent(tinyMCE.getWindowArg('editor_id')));
+        resizeInputs();
+        setWrap('off');
+    }
+
+    function setWrap(val) {
+        // hard soft off
+        document.forms[0].htmlSource.wrap = val;
+    }
+
+	function toggleWordWrap(elm) {
+		if (elm.checked)
+			setWrap('soft');
+		else
+			setWrap('off');
+	}
+
+    var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+    function resizeInputs() {
+        if (!tinyMCE.isMSIE) {
+             wHeight = self.innerHeight-80;
+             wWidth = self.innerWidth-25;
+        } else {
+             wHeight = document.body.clientHeight-80;
+             wWidth = document.body.clientWidth-25;
+        }
+
+        document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
+        document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
+            
+    }
+
+    window.focus();
+//-->
+</script>
+</head>
+<body scroll="no" onload="onLoadInit();" onresize="resizeInputs();">
+<form name="source" onsubmit="saveContent();">
+    <table border="0" cellpadding="0" cellspacing="2" align="center">
+        <tr>
+            <td class="title">{$lang_theme_code_title}</td>
+            <td align="right"><script language="javascript" type="text/javascript">
+<!--
+    if (tinyMCE.isMSIE) {
+        document.write('<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{$lang_theme_code_wordwrap}</label>');
+    }
+//-->
+            </script></td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft"></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" align="right"><input type="button" id="insert" name="insert" value="{$lang_update}" onclick="saveContent();" /></td>
+        </tr>
+    </table>
+</form>
+</body>
+</html>
diff --git a/source/web/scripts/tiny_mce/tiny_mce.js b/source/web/scripts/tiny_mce/tiny_mce.js
new file mode 100644
index 0000000000..c07b3ed442
--- /dev/null
+++ b/source/web/scripts/tiny_mce/tiny_mce.js
@@ -0,0 +1,12 @@
+/**
+ * $RCSfile: tiny_mce.js,v $
+ * $Revision: 1.240 $
+ * $Date: 2005/05/27 09:53:43 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
+ */
+ function TinyMCE(){this.instances=new Array();this.stickyClassesLookup=new Array();this.windowArgs=new Array();this.loadedFiles=new Array();this.configs=new Array();this.currentConfig=0;this.eventHandlers=new Array();this.isMSIE=(navigator.appName=="Microsoft Internet Explorer");this.isMSIE5=this.isMSIE&&(navigator.userAgent.indexOf('MSIE 5')!=-1);this.isMSIE5_0=this.isMSIE&&(navigator.userAgent.indexOf('MSIE 5.0')!=-1);this.isGecko=navigator.userAgent.indexOf('Gecko')!=-1;this.isSafari=navigator.userAgent.indexOf('Safari')!=-1;if(this.isSafari)alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.");this.idCounter=0;};TinyMCE.prototype.defParam=function(key,def_val){this.settings[key]=tinyMCE.getParam(key,def_val);};TinyMCE.prototype.init=function(settings){var theme;this.settings=settings;if(typeof(document.execCommand)=='undefined')return;if(!tinyMCE.baseURL){var elements=document.getElementsByTagName('script');for(var i=0;i<elements.length;i++){if(elements[i].src&&(elements[i].src.indexOf("tiny_mce.js")!=-1||elements[i].src.indexOf("tiny_mce_src.js")!=-1)){var src=elements[i].src;tinyMCE.srcMode=(src.indexOf('_src')!=-1)?'_src':'';src=src.substring(0,src.lastIndexOf('/'));tinyMCE.baseURL=src;break;}}}this.documentBasePath=document.location.href;if(this.documentBasePath.indexOf('?')!=-1)this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.indexOf('?'));this.documentURL=this.documentBasePath;this.documentBasePath=this.documentBasePath.substring(0,this.documentBasePath.lastIndexOf('/'));if(tinyMCE.baseURL.indexOf('://')==-1&&tinyMCE.baseURL.charAt(0)!='/'){tinyMCE.baseURL=this.documentBasePath+"/"+tinyMCE.baseURL;}this.defParam("mode","none");this.defParam("theme","advanced");this.defParam("plugins","",true);this.defParam("language","en");this.defParam("docs_language",this.settings['language']);this.defParam("elements","");this.defParam("textarea_trigger","mce_editable");this.defParam("valid_elements","+a[name|href|target|title],strong/b[class],em/i[class],strike[class],u[class],p[dir|class|align],ol,ul,li,br,img[class|src|border=0|alt|title|hspace|vspace|width|height|align],sub,sup,blockquote[dir|style],table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class|align],address[class|align],h1[dir|class|align],h2[dir|class|align],h3[dir|class|align],h4[dir|class|align],h5[dir|class|align],h6[dir|class|align],hr");this.defParam("extended_valid_elements","");this.defParam("invalid_elements","");this.defParam("encoding","");this.defParam("urlconverter_callback",tinyMCE.getParam("urlconvertor_callback","TinyMCE.prototype.convertURL"));this.defParam("save_callback","");this.defParam("debug",false);this.defParam("force_br_newlines",false);this.defParam("force_p_newlines",true);this.defParam("add_form_submit_trigger",true);this.defParam("relative_urls",true);this.defParam("remove_script_host",true);this.defParam("focus_alert",true);this.defParam("document_base_url",this.documentURL);this.defParam("visual",true);this.defParam("visual_table_class","mceVisualAid");this.defParam("setupcontent_callback","");this.defParam("fix_content_duplication",true);this.defParam("custom_undo_redo",true);this.defParam("custom_undo_redo_levels",-1);this.defParam("custom_undo_redo_keyboard_shortcuts",true);this.defParam("verify_css_classes",false);this.defParam("trim_span_elements",true);this.defParam("verify_html",true);this.defParam("apply_source_formatting",false);this.defParam("directionality","ltr");this.defParam("auto_cleanup_word",false);this.defParam("cleanup_on_startup",false);this.defParam("inline_styles",false);this.defParam("convert_newlines_to_brs",false);this.defParam("auto_reset_designmode",false);this.defParam("entities","160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute");this.defParam("entity_encoding","named");this.defParam("cleanup_callback","");this.defParam("add_unload_trigger",true);this.defParam("ask",false);this.defParam("nowrap",false);this.defParam("auto_resize",false);this.defParam("auto_focus",false);this.defParam("cleanup",true);this.defParam("remove_linebreaks",true);this.defParam("button_tile_map",false);this.defParam("submit_patch",true);var baseHREF=tinyMCE.settings['document_base_url'];if(baseHREF.indexOf('?')!=-1)baseHREF=baseHREF.substring(0,baseHREF.indexOf('?'));this.settings['base_href']=baseHREF.substring(0,baseHREF.lastIndexOf('/'))+"/";theme=this.settings['theme'];this.blockRegExp=new RegExp("^(h1|h2|h3|h4|h5|h6|p|div|address|pre|form|table|li|ol|ul|td)$","i");this.settings['theme_href']=tinyMCE.baseURL+"/themes/"+theme;if(!tinyMCE.isMSIE)this.settings['force_br_newlines']=false;if(tinyMCE.getParam("content_css",false)){var cssPath=tinyMCE.getParam("content_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['content_css']=this.documentBasePath+"/"+cssPath;else this.settings['content_css']=cssPath;}else this.settings['content_css']=tinyMCE.baseURL+"/themes/"+theme+"/editor_content.css";if(tinyMCE.getParam("popups_css",false)){var cssPath=tinyMCE.getParam("popups_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['popups_css']=this.documentBasePath+"/"+cssPath;else this.settings['popups_css']=cssPath;}else this.settings['popups_css']=tinyMCE.baseURL+"/themes/"+theme+"/editor_popup.css";if(tinyMCE.getParam("editor_css",false)){var cssPath=tinyMCE.getParam("editor_css","");if(cssPath.indexOf('://')==-1&&cssPath.charAt(0)!='/')this.settings['editor_css']=this.documentBasePath+"/"+cssPath;else this.settings['editor_css']=cssPath;}else this.settings['editor_css']=tinyMCE.baseURL+"/themes/"+theme+"/editor_ui.css";if(tinyMCE.settings['debug']){var msg="Debug: \n";msg+="baseURL: "+this.baseURL+"\n";msg+="documentBasePath: "+this.documentBasePath+"\n";msg+="content_css: "+this.settings['content_css']+"\n";msg+="popups_css: "+this.settings['popups_css']+"\n";msg+="editor_css: "+this.settings['editor_css']+"\n";alert(msg);}this._initCleanup();if(this.configs.length==0){tinyMCE.addEvent(window,"load",TinyMCE.prototype.onLoad);if(tinyMCE.isMSIE){if(tinyMCE.settings['add_unload_trigger']){tinyMCE.addEvent(window,"unload",TinyMCE.prototype.unloadHandler);tinyMCE.addEvent(window.document,"beforeunload",TinyMCE.prototype.unloadHandler);}}else{if(tinyMCE.settings['add_unload_trigger'])tinyMCE.addEvent(window,"unload",function(){tinyMCE.triggerSave(true,true);});}}this.loadScript(tinyMCE.baseURL+'/themes/'+this.settings['theme']+'/editor_template'+tinyMCE.srcMode+'.js');this.loadScript(tinyMCE.baseURL+'/langs/'+this.settings['language']+'.js');this.loadCSS(this.settings['editor_css']);var themePlugins=tinyMCE.getParam('plugins','',true,',');if(this.settings['plugins']!=''){for(var i=0;i<themePlugins.length;i++)this.loadScript(tinyMCE.baseURL+'/plugins/'+themePlugins[i]+'/editor_plugin'+tinyMCE.srcMode+'.js');}settings['index']=this.configs.length;this.configs[this.configs.length]=settings;};TinyMCE.prototype.loadScript=function(url){for(var i=0;i<this.loadedFiles.length;i++){if(this.loadedFiles[i]==url)return;}document.write('<sc'+'ript language="javascript" type="text/javascript" src="'+url+'"></script>');this.loadedFiles[this.loadedFiles.length]=url;};TinyMCE.prototype.loadCSS=function(url){for(var i=0;i<this.loadedFiles.length;i++){if(this.loadedFiles[i]==url)return;}document.write('<link href="'+url+'" rel="stylesheet" type="text/css" />');this.loadedFiles[this.loadedFiles.length]=url;};TinyMCE.prototype.importCSS=function(doc,css_file){if(tinyMCE.isMSIE)var styleSheet=doc.createStyleSheet(css_file);else{var elm=doc.createElement("link");elm.rel="stylesheet";elm.href=css_file;if(headArr=doc.getElementsByTagName("head"))headArr[0].appendChild(elm);}};TinyMCE.prototype.confirmAdd=function(e,settings){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var elementId=elm.name?elm.name:elm.id;tinyMCE.settings=settings;if(!elm.getAttribute('mce_noask')&&confirm(tinyMCELang['lang_edit_confirm']))tinyMCE.addMCEControl(elm,elementId);elm.setAttribute('mce_noask','true');};TinyMCE.prototype.queryInstanceCommandValue=function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.getDoc().queryCommandValue(command);return null;};TinyMCE.prototype.queryInstanceCommandState=function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.getDoc().queryCommandState(command);return null;};TinyMCE.prototype.updateContent=function(form_element_name){var formElement=document.getElementById(form_element_name);for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];inst.switchSettings();if(inst.formElement==formElement){var doc=inst.getDoc();tinyMCE._setHTML(doc,inst.formElement.value);if(!tinyMCE.isMSIE)doc.body.innerHTML=tinyMCE._cleanupHTML(doc,this.settings,doc.body,inst.visualAid);}}};TinyMCE.prototype.addMCEControl=function(replace_element,form_element_name,target_document){var id="mce_editor_"+tinyMCE.idCounter++;var inst=new TinyMCEControl(tinyMCE.settings);inst.editorId=id;this.instances[id]=inst;inst.onAdd(replace_element,form_element_name,target_document);};TinyMCE.prototype.triggerSave=function(skip_cleanup,skip_callback){for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];inst.switchSettings();tinyMCE.settings['preformatted']=false;if(typeof(skip_cleanup)=="undefined")skip_cleanup=false;if(typeof(skip_callback)=="undefined")skip_callback=false;tinyMCE._setHTML(inst.getDoc(),inst.getBody().innerHTML);var htm=skip_cleanup?inst.getBody().innerHTML:tinyMCE._cleanupHTML(inst.getDoc(),this.settings,inst.getBody(),this.visualAid,true);if(tinyMCE.settings["encoding"]=="xml"||tinyMCE.settings["encoding"]=="html")htm=tinyMCE.convertStringToXML(htm);if(!skip_callback&&tinyMCE.settings['save_callback']!="")var content=eval(tinyMCE.settings['save_callback']+"(inst.formTargetElementId,htm,inst.getBody());");if((typeof(content)!="undefined")&&content!=null)htm=content;htm=tinyMCE.regexpReplace(htm,"&#40;","(","gi");htm=tinyMCE.regexpReplace(htm,"&#41;",")","gi");htm=tinyMCE.regexpReplace(htm,"&#59;",";","gi");htm=tinyMCE.regexpReplace(htm,"&#34;","&quot;","gi");htm=tinyMCE.regexpReplace(htm,"&#94;","^","gi");if(inst.formElement)inst.formElement.value=htm;}};TinyMCE.prototype._convertOnClick=function(node){if(tinyMCE.isMSIE5)return;var elms=node.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var onclick=elms[i].getAttribute('onclick');if(onclick&&onclick!=""){elms[i].removeAttribute("onclick");elms[i].setAttribute("mce_onclick",tinyMCE.cleanupEventStr(""+onclick));elms[i].onclick=null;}}};TinyMCE.prototype.resetForm=function(form_index){var formObj=document.forms[form_index];for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];inst.switchSettings();for(var i=0;i<formObj.elements.length;i++){if(inst.formTargetElementId==formObj.elements[i].name){inst.getBody().innerHTML=formObj.elements[i].value;return;}}}};TinyMCE.prototype.execInstanceCommand=function(editor_id,command,user_interface,value,focus){var inst=tinyMCE.getInstanceById(editor_id);if(inst){if(typeof(focus)=="undefined")focus=true;if(focus)inst.contentWindow.focus();inst.autoResetDesignMode();this.selectedElement=inst.getFocusElement();this.selectedInstance=inst;tinyMCE.execCommand(command,user_interface,value);}};TinyMCE.prototype.execCommand=function(command,user_interface,value){user_interface=user_interface?user_interface:false;value=value?value:null;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();switch(command){case 'mceHelp':window.open(tinyMCE.themeURL+"/docs/"+this.settings['docs_language']+"/index.htm","mceHelp","menubar=yes,toolbar=yes,scrollbars=yes,left=20,top=20,width=550,height=600");return;case 'mceFocus':var inst=tinyMCE.getInstanceById(value);if(inst)inst.contentWindow.focus();return;case "mceAddControl":case "mceAddEditor":tinyMCE.addMCEControl(tinyMCE._getElementById(value),value);return;case "mceAddFrameControl":tinyMCE.addMCEControl(tinyMCE._getElementById(value),value['element'],value['document']);return;case "mceRemoveControl":case "mceRemoveEditor":tinyMCE.removeMCEControl(value);return;case "mceResetDesignMode":if(!tinyMCE.isMSIE){for(var n in tinyMCE.instances){try{tinyMCE.instances[n].getDoc().designMode="on";}catch(e){}}}return;}if(this.selectedInstance)this.selectedInstance.execCommand(command,user_interface,value);else if(tinyMCE.settings['focus_alert'])alert(tinyMCELang['lang_focus_alert']);};TinyMCE.prototype.eventPatch=function(editor_id){if(typeof(tinyMCE)=="undefined")return true;for(var i=0;i<document.frames.length;i++){if(document.frames[i].event){var event=document.frames[i].event;event.target=event.srcElement;event.target.editor_id=document.frames[i].editor_id;TinyMCE.prototype.handleEvent(event);return;}}};TinyMCE.prototype.unloadHandler=function(){tinyMCE.triggerSave(true,true);};TinyMCE.prototype.addEventHandlers=function(editor_id){if(tinyMCE.isMSIE){var doc=document.frames[editor_id].document;document.frames[editor_id].editor_id=editor_id;tinyMCE.addEvent(doc,"keypress",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(doc,"keyup",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(doc,"keydown",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(doc,"mouseup",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(doc,"click",TinyMCE.prototype.eventPatch);}else{var inst=tinyMCE.instances[editor_id];var doc=inst.getDoc();inst.switchSettings();doc.editor_id=editor_id;tinyMCE.addEvent(doc,"keypress",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keypress",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keydown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"keyup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"click",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mouseup",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"mousedown",tinyMCE.handleEvent);tinyMCE.addEvent(doc,"focus",tinyMCE.handleEvent);eval('try { doc.designMode = "On"; } catch(e) {}');}};TinyMCE.prototype._createIFrame=function(replace_element){var iframe=document.createElement("iframe");var id=replace_element.getAttribute("id");iframe.setAttribute("id",id);iframe.setAttribute("className","mceEditorArea");iframe.setAttribute("border","0");iframe.setAttribute("frameBorder","0");iframe.setAttribute("marginWidth","0");iframe.setAttribute("marginHeight","0");iframe.setAttribute("leftMargin","0");iframe.setAttribute("topMargin","0");iframe.setAttribute("width",tinyMCE.settings['area_width']);iframe.setAttribute("height",tinyMCE.settings['area_height']);if(tinyMCE.settings["auto_resize"])iframe.setAttribute("scrolling","no");if(tinyMCE.isMSIE)iframe.setAttribute("src",this.settings['default_document']);iframe.style.width=tinyMCE.settings['area_width'];iframe.style.height=tinyMCE.settings['area_height'];if(tinyMCE.isMSIE)replace_element.outerHTML=iframe.outerHTML;else replace_element.parentNode.replaceChild(iframe,replace_element);if(tinyMCE.isMSIE)return window.frames[id];else return iframe;};TinyMCE.prototype.setupContent=function(editor_id){var inst=tinyMCE.instances[editor_id];var doc=inst.getDoc();var head=doc.getElementsByTagName('head').item(0);var content=inst.startContent;inst.switchSettings();if(!tinyMCE.isMSIE&&doc.title!="blank_page"){doc.location.href=tinyMCE.baseURL+"/blank.htm";window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",1000);return;}if(!head){window.setTimeout("tinyMCE.setupContent('"+editor_id+"');",10);return;}tinyMCE.importCSS(inst.getDoc(),inst.settings['content_css']);tinyMCE.executeCallback('init_instance_callback','_initInstance',0,inst);if(tinyMCE.settings['nowrap'])doc.body.style.whiteSpace="nowrap";doc.body.dir=this.settings['directionality'];doc.editorId=editor_id;if(!tinyMCE.isMSIE)doc.documentElement.editorId=editor_id;base=doc.createElement("base");base.setAttribute('href',tinyMCE.settings['base_href']);head.appendChild(base);if(tinyMCE.settings['convert_newlines_to_brs']){content=tinyMCE.regexpReplace(content,"\r\n","<br />","gi");content=tinyMCE.regexpReplace(content,"\r","<br />","gi");content=tinyMCE.regexpReplace(content,"\n","<br />","gi");}content=tinyMCE._customCleanup("insert_to_editor",content);if(tinyMCE.isMSIE){window.setInterval('try{tinyMCE.getCSSClasses(document.frames["'+editor_id+'"].document, "'+editor_id+'");}catch(e){}',500);if(tinyMCE.settings["force_br_newlines"])document.frames[editor_id].document.styleSheets[0].addRule("p","margin: 0px;");var body=document.frames[editor_id].document.body;tinyMCE.addEvent(body,"beforepaste",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(body,"beforecut",TinyMCE.prototype.eventPatch);tinyMCE.addEvent(body,"paste",TinyMCE.prototype.eventPatch);body.editorId=editor_id;}if(!tinyMCE.isMSIE){var contentElement=inst.getDoc().createElement("body");var doc=inst.getDoc();contentElement.innerHTML=content;if(tinyMCE.settings['force_p_newlines'])content=content.replace(new RegExp('&lt;&gt;','g'),"");if(tinyMCE.settings['cleanup_on_startup'])inst.getBody().innerHTML=tinyMCE._cleanupHTML(doc,this.settings,contentElement);else{content=tinyMCE.regexpReplace(content,"<strong","<b","gi");content=tinyMCE.regexpReplace(content,"<em","<i","gi");content=tinyMCE.regexpReplace(content,"</strong>","</b>","gi");content=tinyMCE.regexpReplace(content,"</em>","</i>","gi");inst.getBody().innerHTML=content;}inst.convertAllRelativeURLs();}else{if(tinyMCE.settings['cleanup_on_startup']){tinyMCE._setHTML(inst.getDoc(),content);eval('try {inst.getBody().innerHTML = tinyMCE._cleanupHTML(inst.contentDocument, this.settings, inst.getBody());} catch(e) {}');}else inst.getBody().innerHTML=content;}tinyMCE._convertOnClick(inst.getBody());var parentElm=document.getElementById(inst.editorId+'_parent');if(parentElm.lastChild.nodeName.toLowerCase()=="input")inst.formElement=parentElm.lastChild;else inst.formElement=parentElm.nextSibling;tinyMCE.handleVisualAid(inst.getBody(),true,tinyMCE.settings['visual']);tinyMCE.executeCallback('setupcontent_callback','_setupContent',0,editor_id,inst.getBody(),inst.getDoc());if(!tinyMCE.isMSIE)TinyMCE.prototype.addEventHandlers(editor_id);inst.startContent=inst.getBody().innerHTML;tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=inst.contentWindow.document.body;tinyMCE.triggerNodeChange(false,true);tinyMCE._customCleanup("insert_to_editor_dom",inst.contentWindow.document.body);};TinyMCE.prototype.cancelEvent=function(e){if(tinyMCE.isMSIE){e.returnValue=false;e.cancelBubble=true;}else e.preventDefault();};TinyMCE.prototype.removeTinyMCEFormElements=function(form_obj){for(var i=0;i<form_obj.elements.length;i++){var elementId=form_obj.elements[i].name?form_obj.elements[i].name:form_obj.elements[i].id;if(elementId.indexOf('mce_editor_')==0)form_obj.elements[i].disabled=true;}};TinyMCE.prototype.handleEvent=function(e){if(typeof(tinyMCE)=="undefined")return true;switch(e.type){case "submit":tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE?window.event.srcElement:e.target);tinyMCE.triggerSave();return;case "reset":var formObj=tinyMCE.isMSIE?window.event.srcElement:e.target;for(var i=0;i<document.forms.length;i++){if(document.forms[i]==formObj)window.setTimeout('tinyMCE.resetForm('+i+');',10);}return;case "paste":if(tinyMCE.settings['auto_cleanup_word'])window.setTimeout("tinyMCE.execInstanceCommand('"+e.target.editorId+"', 'mceCleanupWord', false, null);",1);break;case "beforecut":case "beforepaste":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");break;case "keypress":if(e.target.editorId){tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];}else{if(e.target.ownerDocument.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.ownerDocument.editorId];}if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&e.keyCode==13&&!e.shiftKey){if(tinyMCE.selectedInstance._insertPara(e)){e.preventDefault();return false;}}if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(tinyMCE.selectedInstance._handleBackSpace(e.type)){e.preventDefault();return false;}}if(!tinyMCE.isMSIE&&e.ctrlKey&&tinyMCE.settings['custom_undo_redo']){if(e.charCode==120||e.charCode==118){tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");return;}if(tinyMCE.settings['custom_undo_redo_keyboard_shortcuts']){if(e.charCode==122){tinyMCE.selectedInstance.execCommand("Undo");e.preventDefault();return false;}if(e.charCode==121){tinyMCE.selectedInstance.execCommand("Redo");e.preventDefault();return false;}}if(e.charCode==98){tinyMCE.selectedInstance.execCommand("Bold");e.preventDefault();return false;}if(e.charCode==105){tinyMCE.selectedInstance.execCommand("Italic");e.preventDefault();return false;}if(e.charCode==117){tinyMCE.selectedInstance.execCommand("Underline");e.preventDefault();return false;}}if(tinyMCE.settings['custom_undo_redo']){var keys=new Array(13,45,36,35,33,34,37,38,39,40);var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){tinyMCE.selectedInstance.typing=false;posKey=true;break;}}if(!tinyMCE.selectedInstance.typing&&!posKey){tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");tinyMCE.selectedInstance.typing=true;}}if(tinyMCE.isMSIE&&tinyMCE.settings['force_br_newlines']&&e.keyCode==13){if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];if(tinyMCE.selectedInstance){var sel=tinyMCE.selectedInstance.getDoc().selection;var rng=sel.createRange();if(tinyMCE.getParentElement(rng.parentElement(),"li")!=null)return false;e.returnValue=false;e.cancelBubble=true;rng.pasteHTML("<br />");rng.collapse(false);rng.select();tinyMCE.triggerNodeChange(false);return false;}}if(e.keyCode==8||e.keyCode==46){tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(e.target,"a");tinyMCE.imgElement=tinyMCE.getParentElement(e.target,"img");tinyMCE.triggerNodeChange(false);}return false;break;case "keyup":case "keydown":if(e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];else return;if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();if(tinyMCE.isGecko&&tinyMCE.settings['force_p_newlines']&&(e.keyCode==8||e.keyCode==46)&&!e.shiftKey){if(tinyMCE.selectedInstance._handleBackSpace(e.type)){e.preventDefault();return false;}}tinyMCE.selectedElement=null;tinyMCE.selectedNode=null;var elm=tinyMCE.selectedInstance.getFocusElement();tinyMCE.linkElement=tinyMCE.getParentElement(elm,"a");tinyMCE.imgElement=tinyMCE.getParentElement(elm,"img");tinyMCE.selectedElement=elm;if(tinyMCE.isGecko&&e.type=="keyup"&&e.keyCode==9)tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(),true,tinyMCE.settings['visual']);if(tinyMCE.isGecko&&tinyMCE.settings['document_base_url']!=""+document.location.href&&e.type=="keyup"&&e.ctrlKey&&e.keyCode==86)tinyMCE.selectedInstance.fixBrokenURLs();if(tinyMCE.isMSIE&&tinyMCE.settings['custom_undo_redo']){var keys=new Array(13,45,36,35,33,34,37,38,39,40);var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){tinyMCE.selectedInstance.typing=false;posKey=true;break;}}if(!tinyMCE.selectedInstance.typing&&!posKey&&(e.keyCode<16||e.keyCode>18&&e.keyCode!=255)){tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");tinyMCE.selectedInstance.typing=true;tinyMCE.triggerNodeChange(false);}if(posKey&&e.type=="keyup")tinyMCE.triggerNodeChange(false);var keys=new Array(8,46);for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){if(!tinyMCE.selectedInstance.typing){tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");tinyMCE.selectedInstance.typing=true;}if(e.type=="keyup")tinyMCE.triggerNodeChange(false);return true;}}var ctrlKeys=new Array(66,73,85,86,88);for(var i=0;i<keys.length;i++){if(ctrlKeys[i]==e.keyCode&&e.ctrlKey){tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");tinyMCE.triggerNodeChange(false);return true;}}if(tinyMCE.settings['custom_undo_redo_keyboard_shortcuts']){if(e.keyCode==90&&e.ctrlKey&&e.type=="keydown"){tinyMCE.selectedInstance.execCommand("Undo");tinyMCE.triggerNodeChange(false);e.returnValue=false;e.cancelBubble=true;return false;}if(e.keyCode==89&&e.ctrlKey&&e.type=="keydown"){tinyMCE.selectedInstance.execCommand("Redo");tinyMCE.triggerNodeChange(false);e.returnValue=false;e.cancelBubble=true;return false;}}}var keys=new Array(13,45,36,35,33,34,37,38,39,40);var posKey=false;for(var i=0;i<keys.length;i++){if(keys[i]==e.keyCode){posKey=true;break;}}if(posKey&&e.type=="keyup")tinyMCE.triggerNodeChange(false);break;case "mousedown":case "mouseup":case "click":case "focus":if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.switchSettings();var targetBody=tinyMCE.getParentElement(e.target,"body");for(var instanceName in tinyMCE.instances){var inst=tinyMCE.instances[instanceName];inst.autoResetDesignMode();if(inst.getBody()==targetBody){tinyMCE.selectedInstance=inst;tinyMCE.selectedElement=e.target;tinyMCE.linkElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"a");tinyMCE.imgElement=tinyMCE.getParentElement(tinyMCE.selectedElement,"img");tinyMCE.selectedInstance.typing=false;break;}}if(e.type!="focus")tinyMCE.selectedNode=null;tinyMCE.triggerNodeChange(false);if(!tinyMCE.selectedInstance&&e.target.editorId)tinyMCE.selectedInstance=tinyMCE.instances[e.target.editorId];if(e.target.nodeName.toLowerCase()=="a"&&e.type=="click"&&e.altKey){var evalCode=""+tinyMCE.cleanupEventStr(e.target.getAttribute("mce_onclick"));eval(evalCode.replace('return false;',''));}if(tinyMCE.isGecko&&tinyMCE.settings['document_base_url']!=""+document.location.href)window.setTimeout('tinyMCE.getInstanceById("'+inst.editorId+'").fixBrokenURLs();',10);return false;break;}};TinyMCE.prototype.switchClass=function(element,class_name,lock_state){var lockChanged=false;if(typeof(lock_state)!="undefined"&&element!=null){element.classLock=lock_state;lockChanged=true;}if(element!=null&&(lockChanged||!element.classLock)){element.oldClassName=element.className;element.className=class_name;}};TinyMCE.prototype.restoreAndSwitchClass=function(element,class_name){if(element!=null&&!element.classLock){this.restoreClass(element);this.switchClass(element,class_name);}};TinyMCE.prototype.switchClassSticky=function(element_name,class_name,lock_state){var element,lockChanged=false;if(!this.stickyClassesLookup[element_name])this.stickyClassesLookup[element_name]=document.getElementById(element_name);element=this.stickyClassesLookup[element_name];if(typeof(lock_state)!="undefined"&&element!=null){element.classLock=lock_state;lockChanged=true;}if(element!=null&&(lockChanged||!element.classLock)){element.className=class_name;element.oldClassName=class_name;}};TinyMCE.prototype.restoreClass=function(element){if(element!=null&&element.oldClassName&&!element.classLock){element.className=element.oldClassName;element.oldClassName=null;}};TinyMCE.prototype.setClassLock=function(element,lock_state){if(element!=null)element.classLock=lock_state;};TinyMCE.prototype.addEvent=function(obj,name,handler){if(tinyMCE.isMSIE){obj.attachEvent("on"+name,handler);}else obj.addEventListener(name,handler,false);};TinyMCE.prototype.submitPatch=function(){tinyMCE.removeTinyMCEFormElements(this);tinyMCE.triggerSave();this.oldSubmit();};TinyMCE.prototype.onLoad=function(){for(var c=0;c<tinyMCE.configs.length;c++){tinyMCE.settings=tinyMCE.configs[c];var elementRefAr=new Array();if(document.forms&&tinyMCE.settings['add_form_submit_trigger']&&!tinyMCE.submitTriggers){for(var i=0;i<document.forms.length;i++){var form=document.forms[i];tinyMCE.addEvent(form,"submit",TinyMCE.prototype.handleEvent);tinyMCE.addEvent(form,"reset",TinyMCE.prototype.handleEvent);tinyMCE.submitTriggers=true;if(tinyMCE.settings['submit_patch']){try{form.oldSubmit=form.submit;form.submit=TinyMCE.prototype.submitPatch;}catch(e){}}}}var mode=tinyMCE.settings['mode'];switch(mode){case "exact":var elements=tinyMCE.getParam('elements','',true,',');for(var i=0;i<elements.length;i++){var element=tinyMCE._getElementById(elements[i]);var trigger=element?element.getAttribute(tinyMCE.settings['textarea_trigger']):"";if(trigger=="false")continue;if(tinyMCE.settings['ask']&&element){elementRefAr[elementRefAr.length]=element;continue;}if(element)tinyMCE.addMCEControl(element,elements[i]);else if(tinyMCE.settings['debug'])alert("Error: Could not find element by id or name: "+elements[i]);}break;case "specific_textareas":case "textareas":var nodeList=document.getElementsByTagName("textarea");for(var i=0;i<nodeList.length;i++){var trigger=nodeList.item(i).getAttribute(tinyMCE.settings['textarea_trigger']);if((mode=="specific_textareas"&&trigger=="true")||(mode=="textareas"&&trigger!="false"))elementRefAr[elementRefAr.length]=nodeList.item(i);}break;}for(var i=0;i<elementRefAr.length;i++){var element=elementRefAr[i];var elementId=element.name?element.name:element.id;if(tinyMCE.settings['ask']){if(tinyMCE.isGecko){var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(e){window.setTimeout(function(){TinyMCE.prototype.confirmAdd(e,settings);},10);});}else{var settings=tinyMCE.settings;tinyMCE.addEvent(element,"focus",function(){TinyMCE.prototype.confirmAdd(null,settings);});}}else tinyMCE.addMCEControl(element,elementId);}if(tinyMCE.settings['auto_focus']){window.setTimeout(function(){var inst=tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);inst.selectNode(inst.getBody(),true,true);inst.contentWindow.focus();},10);}tinyMCE.executeCallback('oninit','_oninit',0);}};TinyMCE.prototype.removeMCEControl=function(editor_id){var inst=tinyMCE.getInstanceById(editor_id);if(inst){inst.switchSettings();editor_id=inst.editorId;var html=tinyMCE.getContent(editor_id);var tmpInstances=new Array();for(var instanceName in tinyMCE.instances){var instance=tinyMCE.instances[instanceName];if(instanceName!=editor_id)tmpInstances[instanceName]=instance;}tinyMCE.instances=tmpInstances;tinyMCE.selectedElement=null;tinyMCE.selectedInstance=null;var replaceElement=document.getElementById(editor_id+"_parent");var oldTargetElement=inst.oldTargetElement;var targetName=oldTargetElement.nodeName.toLowerCase();if(targetName=="textarea"||targetName=="input"){replaceElement.parentNode.removeChild(replaceElement);oldTargetElement.style.display="inline";oldTargetElement.value=html;}else{oldTargetElement.innerHTML=html;replaceElement.parentNode.insertBefore(oldTargetElement,replaceElement);replaceElement.parentNode.removeChild(replaceElement);}}};TinyMCE.prototype._cleanupElementName=function(element_name,element){element_name=element_name.toLowerCase();if(element_name=="body")return null;if(tinyMCE.cleanup_verify_html){for(var i=0;i<tinyMCE.cleanup_invalidElements.length;i++){if(tinyMCE.cleanup_invalidElements[i]==element_name)return null;}var validElement=false;var elementAttribs=null;for(var i=0;i<tinyMCE.cleanup_validElements.length&&!elementAttribs;i++){for(var x=0,n=tinyMCE.cleanup_validElements[i][0].length;x<n;x++){var elmMatch=tinyMCE.cleanup_validElements[i][0][x];if(elmMatch.charAt(0)=='+')elmMatch=elmMatch.substring(1);if(elmMatch.match(new RegExp('\\*|\\?|\\+','g'))!=null){elmMatch=elmMatch.replace(new RegExp('\\?','g'),'(\\S?)');elmMatch=elmMatch.replace(new RegExp('\\+','g'),'(\\S+)');elmMatch=elmMatch.replace(new RegExp('\\*','g'),'(\\S*)');elmMatch="^"+elmMatch+"$";if(element_name.match(new RegExp(elmMatch,'g'))){elementAttribs=tinyMCE.cleanup_validElements[i];validElement=true;break;}}if(element_name==elmMatch){elementAttribs=tinyMCE.cleanup_validElements[i];validElement=true;element_name=elementAttribs[0][0];break;}}}if(!validElement)return null;}if(!tinyMCE.isMSIE){if(element_name=="strong"&&!tinyMCE.cleanup_on_save)element_name="b";else if(element_name=="em"&&!tinyMCE.cleanup_on_save)element_name="i";}if(tinyMCE.isMSIE){if(element_name=="table"){var attribValue=element.style.pixelWidth==0?element.getAttribute("width"):element.style.pixelWidth;element.setAttribute("width",attribValue);attribValue=element.style.pixelHeight==0?element.getAttribute("height"):element.style.pixelHeight;element.setAttribute("height",attribValue);}}var elmData=new Object();elmData.element_name=element_name;elmData.valid_attribs=elementAttribs;return elmData;};TinyMCE.prototype._fixInlineStyles=function(elm){if(elm.nodeName.toLowerCase()!="table"){var value;value=tinyMCE.isMSIE?elm.width:elm.getAttribute("width");if(value&&value!=""){if(typeof(value)!="string"||!value.indexOf("%"))value+="px";elm.style.width=value;}value=tinyMCE.isMSIE?elm.height:elm.getAttribute("height");if(value&&value!=""){if(typeof(value)!="string"||!value.indexOf("%"))value+="px";elm.style.height=value;}value=tinyMCE.isMSIE?elm.border:elm.getAttribute("border");if(value&&value!="")elm.style.borderWidth=value+"px";}value=elm.getAttribute("align");if(value&&value!=""){if(elm.nodeName.toLowerCase()=="img"){if(tinyMCE.isMSIE)elm.style.styleFloat=value;else elm.style.cssFloat=value;}else elm.style.textAlign=value;}value=elm.getAttribute("vspace");if(value&&value!=""){elm.style.marginTop=value+"px";elm.style.marginBottom=value+"px";}value=elm.getAttribute("hspace");if(value&&value!=""){elm.style.marginLeft=value+"px";elm.style.marginRight=value+"px";}};TinyMCE.prototype._cleanupAttribute=function(valid_attributes,element_name,attribute_node,element_node){var attribName=attribute_node.nodeName.toLowerCase();var attribValue=attribute_node.nodeValue;var attribMustBeValue=null;var verified=false;if(tinyMCE.cleanup_inline_styles&&element_name!="table"&&element_name!="td"){if(attribName=="width"||attribName=="height"||attribName=="border"||attribName=="align"||attribName=="valign"||attribName=="hspace"||attribName=="vspace")return null;}if(attribName.indexOf('moz_')!=-1)return null;if(!tinyMCE.isMSIE&&(attribName=="mce_real_href"||attribName=="mce_real_src")){if(!tinyMCE.cleanup_on_save){var attrib=new Object();attrib.name=attribName;attrib.value=attribValue;return attrib;}else return null;}if(attribName=="mce_onclick")verified=true;if(tinyMCE.cleanup_verify_html&&!verified){for(var i=1;i<valid_attributes.length;i++){var attribMatch=valid_attributes[i][0];var re=null;if(attribMatch.match(new RegExp('\\*|\\?|\\+','g'))!=null){attribMatch=attribMatch.replace(new RegExp('\\?','g'),'(\\S?)');attribMatch=attribMatch.replace(new RegExp('\\+','g'),'(\\S+)');attribMatch=attribMatch.replace(new RegExp('\\*','g'),'(\\S*)');attribMatch="^"+attribMatch+"$";re=new RegExp(attribMatch,'g');}if((re&&attribName.match(re)!=null)||attribName==attribMatch){verified=true;attribMustBeValue=valid_attributes[i][3];break;}}if((element_name=="table"||element_name=="td")&&attribName=="style")verified=true;if(!verified)return false;}else verified=true;switch(attribName){case "size":if(tinyMCE.isMSIE5&&element_name=="font")attribValue=element_node.size;break;case "color":if(tinyMCE.isMSIE5&&element_name=="font")attribValue=element_node.color;break;case "width":if(tinyMCE.isMSIE)attribValue=element_node.width;break;case "height":if(tinyMCE.isMSIE)attribValue=element_node.height;break;case "border":if(tinyMCE.isMSIE)attribValue=element_node.border;break;case "class":if(element_name=="table"||element_name=="td"){if(tinyMCE.cleanup_visual_table_class!="")attribValue=tinyMCE.getVisualAidClass(attribValue,!tinyMCE.cleanup_on_save);}if(!tinyMCE._verifyClass(element_node)||attribValue=="")return null;break;case "style":attribValue=element_node.style.cssText.toLowerCase();if(tinyMCE.isMSIE){var border=element_node.style.border;var bt=element_node.style.borderTop;var bl=element_node.style.borderLeft;var br=element_node.style.borderRight;var bb=element_node.style.borderBottom;if(border!=""&&(bt==border&&bl==border&&br==border&&bb==border)){attribValue=tinyMCE.regexpReplace(attribValue,'border-top: '+border+'?; ?','');attribValue=tinyMCE.regexpReplace(attribValue,'border-left: '+border+'?; ?','');attribValue=tinyMCE.regexpReplace(attribValue,'border-right: '+border+'?; ?','');attribValue=tinyMCE.regexpReplace(attribValue,'border-bottom: '+border+'?;( ?)','border: '+border+';$1');}}break;case "onclick":case "mce_onclick":if(tinyMCE.isMSIE5)break;if(tinyMCE.cleanup_on_save){if(element_node.getAttribute("mce_onclick")){attribName="onclick";attribValue=""+element_node.getAttribute("mce_onclick");}}else{if(attribName=="onclick"&&!tinyMCE.cleanup_on_save)return null;}break;case "href":case "src":if(!tinyMCE.isMSIE&&attribName=="href"&&element_node.getAttribute("mce_real_href"))attribValue=element_node.getAttribute("mce_real_href");if(!tinyMCE.isMSIE&&attribName=="src"&&element_node.getAttribute("mce_real_src"))attribValue=element_node.getAttribute("mce_real_src");if(tinyMCE.isGecko&&!tinyMCE.settings['relative_urls'])attribValue=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],attribValue);attribValue=eval(tinyMCE.cleanup_urlconverter_callback+"(attribValue, element_node, tinyMCE.cleanup_on_save);");break;case "colspan":case "rowspan":if(attribValue=="1")return null;break;case "_moz-userdefined":case "editorid":case "editor_id":case "mce_real_href":case "mce_real_src":return null;}if(attribMustBeValue!=null){var isCorrect=false;for(var i=0;i<attribMustBeValue.length;i++){if(attribValue==attribMustBeValue[i]){isCorrect=true;break;}}if(!isCorrect)return null;}var attrib=new Object();attrib.name=attribName;attrib.value=attribValue;return attrib;};TinyMCE.prototype._verifyClass=function(node){if(tinyMCE.isGecko){var className=node.getAttribute('class');if(!className)return false;}if(tinyMCE.isMSIE)var className=node.getAttribute('className');if(tinyMCE.cleanup_verify_css_classes&&tinyMCE.cleanup_on_save){var csses=tinyMCE.getCSSClasses();nonDefinedCSS=true;for(var c=0;c<csses.length;c++){if(csses[c]==className){nonDefinedCSS=false;break;}}if(nonDefinedCSS&&className.indexOf('mce_')!=0){node.removeAttribute('className');node.removeAttribute('class');return false;}}return true;};TinyMCE.prototype.cleanupNode=function(node){var output="";switch(node.nodeType){case 1:var elementData=tinyMCE._cleanupElementName(node.nodeName,node);var elementName=elementData?elementData.element_name:null;var elementValidAttribs=elementData?elementData.valid_attribs:null;var elementAttribs="";var openTag=false;if(elementName!=null&&elementName.charAt(0)=='+'){elementName=elementName.substring(1);openTag=true;}if(tinyMCE.isMSIE&&tinyMCE.settings['fix_content_duplication']){var lookup=tinyMCE.cleanup_elementLookupTable;for(var i=0;i<lookup.length;i++){if(lookup[i]==node)return output;}lookup[lookup.length]=node;}if(!elementName){if(node.hasChildNodes()){for(var i=0;i<node.childNodes.length;i++)output+=this.cleanupNode(node.childNodes[i]);}return output;}if(node.style&&(node.style.cssText.indexOf('mso-')!=-1&&tinyMCE.settings['auto_cleanup_word'])||node.style.cssText==""){node.style.cssText="";node.removeAttribute("style");}if(tinyMCE.cleanup_inline_styles)tinyMCE._fixInlineStyles(node);if(elementValidAttribs){for(var a=1;a<elementValidAttribs.length;a++){var attribName,attribDefaultValue,attribForceValue,attribValue;attribName=elementValidAttribs[a][0];attribDefaultValue=elementValidAttribs[a][1];attribForceValue=elementValidAttribs[a][2];if(attribDefaultValue!=null||attribForceValue!=null){var attribValue=node.getAttribute(attribName);if(node.getAttribute(attribName)==null||node.getAttribute(attribName)=="")attribValue=attribDefaultValue;attribValue=attribForceValue?attribForceValue:attribValue;if(attribValue=="{$uid}")attribValue="uid_"+(tinyMCE.cleanup_idCount++);node.setAttribute(attribName,attribValue);}}}if(elementName=="span"&&tinyMCE.cleanup_trim_span_elements){var re=new RegExp('^[ \t]+','g');var onlyWhiteSpace=true;for(var a=0;a<node.childNodes.length;a++){var tmpNode=node.childNodes[a];if((tmpNode.nodeType==3&&!tmpNode.nodeValue.match(re))||tmpNode.nodeName.toLowerCase()!="span"){onlyWhiteSpace=false;break;}}tinyMCE._verifyClass(node);var numAttribs=0;for(var i=0;i<node.attributes.length;i++){if(node.attributes[i].specified)numAttribs++;}if(onlyWhiteSpace||numAttribs==0){if(node.hasChildNodes()){for(var i=0;i<node.childNodes.length;i++)output+=this.cleanupNode(node.childNodes[i]);}return output;}}if(elementName=="table"&&!node.hasChildNodes())return "";if(tinyMCE.isGecko&&elementName=="img"){var w=node.style.width;if(w!=null&&w!="")node.setAttribute("width",w);var h=node.style.height;if(h!=null&&h!="")node.setAttribute("height",h);}if(node.attributes.length>0){for(var i=0;i<node.attributes.length;i++){if(node.attributes[i].specified){var attrib=tinyMCE._cleanupAttribute(elementValidAttribs,elementName,node.attributes[i],node);if(attrib)elementAttribs+=" "+attrib.name+"="+'"'+attrib.value+'"';}}}if(tinyMCE.isMSIE&&elementName=="input"){if(node.type)elementAttribs+=" type="+'"'+node.type+'"';if(node.value)elementAttribs+=" value="+'"'+node.value+'"';}if((elementName=="p"||elementName=="td")&&(node.innerHTML==""||node.innerHTML=="&nbsp;"))return "<"+elementName+elementAttribs+">"+this.convertStringToXML(String.fromCharCode(160))+"</"+elementName+">";if(tinyMCE.isMSIE&&elementName=="script")return "<"+elementName+elementAttribs+">"+node.text+"</"+elementName+">";if(node.hasChildNodes()){if(elementName=="p"&&tinyMCE.cleanup_force_br_newlines)output+="<div"+elementAttribs+">";else output+="<"+elementName+elementAttribs+">";for(var i=0;i<node.childNodes.length;i++)output+=this.cleanupNode(node.childNodes[i]);if(elementName=="p"&&tinyMCE.cleanup_force_br_newlines)output+="</div><br />";else output+="</"+elementName+">";}else{if(openTag)output+="<"+elementName+elementAttribs+"></"+elementName+">";else{output+="<"+elementName+elementAttribs+" />";}}return output;case 3:if(node.parentNode.nodeName.toLowerCase()=="script")return node.nodeValue;return this.convertStringToXML(node.nodeValue);case 8:return "<!--"+node.nodeValue+"-->";default:return "[UNKNOWN NODETYPE "+node.nodeType+"]";}};TinyMCE.prototype.convertStringToXML=function(html_data){var output="";for(var i=0;i<html_data.length;i++){var chr=html_data.charCodeAt(i);if(tinyMCE.settings['entity_encoding']=="numeric"){if(chr>127)output+='&#'+chr+";";else output+=String.fromCharCode(chr);continue;}if(tinyMCE.settings['entity_encoding']=="raw"){output+=String.fromCharCode(chr);continue;}if(typeof(tinyMCE.cleanup_entities["c"+chr])!='undefined'&&tinyMCE.cleanup_entities["c"+chr]!='')output+='&'+tinyMCE.cleanup_entities["c"+chr]+';';else output+=''+String.fromCharCode(chr);}return output;};TinyMCE.prototype._getCleanupElementName=function(chunk){var pos;if(chunk.charAt(0)=='+')chunk=chunk.substring(1);if((pos=chunk.indexOf('/'))!=-1)chunk=chunk.substring(0,pos);if((pos=chunk.indexOf('['))!=-1)chunk=chunk.substring(0,pos);return chunk;};TinyMCE.prototype._initCleanup=function(){var validElements=tinyMCE.settings["valid_elements"];validElements=validElements.split(',');var extendedValidElements=tinyMCE.settings["extended_valid_elements"];extendedValidElements=extendedValidElements.split(',');for(var i=0;i<extendedValidElements.length;i++){var elementName=this._getCleanupElementName(extendedValidElements[i]);var skipAdd=false;for(var x=0;x<validElements.length;x++){if(this._getCleanupElementName(validElements[x])==elementName){validElements[x]=extendedValidElements[i];skipAdd=true;break;}}if(!skipAdd)validElements[validElements.length]=extendedValidElements[i];}for(var i=0;i<validElements.length;i++){var item=validElements[i];item=item.replace('[','|');item=item.replace(']','');var attribs=item.split('|');for(var x=0;x<attribs.length;x++)attribs[x]=attribs[x].toLowerCase();attribs[0]=attribs[0].split('/');for(var x=1;x<attribs.length;x++){var attribName=attribs[x];var attribDefault=null;var attribForce=null;var attribMustBe=null;if((pos=attribName.indexOf('='))!=-1){attribDefault=attribName.substring(pos+1);attribName=attribName.substring(0,pos);}if((pos=attribName.indexOf(':'))!=-1){attribForce=attribName.substring(pos+1);attribName=attribName.substring(0,pos);}if((pos=attribName.indexOf('<'))!=-1){attribMustBe=attribName.substring(pos+1).split('?');attribName=attribName.substring(0,pos);}attribs[x]=new Array(attribName,attribDefault,attribForce,attribMustBe);}validElements[i]=attribs;}var invalidElements=tinyMCE.settings['invalid_elements'].split(',');for(var i=0;i<invalidElements.length;i++)invalidElements[i]=invalidElements[i].toLowerCase();tinyMCE.settings['cleanup_validElements']=validElements;tinyMCE.settings['cleanup_invalidElements']=invalidElements;tinyMCE.settings['cleanup_entities']=new Array();var entities=tinyMCE.getParam('entities','',true,',');for(var i=0;i<entities.length;i+=2)tinyMCE.settings['cleanup_entities']['c'+entities[i]]=entities[i+1];};TinyMCE.prototype._cleanupHTML=function(doc,config,element,visual,on_save){if(!tinyMCE.settings['cleanup'])return element.innerHTML;tinyMCE._customCleanup(on_save?"get_from_editor_dom":"insert_to_editor_dom",doc.body);tinyMCE.cleanup_validElements=tinyMCE.settings['cleanup_validElements'];tinyMCE.cleanup_entities=tinyMCE.settings['cleanup_entities'];tinyMCE.cleanup_invalidElements=tinyMCE.settings['cleanup_invalidElements'];tinyMCE.cleanup_verify_html=tinyMCE.settings['verify_html'];tinyMCE.cleanup_force_br_newlines=tinyMCE.settings['force_br_newlines'];tinyMCE.cleanup_urlconverter_callback=tinyMCE.settings['urlconverter_callback'];tinyMCE.cleanup_verify_css_classes=tinyMCE.settings['verify_css_classes'];tinyMCE.cleanup_visual_table_class=tinyMCE.settings['visual_table_class'];tinyMCE.cleanup_apply_source_formatting=tinyMCE.settings['apply_source_formatting'];tinyMCE.cleanup_trim_span_elements=tinyMCE.settings['trim_span_elements'];tinyMCE.cleanup_inline_styles=tinyMCE.settings['inline_styles'];tinyMCE.cleanup_visual_aid=visual;tinyMCE.cleanup_on_save=on_save;tinyMCE.cleanup_idCount=0;tinyMCE.cleanup_elementLookupTable=new Array();var startTime=new Date().getTime();tinyMCE._convertOnClick(element);if(tinyMCE.isMSIE){element.innerHTML=tinyMCE.regexpReplace(element.innerHTML,'<p>[ \n\r]*<hr id=null>[ \n\r]*</p>','<hr />','gi');element.innerHTML=tinyMCE.regexpReplace(element.innerHTML,'<!([^-(DOCTYPE)]* )|<!/[^-]*>','','gi');}var html=this.cleanupNode(element);if(tinyMCE.settings['debug'])alert("Cleanup process executed in: "+(new Date().getTime()-startTime)+" ms.");html=tinyMCE.regexpReplace(html,'<p><hr /></p>','<hr />');html=tinyMCE.regexpReplace(html,'<p>&nbsp;</p><hr /><p>&nbsp;</p>','<hr />');if(!tinyMCE.isMSIE)html=html.replace(new RegExp('<o:p _moz-userdefined="" />','g'),"");if(tinyMCE.settings['apply_source_formatting']){html=html.replace(new RegExp('<(p|div)([^>]*)>','g'),"\n<$1$2>\n");html=html.replace(new RegExp('<\/(p|div)([^>]*)>','g'),"\n</$1$2>\n");html=html.replace(new RegExp('<br />','g'),"<br />\n");}if(tinyMCE.settings['force_br_newlines']){var re=new RegExp('<p>&nbsp;</p>','g');html=html.replace(re,"<br />");}if(tinyMCE.settings['force_p_newlines']){var re=new RegExp('&lt;&gt;','g');html=html.replace(re,"");}if(tinyMCE.settings['remove_linebreaks'])html=html.replace(new RegExp('\r|\n','g'),' ');html=tinyMCE._customCleanup(on_save?"get_from_editor":"insert_to_editor",html);var chk=tinyMCE.regexpReplace(html,"[ \t\r\n]","");if(chk=="<br/>"||chk=="<br>"||chk=="<p>&nbsp;</p>"||chk=="<p>&#160;</p>"||chk=="<p></p>")html="";if(tinyMCE.settings["preformatted"])return "<pre>"+html+"</pre>";return html;};TinyMCE.prototype.setAttrib=function(element,name,value,no_fix_value){if(!no_fix_value&&value!=null){var re=new RegExp('[^0-9%]','g');value=value.replace(re,'');}if(value!=null&&value!="")element.setAttribute(name,value);else element.removeAttribute(name);if(value!=null&&value!="")element.setAttribute(name,value);else element.removeAttribute(name);};TinyMCE.prototype.insertLink=function(href,target,title,onclick){this.execCommand("mceAddUndoLevel");if(this.selectedInstance&&this.selectedElement&&this.selectedElement.nodeName.toLowerCase()=="img"){var doc=this.selectedInstance.getDoc();var linkElement=tinyMCE.getParentElement(this.selectedElement,"a");var newLink=false;if(!linkElement){linkElement=doc.createElement("a");newLink=true;}href=eval(tinyMCE.settings['urlconverter_callback']+"(href, linkElement);");tinyMCE.setAttrib(linkElement,'href',href);tinyMCE.setAttrib(linkElement,'target',target);tinyMCE.setAttrib(linkElement,'title',title);tinyMCE.setAttrib(linkElement,'mce_onclick',onclick);if(newLink){linkElement.appendChild(this.selectedElement.cloneNode(true));this.selectedElement.parentNode.replaceChild(linkElement,this.selectedElement);}return;}if(!this.linkElement&&this.selectedInstance){this.selectedInstance.contentDocument.execCommand("createlink",false,"#mce_temp_url#");tinyMCE.linkElement=this.getElementByAttributeValue(this.selectedInstance.contentDocument.body,"a","href","#mce_temp_url#");var elementArray=this.getElementsByAttributeValue(this.selectedInstance.contentDocument.body,"a","href","#mce_temp_url#");for(var i=0;i<elementArray.length;i++){href=eval(tinyMCE.settings['urlconverter_callback']+"(href, elementArray[i]);");tinyMCE.setAttrib(elementArray[i],'href',href);tinyMCE.setAttrib(elementArray[i],'mce_real_href',href);tinyMCE.setAttrib(elementArray[i],'target',target);tinyMCE.setAttrib(elementArray[i],'title',title);tinyMCE.setAttrib(elementArray[i],'mce_onclick',onclick);}tinyMCE.linkElement=elementArray[0];}if(this.linkElement){href=eval(tinyMCE.settings['urlconverter_callback']+"(href, this.linkElement);");tinyMCE.setAttrib(this.linkElement,'href',href);tinyMCE.setAttrib(this.linkElement,'mce_real_href',href);tinyMCE.setAttrib(this.linkElement,'target',target);tinyMCE.setAttrib(this.linkElement,'title',title);tinyMCE.setAttrib(this.linkElement,'mce_onclick',onclick);}};TinyMCE.prototype.insertImage=function(src,alt,border,hspace,vspace,width,height,align,title,onmouseover,onmouseout){if(src=="")return;this.execCommand("mceAddUndoLevel");if(!this.imgElement&&this.selectedInstance){this.selectedInstance.contentDocument.execCommand("insertimage",false,"#mce_temp_url#");tinyMCE.imgElement=this.getElementByAttributeValue(this.selectedInstance.contentDocument.body,"img","src","#mce_temp_url#");}if(this.imgElement){var needsRepaint=false;src=eval(tinyMCE.settings['urlconverter_callback']+"(src, tinyMCE.imgElement);");if(onmouseover&&onmouseover!="")onmouseover="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseover, tinyMCE.imgElement);")+"';";if(onmouseout&&onmouseout!="")onmouseout="this.src='"+eval(tinyMCE.settings['urlconverter_callback']+"(onmouseout, tinyMCE.imgElement);")+"';";if(typeof(title)=="undefined")title=alt;if(width!=this.imgElement.getAttribute("width")||height!=this.imgElement.getAttribute("height")||align!=this.imgElement.getAttribute("align"))needsRepaint=true;tinyMCE.setAttrib(this.imgElement,'src',src);tinyMCE.setAttrib(this.imgElement,'mce_real_src',src);tinyMCE.setAttrib(this.imgElement,'alt',alt);tinyMCE.setAttrib(this.imgElement,'title',title);tinyMCE.setAttrib(this.imgElement,'align',align);tinyMCE.setAttrib(this.imgElement,'border',border,true);tinyMCE.setAttrib(this.imgElement,'hspace',hspace,true);tinyMCE.setAttrib(this.imgElement,'vspace',vspace,true);tinyMCE.setAttrib(this.imgElement,'width',width,true);tinyMCE.setAttrib(this.imgElement,'height',height,true);tinyMCE.setAttrib(this.imgElement,'onmouseover',onmouseover);tinyMCE.setAttrib(this.imgElement,'onmouseout',onmouseout);if(width&&width!="")this.imgElement.style.pixelWidth=width;if(height&&height!="")this.imgElement.style.pixelHeight=height;if(needsRepaint)tinyMCE.selectedInstance.repaint();}};TinyMCE.prototype.getElementByAttributeValue=function(node,element_name,attrib,value){var elements=this.getElementsByAttributeValue(node,element_name,attrib,value);if(elements.length==0)return null;return elements[0];};TinyMCE.prototype.getElementsByAttributeValue=function(node,element_name,attrib,value){var elements=new Array();if(node&&node.nodeName.toLowerCase()==element_name){if(node.getAttribute(attrib)&&node.getAttribute(attrib).indexOf(value)!=-1)elements[elements.length]=node;}if(node.hasChildNodes){for(var x=0,n=node.childNodes.length;x<n;x++){var childElements=this.getElementsByAttributeValue(node.childNodes[x],element_name,attrib,value);for(var i=0,m=childElements.length;i<m;i++)elements[elements.length]=childElements[i];}}return elements;};TinyMCE.prototype.isBlockElement=function(node){return node!=null&&node.nodeType==1&&this.blockRegExp.test(node.nodeName);};TinyMCE.prototype.getParentBlockElement=function(node){while(node){if(this.blockRegExp.test(node.nodeName))return node;node=node.parentNode;}return null;};TinyMCE.prototype.getNodeTree=function(node,node_array,type,node_name){if(typeof(type)=="undefined"||node.nodeType==type&&(typeof(node_name)=="undefined"||node.nodeName.toLowerCase()==node_name.toLowerCase()))node_array[node_array.length]=node;if(node.hasChildNodes()){for(var i=0;i<node.childNodes.length;i++)tinyMCE.getNodeTree(node.childNodes[i],node_array,type,node_name);}return node_array;};TinyMCE.prototype.getParentElement=function(node,names,attrib_name,attrib_value){if(typeof(names)=="undefined"){if(node.nodeType==1)return node;while((node=node.parentNode)!=null&&node.nodeType!=1);return node;}var namesAr=names.split(',');if(node==null)return null;do{for(var i=0;i<namesAr.length;i++){if(node.nodeName.toLowerCase()==namesAr[i].toLowerCase()||names=="*"){if(typeof(attrib_name)=="undefined")return node;else if(node.getAttribute(attrib_name)){if(typeof(attrib_value)=="undefined"){if(node.getAttribute(attrib_name)!="")return node;}else if(node.getAttribute(attrib_name)==attrib_value)return node;}}}}while(node=node.parentNode);return null;};TinyMCE.prototype.convertURL=function(url,node,on_save){var prot=document.location.protocol;var host=document.location.hostname;var port=document.location.port;var fileProto=(prot=="file:");url=tinyMCE.regexpReplace(url,'(http|https):///','/');if(url.indexOf('mailto:')!=-1||url.indexOf('javascript:')!=-1||tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0)=="#")return url;if(!tinyMCE.isMSIE&&!on_save&&url.indexOf("://")==-1&&url.charAt(0)!='/')return tinyMCE.settings['base_href']+url;if(!tinyMCE.settings['relative_urls']){var urlParts=tinyMCE.parseURL(url);var baseUrlParts=tinyMCE.parseURL(tinyMCE.settings['base_href']);if(urlParts['anchor']&&urlParts['path']==baseUrlParts['path'])return "#"+urlParts['anchor'];}if(on_save&&tinyMCE.settings['relative_urls']){var urlParts=tinyMCE.parseURL(url);var tmpUrlParts=tinyMCE.parseURL(tinyMCE.settings['document_base_url']);if(urlParts['host']==tmpUrlParts['host']&&(!urlParts['port']||urlParts['port']==tmpUrlParts['port']))return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'],url);}if(!fileProto&&tinyMCE.settings['remove_script_host']){var start="",portPart="";if(port!="")portPart=":"+port;start=prot+"//"+host+portPart+"/";if(url.indexOf(start)==0)url=url.substring(start.length-1);if(!tinyMCE.settings['relative_urls']&&url.indexOf('://')==-1&&url.charAt(0)!='/')url='/'+url;}return url;};TinyMCE.prototype.parseURL=function(url_str){var urlParts=new Array();if(url_str){var pos,lastPos;pos=url_str.indexOf('://');if(pos!=-1){urlParts['protocol']=url_str.substring(0,pos);lastPos=pos+3;}for(var i=lastPos;i<url_str.length;i++){var chr=url_str.charAt(i);if(chr==':')break;if(chr=='/')break;}pos=i;urlParts['host']=url_str.substring(lastPos,pos);lastPos=pos;if(url_str.charAt(pos)==':'){pos=url_str.indexOf('/',lastPos);urlParts['port']=url_str.substring(lastPos+1,pos);}lastPos=pos;pos=url_str.indexOf('?',lastPos);if(pos==-1)pos=url_str.indexOf('#',lastPos);if(pos==-1)pos=url_str.length;urlParts['path']=url_str.substring(lastPos,pos);lastPos=pos;if(url_str.charAt(pos)=='?'){pos=url_str.indexOf('#');pos=(pos==-1)?url_str.length:pos;urlParts['query']=url_str.substring(lastPos+1,pos);}lastPos=pos;if(url_str.charAt(pos)=='#'){pos=url_str.length;urlParts['anchor']=url_str.substring(lastPos+1,pos);}}return urlParts;};TinyMCE.prototype.convertAbsoluteURLToRelativeURL=function(base_url,url_to_relative){var strTok1;var strTok2;var breakPoint=0;var outputString="";base_url=base_url.substring(0,base_url.lastIndexOf('/'));strTok1=base_url.split('/');strTok2=url_to_relative.split('/');if(strTok1.length>=strTok2.length){for(var i=0;i<strTok1.length;i++){if(i>=strTok2.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(strTok1.length<strTok2.length){for(var i=0;i<strTok2.length;i++){if(i>=strTok1.length||strTok1[i]!=strTok2[i]){breakPoint=i+1;break;}}}if(breakPoint==1)return url_to_relative;for(var i=0;i<(strTok1.length-(breakPoint-1));i++)outputString+="../";for(var i=breakPoint-1;i<strTok2.length;i++){if(i!=(breakPoint-1))outputString+="/"+strTok2[i];else outputString+=strTok2[i];}return outputString;};TinyMCE.prototype.convertRelativeToAbsoluteURL=function(base_url,relative_url){var baseURL=TinyMCE.prototype.parseURL(base_url);var relURL=TinyMCE.prototype.parseURL(relative_url);if(relative_url==""||relative_url.charAt(0)=='/'||relative_url.indexOf('://')!=-1||relative_url.indexOf('mailto:')!=-1||relative_url.indexOf('javascript:')!=-1||tinyMCE.regexpReplace(relative_url,'[ \t\r\n\+]|%20','').charAt(0)=="#")return relative_url;baseURLParts=baseURL['path'].split('/');relURLParts=relURL['path'].split('/');var newBaseURLParts=new Array();for(var i=baseURLParts.length-1;i>=0;i--){if(baseURLParts[i].length==0)continue;newBaseURLParts[newBaseURLParts.length]=baseURLParts[i];}baseURLParts=newBaseURLParts.reverse();var newRelURLParts=new Array();var numBack=0;for(var i=relURLParts.length-1;i>=0;i--){if(relURLParts[i].length==0||relURLParts[i]==".")continue;if(relURLParts[i]=='..'){numBack++;continue;}if(numBack>0){numBack--;continue;}newRelURLParts[newRelURLParts.length]=relURLParts[i];}relURLParts=newRelURLParts.reverse();var len=baseURLParts.length-numBack;var absPath=(len<=0?"":"/")+baseURLParts.slice(0,len).join('/')+"/"+relURLParts.join('/');var start="",end="";if(baseURL['protocol'])start+=baseURL['protocol']+"://";if(baseURL['host'])start+=baseURL['host'];if(baseURL['port'])start+=":"+baseURL['port'];if(relURL['query'])end+="?"+relURL['query'];if(relURL['anchor'])end+="#"+relURL['anchor'];if(relative_url.charAt(relative_url.length-1)=="/")end+="/";return start+absPath+end;};TinyMCE.prototype.getParam=function(name,default_value,strip_whitespace,split_chr){var value=(typeof(this.settings[name])=="undefined")?default_value:this.settings[name];if(value=="true"||value=="false")return(value=="true");if(strip_whitespace)value=tinyMCE.regexpReplace(value,"[ \t\r\n]","");if(typeof(split_chr)!="undefined"&&split_chr!=null){value=value.split(split_chr);var outArray=new Array();for(var i=0;i<value.length;i++){if(value[i]&&value[i]!="")outArray[outArray.length]=value[i];}value=outArray;}return value;};TinyMCE.prototype.getLang=function(name,default_value,parse_entities){var value=(typeof(tinyMCELang[name])=="undefined")?default_value:tinyMCELang[name];if(parse_entities){var el=document.createElement("div");el.innerHTML=value;value=el.innerHTML;}return value;};TinyMCE.prototype.replaceVar=function(replace_haystack,replace_var,replace_str){var re=new RegExp('{\\\$'+replace_var+'}','g');return replace_haystack.replace(re,replace_str);};TinyMCE.prototype.replaceVars=function(replace_haystack,replace_vars){for(var key in replace_vars){var value=replace_vars[key];replace_haystack=tinyMCE.replaceVar(replace_haystack,key,value);}return replace_haystack;};TinyMCE.prototype.triggerNodeChange=function(focus,setup_content){if(tinyMCE.settings['handleNodeChangeCallback']){if(tinyMCE.selectedInstance){var inst=tinyMCE.selectedInstance;var editorId=inst.editorId;var elm=(typeof(setup_content)!="undefined"&&setup_content)?tinyMCE.selectedElement:inst.getFocusElement();var undoIndex=-1;var undoLevels=-1;var anySelection=false;var selectedText=inst.getSelectedText();if(tinyMCE.settings["auto_resize"]){var doc=inst.getDoc();inst.iframeElement.style.width=doc.body.offsetWidth+"px";inst.iframeElement.style.height=doc.body.offsetHeight+"px";}if(tinyMCE.selectedElement)anySelection=(tinyMCE.selectedElement.nodeName.toLowerCase()=="img")||(selectedText&&selectedText.length>0);if(tinyMCE.settings['custom_undo_redo']){undoIndex=inst.undoIndex;undoLevels=inst.undoLevels.length;}tinyMCE.executeCallback('handleNodeChangeCallback','_handleNodeChange',0,editorId,elm,undoIndex,undoLevels,inst.visualAid,anySelection);}}if(this.selectedInstance&&(typeof(focus)=="undefined"||focus))this.selectedInstance.contentWindow.focus();};TinyMCE.prototype._customCleanup=function(type,content){var customCleanup=tinyMCE.settings['cleanup_callback'];if(customCleanup!=""&&eval("typeof("+customCleanup+")")!="undefined")content=eval(customCleanup+"(type, content);");var plugins=tinyMCE.getParam('plugins','',true,',');for(var i=0;i<plugins.length;i++){if(eval("typeof(TinyMCE_"+plugins[i]+"_cleanup)")!="undefined")content=eval("TinyMCE_"+plugins[i]+"_cleanup(type, content);");}return content;};TinyMCE.prototype.getContent=function(editor_id){if(typeof(editor_id)!="undefined")tinyMCE.selectedInstance=tinyMCE.getInstanceById(editor_id);if(tinyMCE.selectedInstance)return tinyMCE._cleanupHTML(this.selectedInstance.getDoc(),tinyMCE.settings,this.selectedInstance.getBody(),false,true);return null;};TinyMCE.prototype.setContent=function(html_content){if(tinyMCE.selectedInstance)tinyMCE.selectedInstance.execCommand('mceSetContent',false,html_content);};TinyMCE.prototype.importThemeLanguagePack=function(name){if(typeof(name)=="undefined")name=tinyMCE.settings['theme'];tinyMCE.loadScript(tinyMCE.baseURL+'/themes/'+name+'/langs/'+tinyMCE.settings['language']+'.js');};TinyMCE.prototype.importPluginLanguagePack=function(name,valid_languages){var lang="en";valid_languages=valid_languages.split(',');for(var i=0;i<valid_languages.length;i++){if(tinyMCE.settings['language']==valid_languages[i])lang=tinyMCE.settings['language'];}tinyMCE.loadScript(tinyMCE.baseURL+'/plugins/'+name+'/langs/'+lang+'.js');};TinyMCE.prototype.applyTemplate=function(html,args){html=tinyMCE.replaceVar(html,"themeurl",tinyMCE.themeURL);if(typeof(args)!="undefined")html=tinyMCE.replaceVars(html,args);html=tinyMCE.replaceVars(html,tinyMCE.settings);html=tinyMCE.replaceVars(html,tinyMCELang);return html;};TinyMCE.prototype.openWindow=function(template,args){var html,width,height,x,y,resizable,scrollbars,url;args['mce_template_file']=template['file'];tinyMCE.windowArgs=args;html=template['html'];if(!(width=template['width']))width=320;if(!(height=template['height']))height=200;if(tinyMCE.isMSIE)height+=30;x=parseInt(screen.width/2.0)-(width/2.0);y=parseInt(screen.height/2.0)-(height/2.0);resizable=(args&&args['resizable'])?args['resizable']:"no";scrollbars=(args&&args['scrollbars'])?args['scrollbars']:"no";url=tinyMCE.baseURL+"/themes/"+tinyMCE.getParam("theme")+"/"+template['file'];for(var name in args)url=tinyMCE.replaceVar(url,name,escape(args[name]));if(html){html=tinyMCE.replaceVar(html,"css",this.settings['popups_css']);html=tinyMCE.applyTemplate(html,args);var win=window.open("","mcePopup","top="+y+",left="+x+",scrollbars="+scrollbars+",dialog=yes,minimizable="+resizable+",modal=yes,width="+width+",height="+height+",resizable="+resizable);win.document.write(html);win.document.close();win.resizeTo(width,height);win.focus();}else{if(tinyMCE.isMSIE&&resizable!='yes'){var features="resizable:"+resizable+";scroll:"+scrollbars+";status:yes;center:yes;help:no;dialogWidth:"+width+"px;dialogHeight:"+height+"px;";window.showModalDialog(url,window,features);}else{var modal=(resizable=="yes")?"no":"yes";var win=window.open(url,"mcePopup","top="+y+",left="+x+",scrollbars="+scrollbars+",dialog="+modal+",minimizable="+resizable+",modal="+modal+",width="+width+",height="+height+",resizable="+resizable);eval('try { win.resizeTo(width, height); } catch(e) { }');win.focus();}}};TinyMCE.prototype.getVisualAidClass=function(class_name,state){var aidClass=tinyMCE.settings['visual_table_class'];if(typeof(state)=="undefined")state=tinyMCE.settings['visual'];var classNames=new Array();var ar=class_name.split(' ');for(var i=0;i<ar.length;i++){if(ar[i]==aidClass)ar[i]="";if(ar[i]!="")classNames[classNames.length]=ar[i];}if(state)classNames[classNames.length]=aidClass;var className="";for(var i=0;i<classNames.length;i++){if(i>0)className+=" ";className+=classNames[i];}return className;};TinyMCE.prototype.handleVisualAid=function(element,deep,state){if(!element)return;var tableElement=null;switch(element.nodeName.toLowerCase()){case "table":var oldW=element.style.width;var oldH=element.style.height;element.className=tinyMCE.getVisualAidClass(element.className,state&&element.getAttribute("border")==0);element.style.width=oldW;element.style.height=oldH;for(var y=0;y<element.rows.length;y++){for(var x=0;x<element.rows[y].cells.length;x++){var className=tinyMCE.getVisualAidClass(element.rows[y].cells[x].className,state&&element.getAttribute("border")==0);element.rows[y].cells[x].className=className;}}break;}if(deep&&element.hasChildNodes()){for(var i=0;i<element.childNodes.length;i++)tinyMCE.handleVisualAid(element.childNodes[i],deep,state);}};TinyMCE.prototype.getAttrib=function(elm,name,default_value){var v=elm.getAttribute(name);if(name=="class"&&!v)v=elm.className;if(typeof(default_value)=="undefined")default_value="";return(v&&v!="")?v:default_value;};TinyMCE.prototype.setAttrib=function(element,name,value,fix_value){if(typeof(value)=="number")value=""+value;if(fix_value){if(value==null)value="";var re=new RegExp('[^0-9%]','g');value=value.replace(re,'');}if(name=="class")element.className=value;if(value!=null&&value!=""&&value!=-1)element.setAttribute(name,value);else element.removeAttribute(name);};TinyMCE.prototype._setHTML=function(doc,html_content){if(tinyMCE.isMSIE){var re=new RegExp('<p><hr /></p>','g');html_content=html_content.replace(re,"<hr>");}doc.body.innerHTML=html_content;if(tinyMCE.isMSIE&&tinyMCE.settings['fix_content_duplication']){var paras=doc.getElementsByTagName("P");for(var i=0;i<paras.length;i++){var node=paras[i];while((node=node.parentNode)!=null){if(node.nodeName.toLowerCase()=="p")node.outerHTML=node.innerHTML;}}var html=doc.body.innerHTML;if(html.indexOf('="mso')!=-1){for(var i=0;i<doc.body.all.length;i++){var el=doc.body.all[i];el.removeAttribute("className","",0);el.removeAttribute("style","",0);}html=doc.body.innerHTML;html=tinyMCE.regexpReplace(html,"<o:p><\/o:p>","<br />");html=tinyMCE.regexpReplace(html,"<o:p>&nbsp;<\/o:p>","");html=tinyMCE.regexpReplace(html,"<st1:.*?>","");html=tinyMCE.regexpReplace(html,"<p><\/p>","");html=tinyMCE.regexpReplace(html,"<p><\/p>\r\n<p><\/p>","");html=tinyMCE.regexpReplace(html,"<p>&nbsp;<\/p>","<br />");html=tinyMCE.regexpReplace(html,"<p>\s*(<p>\s*)?","<p>");html=tinyMCE.regexpReplace(html,"<\/p>\s*(<\/p>\s*)?","</p>");}doc.body.innerHTML=html;}};TinyMCE.prototype.getImageSrc=function(str){var pos=-1;if(!str)return "";if((pos=str.indexOf('this.src='))!=-1){var src=str.substring(pos+10);src=src.substring(0,src.indexOf('\''));return src;}return "";};TinyMCE.prototype._getElementById=function(element_id){var elm=document.getElementById(element_id);if(!elm){for(var j=0;j<document.forms.length;j++){for(var k=0;k<document.forms[j].elements.length;k++){if(document.forms[j].elements[k].name==element_id){elm=document.forms[j].elements[k];break;}}}}return elm;};TinyMCE.prototype.getEditorId=function(form_element){var inst=this.getInstanceById(form_element);if(!inst)return null;return inst.editorId;};TinyMCE.prototype.getInstanceById=function(editor_id){var inst=this.instances[editor_id];if(!inst){for(var instanceName in tinyMCE.instances){var instance=tinyMCE.instances[instanceName];if(instance.formTargetElementId==editor_id){inst=instance;break;}}}return inst;};TinyMCE.prototype.queryInstanceCommandValue=function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandValue(command);return false;};TinyMCE.prototype.queryInstanceCommandState=function(editor_id,command){var inst=tinyMCE.getInstanceById(editor_id);if(inst)return inst.queryCommandState(command);return null;};TinyMCE.prototype.setWindowArg=function(name,value){this.windowArgs[name]=value;};TinyMCE.prototype.getWindowArg=function(name,default_value){return(typeof(this.windowArgs[name])=="undefined")?default_value:this.windowArgs[name];};TinyMCE.prototype.getCSSClasses=function(editor_id,doc){var output=new Array();if(typeof(tinyMCE.cssClasses)!="undefined")return tinyMCE.cssClasses;if(typeof(editor_id)=="undefined"&&typeof(doc)=="undefined"){var instance;for(var instanceName in tinyMCE.instances){instance=tinyMCE.instances[instanceName];break;}doc=instance.getDoc();}if(typeof(doc)=="undefined"){var instance=tinyMCE.getInstanceById(editor_id);doc=instance.getDoc();}if(doc){var styles=tinyMCE.isMSIE?doc.styleSheets:doc.styleSheets;if(styles&&styles.length>0){var csses=null;eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(0).rules : doc.styleSheets[0].cssRules;} catch(e) {}");if(!csses)return new Array();for(var i=0;i<csses.length;i++){var selectorText=csses[i].selectorText;if(selectorText){var rules=selectorText.split(',');for(var c=0;c<rules.length;c++){if(rules[c].indexOf(' ')!=-1||rules[c].indexOf(':')!=-1||rules[c].indexOf('mce_')==1)continue;if(rules[c]=="."+tinyMCE.settings['visual_table_class'])continue;if(rules[c].indexOf('.')!=-1){output[output.length]=rules[c].substring(rules[c].indexOf('.')+1);}}}}}}if(output.length>0)tinyMCE.cssClasses=output;return output;};TinyMCE.prototype.regexpReplace=function(in_str,reg_exp,replace_str,opts){if(typeof(opts)=="undefined")opts='g';var re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);};TinyMCE.prototype.cleanupEventStr=function(str){str=""+str;str=str.replace('function anonymous()\n{\n','');str=str.replace('\n}','');return str;};TinyMCE.prototype.getAbsPosition=function(node){var pos=new Object();pos.absLeft=pos.absTop=0;var parentNode=node;while(parentNode){pos.absLeft+=parentNode.offsetLeft;pos.absTop+=parentNode.offsetTop;parentNode=parentNode.offsetParent;}return pos;};TinyMCE.prototype.openFileBrowser=function(field_name,url,type,win){var cb=tinyMCE.getParam("file_browser_callback");this.setWindowArg("window",win);if(eval('typeof('+cb+')')=="undefined")alert("Callback function: "+cb+" could not be found.");else eval(cb+"(field_name, url, type, win);");};TinyMCE.prototype.getControlHTML=function(control_name){var themePlugins=tinyMCE.getParam('plugins','',true,',');var templateFunction;for(var i=themePlugins.length;i>=0;i--){templateFunction='TinyMCE_'+themePlugins[i]+"_getControlHTML";if(eval("typeof("+templateFunction+")")!='undefined'){var html=eval(templateFunction+"('"+control_name+"');");if(html!="")return tinyMCE.replaceVar(html,"pluginurl",tinyMCE.baseURL+"/plugins/"+themePlugins[i]);}}return eval('TinyMCE_'+tinyMCE.settings['theme']+"_getControlHTML"+"('"+control_name+"');");};TinyMCE.prototype._themeExecCommand=function(editor_id,element,command,user_interface,value){var themePlugins=tinyMCE.getParam('plugins','',true,',');var templateFunction;for(var i=themePlugins.length;i>=0;i--){templateFunction='TinyMCE_'+themePlugins[i]+"_execCommand";if(eval("typeof("+templateFunction+")")!='undefined'){if(eval(templateFunction+"(editor_id, element, command, user_interface, value);"))return true;}}templateFunction='TinyMCE_'+tinyMCE.settings['theme']+"_execCommand";if(eval("typeof("+templateFunction+")")!='undefined')return eval(templateFunction+"(editor_id, element, command, user_interface, value);");return false;};TinyMCE.prototype._getThemeFunction=function(suffix,skip_plugins){if(skip_plugins)return 'TinyMCE_'+tinyMCE.settings['theme']+suffix;var themePlugins=tinyMCE.getParam('plugins','',true,',');var templateFunction;for(var i=themePlugins.length;i>=0;i--){templateFunction='TinyMCE_'+themePlugins[i]+suffix;if(eval("typeof("+templateFunction+")")!='undefined')return templateFunction;}return 'TinyMCE_'+tinyMCE.settings['theme']+suffix;};TinyMCE.prototype.isFunc=function(func_name){if(func_name==null||func_name=="")return false;return eval("typeof("+func_name+")")!="undefined";};TinyMCE.prototype.exec=function(func_name,args){var str=func_name+'(';for(var i=3;i<args.length;i++){str+='args['+i+']';if(i<args.length-1)str+=',';}str+=');';return eval(str);};TinyMCE.prototype.executeCallback=function(param,suffix,mode){switch(mode){case 0:var state=false;var plugins=tinyMCE.getParam('plugins','',true,',');for(var i=0;i<plugins.length;i++){var func="TinyMCE_"+plugins[i]+suffix;if(tinyMCE.isFunc(func)){tinyMCE.exec(func,this.executeCallback.arguments);state=true;}}var func='TinyMCE_'+tinyMCE.settings['theme']+suffix;if(tinyMCE.isFunc(func)){tinyMCE.exec(func,this.executeCallback.arguments);state=true;}var func=tinyMCE.getParam(param,'');if(tinyMCE.isFunc(func)){tinyMCE.exec(func,this.executeCallback.arguments);state=true;}return state;case 1:var plugins=tinyMCE.getParam('plugins','',true,',');for(var i=0;i<plugins.length;i++){var func="TinyMCE_"+plugins[i]+suffix;if(tinyMCE.isFunc(func)){if(tinyMCE.exec(func,this.executeCallback.arguments))return true;}}var func='TinyMCE_'+tinyMCE.settings['theme']+suffix;if(tinyMCE.isFunc(func)){if(tinyMCE.exec(func,this.executeCallback.arguments))return true;}var func=tinyMCE.getParam(param,'');if(tinyMCE.isFunc(func)){if(tinyMCE.exec(func,this.executeCallback.arguments))return true;}return false;}};function TinyMCEControl(settings){this.undoLevels=new Array();this.undoIndex=0;this.isDirty=false;this.settings=settings;this.settings['theme']=tinyMCE.getParam("theme","default");this.settings['width']=tinyMCE.getParam("width",-1);this.settings['height']=tinyMCE.getParam("height",-1);};TinyMCEControl.prototype.repaint=function(){if(tinyMCE.isMSIE)return;this.getBody().style.display='none';this.getBody().style.display='block';};TinyMCEControl.prototype.switchSettings=function(){if(tinyMCE.configs.length>1&&tinyMCE.currentConfig!=this.settings['index']){tinyMCE.settings=this.settings;tinyMCE.currentConfig=this.settings['index'];}};TinyMCEControl.prototype.fixBrokenURLs=function(){var body=this.getBody();var elms=body.getElementsByTagName("img");for(var i=0;i<elms.length;i++){var src=elms[i].getAttribute('mce_real_src');if(src&&src!="")elms[i].setAttribute("src",src);}var elms=body.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var href=elms[i].getAttribute('mce_real_href');if(href&&href!="")elms[i].setAttribute("href",href);}};TinyMCEControl.prototype.convertAllRelativeURLs=function(){var body=this.getBody();var elms=body.getElementsByTagName("img");for(var i=0;i<elms.length;i++){var src=elms[i].getAttribute('src');if(src&&src!=""){src=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],src);elms[i].setAttribute("src",src);elms[i].setAttribute("mce_real_src",src);}}var elms=body.getElementsByTagName("a");for(var i=0;i<elms.length;i++){var href=elms[i].getAttribute('href');if(href&&href!=""){href=tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'],href);elms[i].setAttribute("href",href);elms[i].setAttribute("mce_real_href",href);}}};TinyMCEControl.prototype.getSelectedHTML=function(){var elm=document.createElement("body");if(tinyMCE.isGecko)elm.appendChild(this.getRng().cloneContents());else elm.innerHTML=this.getRng().htmlText;return tinyMCE._cleanupHTML(this.contentDocument,this.settings,elm,this.visualAid);};TinyMCEControl.prototype.getSelectedText=function(){if(tinyMCE.isMSIE){var doc=this.getDoc();if(doc.selection.type=="Text"){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText='';}else{var sel=this.getSel();if(sel&&sel.toString)selectedText=sel.toString();else selectedText='';}return selectedText;};TinyMCEControl.prototype.selectNode=function(node,collapse,select_text_node,to_start){if(!node)return;if(typeof(collapse)=="undefined")collapse=true;if(typeof(select_text_node)=="undefined")select_text_node=false;if(typeof(to_start)=="undefined")to_start=true;if(tinyMCE.isMSIE){var rng=this.getBody().createTextRange();try{rng.moveToElementText(node);if(collapse)rng.collapse(to_start);rng.select();}catch(e){}}else{var sel=this.getSel();if(!sel)return;if(tinyMCE.isSafari){sel.realSelection.setBaseAndExtent(node,0,node,node.innerText.length);if(collapse){if(to_start)sel.realSelection.collapseToStart();else sel.realSelection.collapseToEnd();}this.scrollToNode(node);return;}var rng=this.getDoc().createRange();if(select_text_node){var nodes=tinyMCE.getNodeTree(node,new Array(),3);if(nodes.length>0)rng.selectNodeContents(nodes[0]);else rng.selectNodeContents(node);}else rng.selectNode(node);if(collapse){if(!to_start&&node.nodeType==3){rng.setStart(node,node.nodeValue.length);rng.setEnd(node,node.nodeValue.length);}else rng.collapse(to_start);}sel.removeAllRanges();sel.addRange(rng);}this.scrollToNode(node);tinyMCE.selectedElement=null;if(node.nodeType==1)tinyMCE.selectedElement=node;};TinyMCEControl.prototype.scrollToNode=function(node){var pos=tinyMCE.getAbsPosition(node);var doc=this.getDoc();var scrollX=doc.body.scrollLeft+doc.documentElement.scrollLeft;var scrollY=doc.body.scrollTop+doc.documentElement.scrollTop;var height=tinyMCE.isMSIE?document.getElementById(this.editorId).style.pixelHeight:this.targetElement.clientHeight;if(!tinyMCE.settings['auto_resize']&&!(node.absTop>scrollY&&node.absTop<(scrollY-25+height)))this.contentWindow.scrollTo(pos.absLeft,pos.absTop-height+25);};TinyMCEControl.prototype.getBody=function(){return this.getDoc().body;};TinyMCEControl.prototype.getDoc=function(){return this.contentWindow.document;};TinyMCEControl.prototype.getWin=function(){return this.contentWindow;};TinyMCEControl.prototype.getSel=function(){if(tinyMCE.isMSIE)return this.getDoc().selection;var sel=this.contentWindow.getSelection();if(tinyMCE.isSafari&&!sel.getRangeAt){var newSel=new Object();var doc=this.getDoc();function getRangeAt(idx){var rng=new Object();rng.startContainer=this.focusNode;rng.endContainer=this.anchorNode;rng.commonAncestorContainer=this.focusNode;rng.createContextualFragment=function(html){if(html.charAt(0)=='<'){var elm=doc.createElement("div");elm.innerHTML=html;return elm.firstChild;}return doc.createTextNode("UNSUPPORTED, DUE TO LIMITATIONS IN SAFARI!");};rng.deleteContents=function(){doc.execCommand("Delete",false,"");};return rng;}newSel.focusNode=sel.baseNode;newSel.focusOffset=sel.baseOffset;newSel.anchorNode=sel.extentNode;newSel.anchorOffset=sel.extentOffset;newSel.getRangeAt=getRangeAt;newSel.text=""+sel;newSel.realSelection=sel;newSel.toString=function(){return this.text;};return newSel;}return sel;};TinyMCEControl.prototype.getRng=function(){var sel=this.getSel();if(sel==null)return null;if(tinyMCE.isMSIE)return sel.createRange();return this.getSel().getRangeAt(0);};TinyMCEControl.prototype._insertPara=function(e){function isEmpty(para){function isEmptyHTML(html){return html.replace(new RegExp('[ \t\r\n]+','g'),'').toLowerCase()=="";}if(para.getElementsByTagName("img").length>0)return false;if(para.getElementsByTagName("table").length>0)return false;if(para.getElementsByTagName("hr").length>0)return false;var nodes=tinyMCE.getNodeTree(para,new Array(),3);for(var i=0;i<nodes.length;i++){if(!isEmptyHTML(nodes[i].nodeValue))return false;}return true;}var doc=this.getDoc();var sel=this.getSel();var win=this.contentWindow;var rng=sel.getRangeAt(0);var body=doc.body;var rootElm=doc.documentElement;var self=this;var blockName="P";var rngBefore=doc.createRange();rngBefore.setStart(sel.anchorNode,sel.anchorOffset);rngBefore.collapse(true);var rngAfter=doc.createRange();rngAfter.setStart(sel.focusNode,sel.focusOffset);rngAfter.collapse(true);var direct=rngBefore.compareBoundaryPoints(rngBefore.START_TO_END,rngAfter)<0;var startNode=direct?sel.anchorNode:sel.focusNode;var startOffset=direct?sel.anchorOffset:sel.focusOffset;var endNode=direct?sel.focusNode:sel.anchorNode;var endOffset=direct?sel.focusOffset:sel.anchorOffset;var startBlock=tinyMCE.getParentBlockElement(startNode);var endBlock=tinyMCE.getParentBlockElement(endNode);if(startBlock!=null){blockName=startBlock.nodeName.toUpperCase();if(blockName=="TD"||blockName=="TABLE")blockName="P";}if((startBlock!=null&&startBlock.nodeName.toLowerCase()=="li")||(endBlock!=null&&endBlock.nodeName.toLowerCase()=="li"))return false;if((startBlock!=null&&startBlock.nodeName.toLowerCase()=="table")||(endBlock!=null&&endBlock.nodeName.toLowerCase()=="table"))startBlock=endBlock=null;var paraBefore=(startBlock!=null&&startBlock.nodeName.toUpperCase()==blockName)?startBlock.cloneNode(false):doc.createElement(blockName);var paraAfter=(endBlock!=null&&endBlock.nodeName.toUpperCase()==blockName)?endBlock.cloneNode(false):doc.createElement(blockName);var startChop=startNode;var endChop=endNode;node=startChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;startChop=node;}while((node=node.previousSibling?node.previousSibling:node.parentNode));node=endChop;do{if(node==body||node.nodeType==9||tinyMCE.isBlockElement(node))break;endChop=node;}while((node=node.nextSibling?node.nextSibling:node.parentNode));if(startBlock==null){rng.deleteContents();sel.removeAllRanges();if(startChop!=rootElm&&endChop!=rootElm){rngBefore=rng.cloneRange();if(startChop==body)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);paraBefore.appendChild(rngBefore.cloneContents());if(endChop.parentNode.nodeName==blockName)endChop=endChop.parentNode;rng.setEndAfter(endChop);var contents=rng.cloneContents();if(contents.firstChild&&(contents.firstChild.nodeName==blockName||contents.firstChild.nodeName.toLowerCase()=="body")){var nodes=contents.firstChild.childNodes;for(var i=0;i<nodes.length;i++){if(nodes[i].nodeName.toLowerCase()!="body")paraAfter.appendChild(nodes[i]);}}else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";rng.deleteContents();rngAfter.deleteContents();rngBefore.deleteContents();paraAfter.normalize();rngBefore.insertNode(paraAfter);paraBefore.normalize();rngBefore.insertNode(paraBefore);}else{body.innerHTML="<"+blockName+">&nbsp;</"+blockName+"><"+blockName+">&nbsp;</"+blockName+">";paraAfter=body.childNodes[1];}this.selectNode(paraAfter,true,true);return true;}if(startChop.nodeName==blockName)rngBefore.setStart(startChop,0);else rngBefore.setStartBefore(startChop);rngBefore.setEnd(startNode,startOffset);paraBefore.appendChild(rngBefore.cloneContents());rngAfter.setEndAfter(endChop);rngAfter.setStart(endNode,endOffset);var contents=rngAfter.cloneContents();if(contents.firstChild&&contents.firstChild.nodeName==blockName){var nodes=contents.firstChild.childNodes;for(var i=0;i<nodes.length;i++){if(nodes[i].nodeName.toLowerCase()!="body")paraAfter.appendChild(nodes[i]);}}else paraAfter.appendChild(contents);if(isEmpty(paraBefore))paraBefore.innerHTML="&nbsp;";if(isEmpty(paraAfter))paraAfter.innerHTML="&nbsp;";var rng=doc.createRange();if(!startChop.previousSibling&&startChop.parentNode.nodeName.toUpperCase()==blockName){rng.setStartBefore(startChop.parentNode);}else{if(rngBefore.startContainer.nodeName.toUpperCase()==blockName&&rngBefore.startOffset==0)rng.setStartBefore(rngBefore.startContainer);else rng.setStart(rngBefore.startContainer,rngBefore.startOffset);}if(!endChop.nextSibling&&endChop.parentNode.nodeName.toUpperCase()==blockName)rng.setEndAfter(endChop.parentNode);else rng.setEnd(rngAfter.endContainer,rngAfter.endOffset);rng.deleteContents();rng.insertNode(paraAfter);rng.insertNode(paraBefore);paraAfter.normalize();paraBefore.normalize();this.selectNode(paraAfter,true,true);return true;};TinyMCEControl.prototype._handleBackSpace=function(evt_type){var doc=this.getDoc();var sel=this.getSel();if(sel==null)return false;var rng=sel.getRangeAt(0);var node=rng.startContainer;var elm=node.nodeType==3?node.parentNode:node;if(node==null)return;if(elm&&elm.nodeName==""){var para=doc.createElement("p");while(elm.firstChild)para.appendChild(elm.firstChild);elm.parentNode.insertBefore(para,elm);elm.parentNode.removeChild(elm);var rng=rng.cloneRange();rng.setStartBefore(node.nextSibling);rng.setEndAfter(node.nextSibling);rng.extractContents();this.selectNode(node.nextSibling,true,true);}var para=tinyMCE.getParentBlockElement(node);if(para!=null&&para.nodeName.toLowerCase()=='p'&&evt_type=="keypress"){var htm=para.innerHTML;var block=tinyMCE.getParentBlockElement(node);if(htm==""||htm=="&nbsp;"||block.nodeName.toLowerCase()=="li"){var prevElm=para.previousSibling;while(prevElm!=null&&prevElm.nodeType!=1)prevElm=prevElm.previousSibling;if(prevElm==null)return false;var nodes=tinyMCE.getNodeTree(prevElm,new Array(),3);var lastTextNode=nodes.length==0?null:nodes[nodes.length-1];if(lastTextNode!=null)this.selectNode(lastTextNode,true,false,false);para.parentNode.removeChild(para);return true;}}return false;};TinyMCEControl.prototype._insertSpace=function(){return true;};TinyMCEControl.prototype.autoResetDesignMode=function(){if(!tinyMCE.isMSIE&&tinyMCE.settings['auto_reset_designmode']){var sel=this.getSel();if(!sel||!sel.rangeCount||sel.rangeCount==0)eval('try { this.getDoc().designMode = "On"; } catch(e) {}');}};TinyMCEControl.prototype.isDirty=function(){return this.isDirty;};TinyMCEControl.prototype.execCommand=function(command,user_interface,value){var doc=this.getDoc();var win=this.getWin();if(!tinyMCE.isMSIE&&!this.useCSS){doc.execCommand("useCSS",false,true);this.useCSS=true;}this.contentDocument=doc;if(tinyMCE._themeExecCommand(this.editorId,this.getBody(),command,user_interface,value))return;if(command!="mceAddUndoLevel"&&command!="Undo"&&command!="Redo"&&command!="mceImage"&&command!="mceLink"&&command!="mceToggleVisualAid"&&(command!="mceInsertTable"&&!user_interface))this.execCommand("mceAddUndoLevel");if(this.getFocusElement()&&this.getFocusElement().nodeName.toLowerCase()=="img"){var align=this.getFocusElement().getAttribute('align');switch(command){case "JustifyLeft":if(align=='left')this.getFocusElement().removeAttribute('align');else this.getFocusElement().setAttribute('align','left');tinyMCE.triggerNodeChange();return;case "JustifyCenter":if(align=='middle')this.getFocusElement().removeAttribute('align');else this.getFocusElement().setAttribute('align','middle');tinyMCE.triggerNodeChange();return;case "JustifyRight":if(align=='right')this.getFocusElement().removeAttribute('align');else this.getFocusElement().setAttribute('align','right');tinyMCE.triggerNodeChange();return;}}if(tinyMCE.settings['force_br_newlines']){var alignValue="";if(doc.selection.type!="Control"){switch(command){case "JustifyLeft":alignValue="left";break;case "JustifyCenter":alignValue="center";break;case "JustifyFull":alignValue="justify";break;case "JustifyRight":alignValue="right";break;}if(alignValue!=""){var rng=doc.selection.createRange();if((divElm=tinyMCE.getParentElement(rng.parentElement(),"div"))!=null)divElm.setAttribute("align",alignValue);else if(rng.pasteHTML&&rng.htmlText.length>0)rng.pasteHTML('<div align="'+alignValue+'">'+rng.htmlText+"</div>");tinyMCE.triggerNodeChange();return;}}}switch(command){case "mceSelectNode":this.selectNode(value);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=value;break;case "mceSelectNodeDepth":var parentNode=this.getFocusElement();for(var i=0;parentNode;i++){if(parentNode.nodeName.toLowerCase()=="body")break;if(parentNode.nodeName.toLowerCase()=="#text"){i--;parentNode=parentNode.parentNode;continue;}if(i==value){this.selectNode(parentNode,false);tinyMCE.triggerNodeChange();tinyMCE.selectedNode=parentNode;return;}parentNode=parentNode.parentNode;}break;case "HiliteColor":if(tinyMCE.isGecko){this.getDoc().execCommand("useCSS",false,false);this.getDoc().execCommand('hilitecolor',false,value);this.getDoc().execCommand("useCSS",false,true);}else this.getDoc().execCommand('BackColor',false,value);break;case "Cut":case "Copy":case "Paste":var cmdFailed=false;eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');if(tinyMCE.isGecko&&cmdFailed){if(confirm(tinyMCE.getLang('lang_clipboard_msg')))window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html','mceExternal');return;}else tinyMCE.triggerNodeChange();break;case "mceSetContent":if(!value)value="";html_content=tinyMCE._customCleanup("insert_to_editor",value);tinyMCE._setHTML(doc,value);doc.body.innerHTML=tinyMCE._cleanupHTML(doc,tinyMCE.settings,doc.body);tinyMCE.handleVisualAid(doc.body,true,this.visualAid);return true;case "mceLink":var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=this.getSel().toString();if(!tinyMCE.linkElement){if((tinyMCE.selectedElement.nodeName.toLowerCase()!="img")&&(selectedText.length<=0))return;}var href="",target="",title="",onclick="",action="insert";if(tinyMCE.selectedElement.nodeName.toLowerCase()=="a")tinyMCE.linkElement=tinyMCE.selectedElement;if(tinyMCE.linkElement!=null&&tinyMCE.getAttrib(tinyMCE.linkElement,'href')=="")tinyMCE.linkElement=null;if(tinyMCE.linkElement){href=tinyMCE.getAttrib(tinyMCE.linkElement,'href');target=tinyMCE.getAttrib(tinyMCE.linkElement,'target');title=tinyMCE.getAttrib(tinyMCE.linkElement,'title');onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'mce_onclick');if(onclick=="")onclick=tinyMCE.getAttrib(tinyMCE.linkElement,'onclick');onclick=tinyMCE.cleanupEventStr(onclick);mceRealHref=tinyMCE.getAttrib(tinyMCE.linkElement,'mce_real_href');if(mceRealHref!="")href=mceRealHref;href=eval(tinyMCE.settings['urlconverter_callback']+"(href, tinyMCE.linkElement, true);");action="update";}if(this.settings['insertlink_callback']){var returnVal=eval(this.settings['insertlink_callback']+"(href, target, title, onclick, action);");if(returnVal&&returnVal['href'])tinyMCE.insertLink(returnVal['href'],returnVal['target'],returnVal['title'],returnVal['onclick']);}else{tinyMCE.openWindow(this.insertLinkTemplate,{href:href,target:target,title:title,onclick:onclick,action:action});}break;case "mceImage":var src="",alt="",border="",hspace="",vspace="",width="",height="",align="";var title="",onmouseover="",onmouseout="",action="insert";var img=tinyMCE.imgElement;if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img"){img=tinyMCE.selectedElement;tinyMCE.imgElement=img;}if(img){if(tinyMCE.getAttrib(img,'name').indexOf('mce_')==0)return;src=tinyMCE.getAttrib(img,'src');alt=tinyMCE.getAttrib(img,'alt');if(alt=="")alt=tinyMCE.getAttrib(img,'title');if(tinyMCE.isGecko){var w=img.style.width;if(w!=null&&w!="")img.setAttribute("width",w);var h=img.style.height;if(h!=null&&h!="")img.setAttribute("height",h);}border=tinyMCE.getAttrib(img,'border');hspace=tinyMCE.getAttrib(img,'hspace');vspace=tinyMCE.getAttrib(img,'vspace');width=tinyMCE.getAttrib(img,'width');height=tinyMCE.getAttrib(img,'height');align=tinyMCE.getAttrib(img,'align');onmouseover=tinyMCE.getAttrib(img,'onmouseover');onmouseout=tinyMCE.getAttrib(img,'onmouseout');title=tinyMCE.getAttrib(img,'title');if(tinyMCE.isMSIE){width=img.attributes['width'].specified?width:"";height=img.attributes['height'].specified?height:"";}onmouseover=tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseover));onmouseout=tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseout));mceRealSrc=tinyMCE.getAttrib(img,'mce_real_src');if(mceRealSrc!="")src=mceRealSrc;src=eval(tinyMCE.settings['urlconverter_callback']+"(src, img, true);");if(onmouseover!="")onmouseover=eval(tinyMCE.settings['urlconverter_callback']+"(onmouseover, img, true);");if(onmouseout!="")onmouseout=eval(tinyMCE.settings['urlconverter_callback']+"(onmouseout, img, true);");action="update";}if(this.settings['insertimage_callback']){var returnVal=eval(this.settings['insertimage_callback']+"(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");if(returnVal&&returnVal['src'])tinyMCE.insertImage(returnVal['src'],returnVal['alt'],returnVal['border'],returnVal['hspace'],returnVal['vspace'],returnVal['width'],returnVal['height'],returnVal['align'],returnVal['title'],returnVal['onmouseover'],returnVal['onmouseout']);}else tinyMCE.openWindow(this.insertImageTemplate,{src:src,alt:alt,border:border,hspace:hspace,vspace:vspace,width:width,height:height,align:align,title:title,onmouseover:onmouseover,onmouseout:onmouseout,action:action});break;case "mceCleanupWord":if(tinyMCE.isMSIE){var html=this.getBody().createTextRange().htmlText;if(html.indexOf('="mso')!=-1){tinyMCE._setHTML(this.contentDocument,this.getBody().innerHTML);html=tinyMCE._cleanupHTML(this.contentDocument,this.settings,this.getBody(),this.visualAid);}this.getBody().innerHTML=html;}break;case "mceCleanup":tinyMCE._setHTML(this.contentDocument,this.getBody().innerHTML);this.getBody().innerHTML=tinyMCE._cleanupHTML(this.contentDocument,this.settings,this.getBody(),this.visualAid);tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid);this.repaint();tinyMCE.triggerNodeChange();break;case "mceAnchor":if(!user_interface){var aElm=tinyMCE.getParentElement(this.getFocusElement(),"a","name");if(aElm){if(value==null||value==""){if(tinyMCE.isMSIE){aElm.outerHTML=aElm.innerHTML;}else{var rng=aElm.ownerDocument.createRange();rng.setStartBefore(aElm);rng.setEndAfter(aElm);rng.deleteContents();rng.insertNode(rng.createContextualFragment(aElm.innerHTML));}}else aElm.setAttribute('name',value);}else{this.getDoc().execCommand("fontname",false,"#mce_temp_font#");var elementArray=tinyMCE.getElementsByAttributeValue(this.getBody(),"font","face","#mce_temp_font#");for(var x=0;x<elementArray.length;x++){elm=elementArray[x];var aElm=this.getDoc().createElement("a");aElm.setAttribute('name',value);if(elm.hasChildNodes()){for(var i=0;i<elm.childNodes.length;i++)aElm.appendChild(elm.childNodes[i].cloneNode(true));}elm.parentNode.replaceChild(aElm,elm);}}tinyMCE.triggerNodeChange();}break;case "mceReplaceContent":var selectedText="";if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=rng.text;}else selectedText=this.getSel().toString();if(selectedText.length>0){value=tinyMCE.replaceVar(value,"selection",selectedText);tinyMCE.execCommand('mceInsertContent',false,value);}tinyMCE.triggerNodeChange();break;case "mceSetAttribute":if(typeof(value)=='object'){var targetElms=(typeof(value['targets'])=="undefined")?"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address":value['targets'];var targetNode=tinyMCE.getParentElement(this.getFocusElement(),targetElms);if(targetNode){targetNode.setAttribute(value['name'],value['value']);tinyMCE.triggerNodeChange();}}break;case "mceSetCSSClass":var selectedText=false;if(tinyMCE.isMSIE){var rng=doc.selection.createRange();selectedText=(rng.text&&rng.text.length>0);}else selectedText=(this.getSel().toString().length>0);if(tinyMCE.selectedNode)tinyMCE.selectedElement=tinyMCE.selectedNode;if(selectedText&&!tinyMCE.selectedNode){this.getDoc().execCommand("RemoveFormat",false,null);if(value==null)return this.execCommand("RemoveFormat",false,null);this.getDoc().execCommand("fontname",false,"#mce_temp_font#");var elementArray=tinyMCE.getElementsByAttributeValue(this.getBody(),"font","face","#mce_temp_font#");for(var x=0;x<elementArray.length;x++){elm=elementArray[x];if(elm){var spanElm=this.getDoc().createElement("span");spanElm.className=value;if(elm.hasChildNodes()){for(var i=0;i<elm.childNodes.length;i++)spanElm.appendChild(elm.childNodes[i].cloneNode(true));}elm.parentNode.replaceChild(spanElm,elm);}}}else{var targetElm=this.getFocusElement();if(tinyMCE.selectedElement.nodeName.toLowerCase()=="img"||tinyMCE.selectedElement.nodeName.toLowerCase()=="table")targetElm=tinyMCE.selectedElement;var targetNode=tinyMCE.getParentElement(targetElm,"p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address");if(tinyMCE.selectedElement.nodeType==1)targetNode=tinyMCE.selectedElement;if(!tinyMCE.isMSIE&&!targetNode)targetNode=tinyMCE.imgElement;if(targetNode){if(targetNode.nodeName.toLowerCase()=="span"&&(!value||value=="")){if(targetNode.hasChildNodes()){for(var i=0;i<targetNode.childNodes.length;i++)targetNode.parentNode.insertBefore(targetNode.childNodes[i].cloneNode(true),targetNode);}targetNode.parentNode.removeChild(targetNode);}else{if(value!=null&&value!="")targetNode.className=value;else{targetNode.removeAttribute("className");targetNode.removeAttribute("class");}}}}tinyMCE.triggerNodeChange();break;case "mceInsertRawHTML":var key='tiny_mce_marker';this.execCommand('mceInsertContent',false,key);var html=this.getBody().innerHTML;if((pos=html.indexOf(key))!=-1)this.getBody().innerHTML=html.substring(0,pos)+value+html.substring(pos+key.length);break;case "mceInsertContent":if(!tinyMCE.isMSIE){var sel=this.getSel();var rng=sel.getRangeAt(0);var isHTML=value.indexOf('<')!=-1;if(isHTML)value=rng.createContextualFragment(value);else{var el=document.createElement("div");el.innerHTML=value;value=el.firstChild.nodeValue;value=doc.createTextNode(value);}if(tinyMCE.isSafari&&!isHTML){this.execCommand('InsertText',false,value.nodeValue);tinyMCE.triggerNodeChange();return true;}rng.deleteContents();if(rng.startContainer.nodeType==3){var node=rng.startContainer.splitText(rng.startOffset);node.parentNode.insertBefore(value,node);}else rng.insertNode(value);if(!isHTML){sel.selectAllChildren(doc.body);sel.removeAllRanges();var rng=doc.createRange();rng.selectNode(value);rng.collapse(false);sel.addRange(rng);}else rng.collapse(false);}else{var rng=doc.selection.createRange();if(rng.item)rng.item(0).outerHTML=value;else rng.pasteHTML(value);}tinyMCE.triggerNodeChange();break;case "mceAddUndoLevel":if(tinyMCE.settings['custom_undo_redo']){var customUndoLevels=tinyMCE.settings['custom_undo_redo_levels'];var newHTML=this.getBody().innerHTML;if(newHTML!=this.undoLevels[this.undoLevels.length-1]){tinyMCE.executeCallback('onchange_callback','_onchange',0,this);this.isDirty=true;if(customUndoLevels!=-1&&this.undoLevels.length>customUndoLevels){for(var i=0;i<this.undoLevels.length-1;i++){this.undoLevels[i]=this.undoLevels[i+1];}this.undoLevels.length--;this.undoIndex--;}this.undoLevels[this.undoIndex++]=newHTML;this.undoLevels.length=this.undoIndex;}tinyMCE.triggerNodeChange(false);}break;case "Undo":if(tinyMCE.settings['custom_undo_redo']){if(this.undoIndex==this.undoLevels.length){this.execCommand("mceAddUndoLevel");this.undoIndex--;}if(this.undoIndex>0){this.undoIndex--;this.getBody().innerHTML=this.undoLevels[this.undoIndex];}tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case "Redo":if(tinyMCE.settings['custom_undo_redo']){if(this.undoIndex<(this.undoLevels.length-1)){this.undoIndex++;this.getBody().innerHTML=this.undoLevels[this.undoIndex];}tinyMCE.triggerNodeChange();}else this.getDoc().execCommand(command,user_interface,value);break;case "mceToggleVisualAid":this.visualAid=!this.visualAid;tinyMCE.handleVisualAid(this.getBody(),true,this.visualAid);tinyMCE.triggerNodeChange();break;case "removeformat":var text=this.getSelectedText();if(tinyMCE.isMSIE){try{win.focus();var rng=doc.selection.createRange();rng.execCommand("RemoveFormat",false,null);rng.pasteHTML(rng.text);}catch(e){}}else this.getDoc().execCommand(command,user_interface,value);if(text.length==0)this.execCommand("mceSetCSSClass",false,"");tinyMCE.triggerNodeChange();break;default:this.getDoc().execCommand(command,user_interface,value);tinyMCE.triggerNodeChange();}};TinyMCEControl.prototype.queryCommandValue=function(command){return this.getDoc().queryCommandValue(command);};TinyMCEControl.prototype.queryCommandState=function(command){return this.getDoc().queryCommandState(command);};TinyMCEControl.prototype.onAdd=function(replace_element,form_element_name,target_document){var targetDoc=target_document?target_document:document;this.targetDoc=targetDoc;tinyMCE.themeURL=tinyMCE.baseURL+"/themes/"+this.settings['theme'];this.settings['themeurl']=tinyMCE.themeURL;if(!replace_element){alert("Error: Could not find the target element.");return false;}var templateFunction=tinyMCE._getThemeFunction('_getInsertLinkTemplate');if(eval("typeof("+templateFunction+")")!='undefined')this.insertLinkTemplate=eval(templateFunction+'(this.settings);');var templateFunction=tinyMCE._getThemeFunction('_getInsertImageTemplate');if(eval("typeof("+templateFunction+")")!='undefined')this.insertImageTemplate=eval(templateFunction+'(this.settings);');var templateFunction=tinyMCE._getThemeFunction('_getEditorTemplate');if(eval("typeof("+templateFunction+")")=='undefined'){alert("Error: Could not find the template function: "+templateFunction);return false;}var editorTemplate=eval(templateFunction+'(this.settings, this.editorId);');var deltaWidth=editorTemplate['delta_width']?editorTemplate['delta_width']:0;var deltaHeight=editorTemplate['delta_height']?editorTemplate['delta_height']:0;var html='<span id="'+this.editorId+'_parent">'+editorTemplate['html'];var templateFunction=tinyMCE._getThemeFunction('_handleNodeChange',true);if(eval("typeof("+templateFunction+")")!='undefined')this.settings['handleNodeChangeCallback']=templateFunction;html=tinyMCE.replaceVar(html,"editor_id",this.editorId);html=tinyMCE.replaceVar(html,"default_document",tinyMCE.baseURL+"/blank.htm");this.settings['default_document']=tinyMCE.baseURL+"/blank.htm";this.settings['old_width']=this.settings['width'];this.settings['old_height']=this.settings['height'];if(this.settings['width']==-1)this.settings['width']=replace_element.offsetWidth;if(this.settings['height']==-1)this.settings['height']=replace_element.offsetHeight;if(this.settings['width']==0)this.settings['width']=replace_element.style.width;if(this.settings['height']==0)this.settings['height']=replace_element.style.height;if(this.settings['width']==0)this.settings['width']=320;if(this.settings['height']==0)this.settings['height']=240;this.settings['area_width']=parseInt(this.settings['width']);this.settings['area_height']=parseInt(this.settings['height']);this.settings['area_width']+=deltaWidth;this.settings['area_height']+=deltaHeight;if((""+this.settings['width']).indexOf('%')!=-1)this.settings['area_width']="100%";if((""+this.settings['height']).indexOf('%')!=-1)this.settings['area_height']="100%";if((""+replace_element.style.width).indexOf('%')!=-1){this.settings['width']=replace_element.style.width;this.settings['area_width']="100%";}if((""+replace_element.style.height).indexOf('%')!=-1){this.settings['height']=replace_element.style.height;this.settings['area_height']="100%";}html=tinyMCE.applyTemplate(html);this.settings['width']=this.settings['old_width'];this.settings['height']=this.settings['old_height'];this.visualAid=this.settings['visual'];this.formTargetElementId=form_element_name;if(replace_element.nodeName.toLowerCase()=="textarea")this.startContent=replace_element.value;else this.startContent=replace_element.innerHTML;if(replace_element.nodeName.toLowerCase()!="textarea"){this.oldTargetElement=replace_element.cloneNode(true);if(tinyMCE.settings['debug'])html+='<textarea wrap="off" id="'+form_element_name+'" name="'+form_element_name+'" cols="100" rows="15"></textarea>';else html+='<input type="hidden" type="text" id="'+form_element_name+'" name="'+form_element_name+'" />';html+='</span>';if(!tinyMCE.isMSIE){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);replace_element.parentNode.replaceChild(fragment,replace_element);}else replace_element.outerHTML=html;}else{html+='</span>';this.oldTargetElement=replace_element;if(!tinyMCE.settings['debug'])this.oldTargetElement.style.display="none";if(!tinyMCE.isMSIE){var rng=replace_element.ownerDocument.createRange();rng.setStartBefore(replace_element);var fragment=rng.createContextualFragment(html);replace_element.parentNode.insertBefore(fragment,replace_element);}else replace_element.insertAdjacentHTML("beforeBegin",html);}var dynamicIFrame=false;var tElm=targetDoc.getElementById(this.editorId);if(!tinyMCE.isMSIE){if(tElm&&tElm.nodeName.toLowerCase()=="span"){tElm=tinyMCE._createIFrame(tElm);dynamicIFrame=true;}this.targetElement=tElm;this.iframeElement=tElm;this.contentDocument=tElm.contentDocument;this.contentWindow=tElm.contentWindow;}else{if(tElm&&tElm.nodeName.toLowerCase()=="span")tElm=tinyMCE._createIFrame(tElm);else tElm=targetDoc.frames[this.editorId];this.targetElement=tElm;this.iframeElement=targetDoc.getElementById(this.editorId);this.contentDocument=tElm.window.document;this.contentWindow=tElm.window;this.getDoc().designMode="on";}var doc=this.contentDocument;if(dynamicIFrame){var html=""+'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'+'<html>'+'<head>'+'<base href="'+tinyMCE.settings['base_href']+'" />'+'<title>blank_page</title>'+'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'+'</head>'+'<body>'+'</body>'+'</html>';try{this.getDoc().designMode="on";doc.open();doc.write(html);doc.close();}catch(e){this.getDoc().location.href=tinyMCE.baseURL+"/blank.htm";}}if(tinyMCE.isMSIE)window.setTimeout("TinyMCE.prototype.addEventHandlers('"+this.editorId+"');",1);tinyMCE.setupContent(this.editorId,true);return true;};TinyMCEControl.prototype.getFocusElement=function(){if(tinyMCE.isMSIE){var doc=this.getDoc();var rng=doc.selection.createRange();if(rng.collapse)rng.collapse(true);var elm=rng.item?rng.item(0):rng.parentElement();}else{var sel=this.getSel();var elm=(sel&&sel.anchorNode)?sel.anchorNode:null;if(tinyMCE.selectedElement!=null&&tinyMCE.selectedElement.nodeName.toLowerCase()=="img")elm=tinyMCE.selectedElement;}return elm;};var tinyMCE=new TinyMCE();var tinyMCELang=new Array();function debug(){var msg="";var elm=document.getElementById("tinymce_debug");if(!elm){var debugDiv=document.createElement("div");debugDiv.setAttribute("className","debugger");debugDiv.className="debugger";debugDiv.innerHTML='\
+			Debug output:\
+			<textarea id="tinymce_debug" style="width: 100%; height: 300px">\
+			</textarea>';document.body.appendChild(debugDiv);elm=document.getElementById("tinymce_debug");}var args=this.debug.arguments;for(var i=0;i<args.length;i++){msg+=args[i];if(i<args.length-1)msg+=', ';}elm.value+=msg+"\n";};
\ No newline at end of file
diff --git a/source/web/scripts/tiny_mce/tiny_mce_popup.js b/source/web/scripts/tiny_mce/tiny_mce_popup.js
new file mode 100644
index 0000000000..e55629d866
--- /dev/null
+++ b/source/web/scripts/tiny_mce/tiny_mce_popup.js
@@ -0,0 +1,86 @@
+// Get tinyMCE window
+var win = window.opener ? window.opener : window.dialogArguments;
+
+var tinyMCE = null;
+var tinyMCELang = null;
+
+// Use top window if not defined
+if (!win)
+	win = top;
+
+var tinyMCE = win.tinyMCE;
+var tinyMCELang = win.tinyMCELang;
+
+if (!tinyMCE)
+	alert("tinyMCE object reference not found from popup.");
+
+// Setup window openerer
+window.opener = win;
+
+// Setup title
+var re = new RegExp('{|\\\$|}', 'g');
+var title = document.title.replace(re, "");
+if (typeof tinyMCELang[title] != "undefined") {
+	var divElm = document.createElement("div");
+	divElm.innerHTML = tinyMCELang[title];
+	document.title = divElm.innerHTML;
+}
+
+// Setup dir
+if (tinyMCELang['lang_dir'])
+	document.dir = tinyMCELang['lang_dir'];
+
+function TinyMCEPlugin_onLoad() {
+	if (tinyMCE.getWindowArg('mce_replacevariables', true))
+		document.body.innerHTML = tinyMCE.applyTemplate(document.body.innerHTML, tinyMCE.windowArgs);
+
+	// Auto resize window
+	if (tinyMCE.getWindowArg('mce_windowresize', true)) {
+		var width = tinyMCE.isMSIE ? document.body.offsetWidth : window.innerWidth;
+		var height = tinyMCE.isMSIE ? document.body.offsetHeight : window.innerHeight;
+		var dx = document.body.scrollWidth - width;
+		var dy = document.body.scrollHeight - height;
+
+		if (tinyMCE.isMSIE) {
+			window.dialogWidth = (parseInt(window.dialogWidth) + dx) + "px";
+			window.dialogHeight = (parseInt(window.dialogHeight) + dy + 3) + "px";
+		} else
+			window.resizeBy(dx + 15, dy + 15);
+	}
+}
+
+function TinyMCEPopup_autoResize() {
+	var isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	var isOpera = (navigator.userAgent.indexOf("Opera") != -1);
+
+	if (isOpera)
+		return;
+
+	if (isMSIE) {
+		try { window.resizeTo(10, 10); } catch (e) {}
+
+		var elm = document.body;
+		var width = elm.offsetWidth;
+		var height = elm.offsetHeight;
+		var dx = (elm.scrollWidth - width) + 4;
+		var dy = elm.scrollHeight - height;
+
+		try { window.resizeBy(dx, dy); } catch (e) {}
+	} else {
+		window.scrollBy(1000, 1000);
+		if (window.scrollX > 0 || window.scrollY > 0) {
+			window.resizeBy(window.innerWidth * 2, window.innerHeight * 2);
+			window.sizeToContent();
+			window.scrollTo(0, 0);
+			var x = parseInt(screen.width / 2.0) - (window.outerWidth / 2.0);
+			var y = parseInt(screen.height / 2.0) - (window.outerHeight / 2.0);
+			window.moveTo(x, y);
+		}
+	}
+}
+
+// Add onload trigger
+tinyMCE.addEvent(window, "load", TinyMCEPlugin_onLoad);
+
+// Output Popup CSS class
+document.write('<link href="' + tinyMCE.getParam("popups_css") + '" rel="stylesheet" type="text/css">');
diff --git a/source/web/scripts/tiny_mce/tiny_mce_src.js b/source/web/scripts/tiny_mce/tiny_mce_src.js
new file mode 100644
index 0000000000..4a9f8bfc39
--- /dev/null
+++ b/source/web/scripts/tiny_mce/tiny_mce_src.js
@@ -0,0 +1,4738 @@
+/**
+ * $RCSfile: tiny_mce_src.js,v $
+ * $Revision: 1.204 $
+ * $Date: 2005/05/27 09:35:59 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
+ */
+
+function TinyMCE() {
+	this.instances = new Array();
+	this.stickyClassesLookup = new Array();
+	this.windowArgs = new Array();
+	this.loadedFiles = new Array();
+	this.configs = new Array();
+	this.currentConfig = 0;
+	this.eventHandlers = new Array();
+
+	// Browser check
+	this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
+	this.isMSIE5 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5') != -1);
+	this.isMSIE5_0 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5.0') != -1);
+	this.isGecko = navigator.userAgent.indexOf('Gecko') != -1;
+	this.isSafari = navigator.userAgent.indexOf('Safari') != -1;
+
+	if (this.isSafari)
+		alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.");
+
+	// TinyMCE editor id instance counter
+	this.idCounter = 0;
+};
+
+TinyMCE.prototype.defParam = function(key, def_val) {
+	this.settings[key] = tinyMCE.getParam(key, def_val);
+};
+
+TinyMCE.prototype.init = function(settings) {
+	var theme;
+
+	this.settings = settings;
+
+	// Check if valid browser has execcommand support
+	if (typeof(document.execCommand) == 'undefined')
+		return;
+
+	// Get script base path
+	if (!tinyMCE.baseURL) {
+		var elements = document.getElementsByTagName('script');
+
+		for (var i=0; i<elements.length; i++) {
+			if (elements[i].src && (elements[i].src.indexOf("tiny_mce.js") != -1 || elements[i].src.indexOf("tiny_mce_src.js") != -1)) {
+				var src = elements[i].src;
+
+				tinyMCE.srcMode = (src.indexOf('_src') != -1) ? '_src' : '';
+				src = src.substring(0, src.lastIndexOf('/'));
+
+				tinyMCE.baseURL = src;
+				break;
+			}
+		}
+	}
+
+	// Get document base path
+	this.documentBasePath = document.location.href;
+	if (this.documentBasePath.indexOf('?') != -1)
+		this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.indexOf('?'));
+	this.documentURL = this.documentBasePath;
+	this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.lastIndexOf('/'));
+
+	// If not HTTP absolute
+	if (tinyMCE.baseURL.indexOf('://') == -1 && tinyMCE.baseURL.charAt(0) != '/') {
+		// If site absolute
+		tinyMCE.baseURL = this.documentBasePath + "/" + tinyMCE.baseURL;
+	}
+
+	// Set default values on settings
+	this.defParam("mode", "none");
+	this.defParam("theme", "advanced");
+	this.defParam("plugins", "", true);
+	this.defParam("language", "en");
+	this.defParam("docs_language", this.settings['language']);
+	this.defParam("elements", "");
+	this.defParam("textarea_trigger", "mce_editable");
+	this.defParam("valid_elements", "+a[name|href|target|title],strong/b[class],em/i[class],strike[class],u[class],p[dir|class|align],ol,ul,li,br,img[class|src|border=0|alt|title|hspace|vspace|width|height|align],sub,sup,blockquote[dir|style],table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class|align],address[class|align],h1[dir|class|align],h2[dir|class|align],h3[dir|class|align],h4[dir|class|align],h5[dir|class|align],h6[dir|class|align],hr");
+	this.defParam("extended_valid_elements", "");
+	this.defParam("invalid_elements", "");
+	this.defParam("encoding", "");
+	this.defParam("urlconverter_callback", tinyMCE.getParam("urlconvertor_callback", "TinyMCE.prototype.convertURL"));
+	this.defParam("save_callback", "");
+	this.defParam("debug", false);
+	this.defParam("force_br_newlines", false);
+	this.defParam("force_p_newlines", true);
+	this.defParam("add_form_submit_trigger", true);
+	this.defParam("relative_urls", true);
+	this.defParam("remove_script_host", true);
+	this.defParam("focus_alert", true);
+	this.defParam("document_base_url", this.documentURL);
+	this.defParam("visual", true);
+	this.defParam("visual_table_class", "mceVisualAid");
+	this.defParam("setupcontent_callback", "");
+	this.defParam("fix_content_duplication", true);
+	this.defParam("custom_undo_redo", true);
+	this.defParam("custom_undo_redo_levels", -1);
+	this.defParam("custom_undo_redo_keyboard_shortcuts", true);
+	this.defParam("verify_css_classes", false);
+	this.defParam("trim_span_elements", true);
+	this.defParam("verify_html", true);
+	this.defParam("apply_source_formatting", false);
+	this.defParam("directionality", "ltr");
+	this.defParam("auto_cleanup_word", false);
+	this.defParam("cleanup_on_startup", false);
+	this.defParam("inline_styles", false);
+	this.defParam("convert_newlines_to_brs", false);
+	this.defParam("auto_reset_designmode", false);
+	this.defParam("entities", "160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute");
+	this.defParam("entity_encoding", "named");
+	this.defParam("cleanup_callback", "");
+	this.defParam("add_unload_trigger", true);
+	this.defParam("ask", false);
+	this.defParam("nowrap", false);
+	this.defParam("auto_resize", false);
+	this.defParam("auto_focus", false);
+	this.defParam("cleanup", true);
+	this.defParam("remove_linebreaks", true);
+	this.defParam("button_tile_map", false);
+	this.defParam("submit_patch", true);
+
+	// Setup baseHREF
+	var baseHREF = tinyMCE.settings['document_base_url'];
+	if (baseHREF.indexOf('?') != -1)
+		baseHREF = baseHREF.substring(0, baseHREF.indexOf('?'));
+	this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/";
+
+	theme = this.settings['theme'];
+
+	this.blockRegExp = new RegExp("^(h1|h2|h3|h4|h5|h6|p|div|address|pre|form|table|li|ol|ul|td)$", "i");
+
+	// Theme url
+	this.settings['theme_href'] = tinyMCE.baseURL + "/themes/" + theme;
+
+	if (!tinyMCE.isMSIE)
+		this.settings['force_br_newlines'] = false;
+
+	if (tinyMCE.getParam("content_css", false)) {
+		var cssPath = tinyMCE.getParam("content_css", "");
+
+		// Is relative
+		if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+			this.settings['content_css'] = this.documentBasePath + "/" + cssPath;
+		else
+			this.settings['content_css'] = cssPath;
+	} else
+		this.settings['content_css'] = tinyMCE.baseURL + "/themes/" + theme + "/editor_content.css";
+
+	if (tinyMCE.getParam("popups_css", false)) {
+		var cssPath = tinyMCE.getParam("popups_css", "");
+
+		// Is relative
+		if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+			this.settings['popups_css'] = this.documentBasePath + "/" + cssPath;
+		else
+			this.settings['popups_css'] = cssPath;
+	} else
+		this.settings['popups_css'] = tinyMCE.baseURL + "/themes/" + theme + "/editor_popup.css";
+
+	if (tinyMCE.getParam("editor_css", false)) {
+		var cssPath = tinyMCE.getParam("editor_css", "");
+
+		// Is relative
+		if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+			this.settings['editor_css'] = this.documentBasePath + "/" + cssPath;
+		else
+			this.settings['editor_css'] = cssPath;
+	} else
+		this.settings['editor_css'] = tinyMCE.baseURL + "/themes/" + theme + "/editor_ui.css";
+
+	if (tinyMCE.settings['debug']) {
+		var msg = "Debug: \n";
+
+		msg += "baseURL: " + this.baseURL + "\n";
+		msg += "documentBasePath: " + this.documentBasePath + "\n";
+		msg += "content_css: " + this.settings['content_css'] + "\n";
+		msg += "popups_css: " + this.settings['popups_css'] + "\n";
+		msg += "editor_css: " + this.settings['editor_css'] + "\n";
+
+		alert(msg);
+	}
+
+	// Init HTML cleanup
+	this._initCleanup();
+
+	// Only do this once
+	if (this.configs.length == 0) {
+		tinyMCE.addEvent(window, "load", TinyMCE.prototype.onLoad);
+
+		if (tinyMCE.isMSIE) {
+			if (tinyMCE.settings['add_unload_trigger']) {
+				tinyMCE.addEvent(window, "unload", TinyMCE.prototype.unloadHandler);
+				tinyMCE.addEvent(window.document, "beforeunload", TinyMCE.prototype.unloadHandler);
+			}
+		} else {
+			if (tinyMCE.settings['add_unload_trigger'])
+				tinyMCE.addEvent(window, "unload", function () {tinyMCE.triggerSave(true, true);});
+		}
+	}
+
+	this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings['theme'] + '/editor_template' + tinyMCE.srcMode + '.js');
+	this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings['language'] +  '.js');
+	this.loadCSS(this.settings['editor_css']);
+
+	// Add theme plugins
+	var themePlugins = tinyMCE.getParam('plugins', '', true, ',');
+	if (this.settings['plugins'] != '') {
+		for (var i=0; i<themePlugins.length; i++)
+			this.loadScript(tinyMCE.baseURL + '/plugins/' + themePlugins[i] + '/editor_plugin' + tinyMCE.srcMode + '.js');
+	}
+
+	// Save away this config
+	settings['index'] = this.configs.length;
+	this.configs[this.configs.length] = settings;
+};
+
+TinyMCE.prototype.loadScript = function(url) {
+	for (var i=0; i<this.loadedFiles.length; i++) {
+		if (this.loadedFiles[i] == url)
+			return;
+	}
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+
+	this.loadedFiles[this.loadedFiles.length] = url;
+};
+
+TinyMCE.prototype.loadCSS = function(url) {
+	for (var i=0; i<this.loadedFiles.length; i++) {
+		if (this.loadedFiles[i] == url)
+			return;
+	}
+
+	document.write('<link href="' + url + '" rel="stylesheet" type="text/css" />');
+
+	this.loadedFiles[this.loadedFiles.length] = url;
+};
+
+TinyMCE.prototype.importCSS = function(doc, css_file) {
+	if (tinyMCE.isMSIE)
+		var styleSheet = doc.createStyleSheet(css_file);
+	else {
+		var elm = doc.createElement("link");
+
+		elm.rel = "stylesheet";
+		elm.href = css_file;
+
+		if (headArr = doc.getElementsByTagName("head"))
+			headArr[0].appendChild(elm);
+	}
+};
+
+TinyMCE.prototype.confirmAdd = function(e, settings) {
+	var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+	var elementId = elm.name ? elm.name : elm.id;
+
+	tinyMCE.settings = settings;
+
+	if (!elm.getAttribute('mce_noask') && confirm(tinyMCELang['lang_edit_confirm']))
+		tinyMCE.addMCEControl(elm, elementId);
+
+	elm.setAttribute('mce_noask', 'true');
+};
+
+TinyMCE.prototype.queryInstanceCommandValue = function(editor_id, command) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	if (inst)
+		return inst.getDoc().queryCommandValue(command);
+
+	return null;
+};
+
+TinyMCE.prototype.queryInstanceCommandState = function(editor_id, command) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	if (inst)
+		return inst.getDoc().queryCommandState(command);
+
+	return null;
+};
+
+TinyMCE.prototype.updateContent = function(form_element_name) {
+	// Find MCE instance linked to given form element and copy it's value
+	var formElement = document.getElementById(form_element_name);
+	for (var n in tinyMCE.instances) {
+		var inst = tinyMCE.instances[n];
+
+		inst.switchSettings();
+
+		if (inst.formElement == formElement) {
+			var doc = inst.getDoc();
+	
+			tinyMCE._setHTML(doc, inst.formElement.value);
+
+			if (!tinyMCE.isMSIE)
+				doc.body.innerHTML = tinyMCE._cleanupHTML(doc, this.settings, doc.body, inst.visualAid);
+		}
+	}
+};
+
+TinyMCE.prototype.addMCEControl = function(replace_element, form_element_name, target_document) {
+	var id = "mce_editor_" + tinyMCE.idCounter++;
+	var inst = new TinyMCEControl(tinyMCE.settings);
+
+	inst.editorId = id;
+	this.instances[id] = inst;
+
+	inst.onAdd(replace_element, form_element_name, target_document);
+};
+
+TinyMCE.prototype.triggerSave = function(skip_cleanup, skip_callback) {
+	// Cleanup and set all form fields
+	for (var n in tinyMCE.instances) {
+		var inst = tinyMCE.instances[n];
+
+		inst.switchSettings();
+
+		tinyMCE.settings['preformatted'] = false;
+
+		// Default to false
+		if (typeof(skip_cleanup) == "undefined")
+			skip_cleanup = false;
+
+		// Default to false
+		if (typeof(skip_callback) == "undefined")
+			skip_callback = false;
+
+		tinyMCE._setHTML(inst.getDoc(), inst.getBody().innerHTML);
+
+		var htm = skip_cleanup ? inst.getBody().innerHTML : tinyMCE._cleanupHTML(inst.getDoc(), this.settings, inst.getBody(), this.visualAid, true);
+
+		//var htm = tinyMCE._cleanupHTML(inst.getDoc(), tinyMCE.settings, inst.getBody(), false, true);
+
+		if (tinyMCE.settings["encoding"] == "xml" || tinyMCE.settings["encoding"] == "html")
+			htm = tinyMCE.convertStringToXML(htm);
+
+		if (!skip_callback && tinyMCE.settings['save_callback'] != "")
+			var content = eval(tinyMCE.settings['save_callback'] + "(inst.formTargetElementId,htm,inst.getBody());");
+
+		// Use callback content if available
+		if ((typeof(content) != "undefined") && content != null)
+			htm = content;
+
+		// Replace some weird entities (Bug: #1056343)
+		htm = tinyMCE.regexpReplace(htm, "&#40;", "(", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#41;", ")", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#59;", ";", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#34;", "&quot;", "gi");
+		htm = tinyMCE.regexpReplace(htm, "&#94;", "^", "gi");
+
+		if (inst.formElement)
+			inst.formElement.value = htm;
+	}
+};
+
+TinyMCE.prototype._convertOnClick = function(node) {
+	// Skip on MSIE < 6+
+	if (tinyMCE.isMSIE5)
+		return;
+
+	// Convert all onclick to mce_onclick
+	var elms = node.getElementsByTagName("a");
+	for (var i=0; i<elms.length; i++) {
+		var onclick = elms[i].getAttribute('onclick');
+		if (onclick && onclick != "") {
+			elms[i].removeAttribute("onclick");
+			elms[i].setAttribute("mce_onclick", tinyMCE.cleanupEventStr("" + onclick));
+			elms[i].onclick = null;
+		}
+	}
+};
+
+TinyMCE.prototype.resetForm = function(form_index) {
+	var formObj = document.forms[form_index];
+
+	for (var n in tinyMCE.instances) {
+		var inst = tinyMCE.instances[n];
+
+		inst.switchSettings();
+
+		for (var i=0; i<formObj.elements.length; i++) {
+			if (inst.formTargetElementId == formObj.elements[i].name) {
+				inst.getBody().innerHTML = formObj.elements[i].value;
+				return;
+			}
+		}
+	}
+};
+
+TinyMCE.prototype.execInstanceCommand = function(editor_id, command, user_interface, value, focus) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	if (inst) {
+		if (typeof(focus) == "undefined")
+			focus = true;
+
+		if (focus)
+			inst.contentWindow.focus();
+
+		// Reset design mode if lost
+		inst.autoResetDesignMode();
+
+		this.selectedElement = inst.getFocusElement();
+		this.selectedInstance = inst;
+		tinyMCE.execCommand(command, user_interface, value);
+	}
+};
+
+TinyMCE.prototype.execCommand = function(command, user_interface, value) {
+	// Default input
+	user_interface = user_interface ? user_interface : false;
+	value = value ? value : null;
+
+	if (tinyMCE.selectedInstance)
+		tinyMCE.selectedInstance.switchSettings();
+
+	switch (command) {
+		case 'mceHelp':
+			window.open(tinyMCE.themeURL + "/docs/" + this.settings['docs_language'] + "/index.htm", "mceHelp", "menubar=yes,toolbar=yes,scrollbars=yes,left=20,top=20,width=550,height=600");
+		return;
+
+		case 'mceFocus':
+			var inst = tinyMCE.getInstanceById(value);
+			if (inst)
+				inst.contentWindow.focus();
+		return;
+
+		case "mceAddControl":
+		case "mceAddEditor":
+			tinyMCE.addMCEControl(tinyMCE._getElementById(value), value);
+			return;
+
+		case "mceAddFrameControl":
+			tinyMCE.addMCEControl(tinyMCE._getElementById(value), value['element'], value['document']);
+			return;
+
+		case "mceRemoveControl":
+		case "mceRemoveEditor":
+			tinyMCE.removeMCEControl(value);
+			return;
+
+		case "mceResetDesignMode":
+			// Resets the designmode state of the editors in Gecko
+			if (!tinyMCE.isMSIE) {
+				for (var n in tinyMCE.instances) {
+					try {
+						tinyMCE.instances[n].getDoc().designMode = "on";
+					} catch (e) {
+						// Ignore any errors
+					}
+				}
+			}
+
+			return;
+	}
+
+	if (this.selectedInstance)
+		this.selectedInstance.execCommand(command, user_interface, value);
+	else if (tinyMCE.settings['focus_alert'])
+		alert(tinyMCELang['lang_focus_alert']);
+};
+
+TinyMCE.prototype.eventPatch = function(editor_id) {
+	// Remove odd, error
+	if (typeof(tinyMCE) == "undefined")
+		return true;
+
+	for (var i=0; i<document.frames.length; i++) {
+		if (document.frames[i].event) {
+			var event = document.frames[i].event;
+
+			event.target = event.srcElement;
+			event.target.editor_id = document.frames[i].editor_id;
+
+			TinyMCE.prototype.handleEvent(event);
+			return;
+		}
+	}
+};
+
+TinyMCE.prototype.unloadHandler = function() {
+	tinyMCE.triggerSave(true, true);
+};
+
+TinyMCE.prototype.addEventHandlers = function(editor_id) {
+	if (tinyMCE.isMSIE) {
+		var doc = document.frames[editor_id].document;
+
+		// Event patch
+		document.frames[editor_id].editor_id = editor_id;
+		tinyMCE.addEvent(doc, "keypress", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(doc, "keyup", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(doc, "keydown", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(doc, "mouseup", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(doc, "click", TinyMCE.prototype.eventPatch);
+	} else {
+		var inst = tinyMCE.instances[editor_id];
+		var doc = inst.getDoc();
+
+		inst.switchSettings();
+
+		doc.editor_id = editor_id;
+		tinyMCE.addEvent(doc, "keypress", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "keypress", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "keydown", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "keyup", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "click", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "mouseup", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "mousedown", tinyMCE.handleEvent);
+		tinyMCE.addEvent(doc, "focus", tinyMCE.handleEvent);
+
+		eval('try { doc.designMode = "On"; } catch(e) {}');
+	}
+};
+
+TinyMCE.prototype._createIFrame = function(replace_element) {
+	var iframe = document.createElement("iframe");
+	var id = replace_element.getAttribute("id");
+
+	iframe.setAttribute("id", id);
+	iframe.setAttribute("className", "mceEditorArea");
+	iframe.setAttribute("border", "0");
+	iframe.setAttribute("frameBorder", "0");
+	iframe.setAttribute("marginWidth", "0");
+	iframe.setAttribute("marginHeight", "0");
+	iframe.setAttribute("leftMargin", "0");
+	iframe.setAttribute("topMargin", "0");
+	iframe.setAttribute("width", tinyMCE.settings['area_width']);
+	iframe.setAttribute("height", tinyMCE.settings['area_height']);
+
+	if (tinyMCE.settings["auto_resize"])
+		iframe.setAttribute("scrolling", "no");
+
+	// Must have a src element in MSIE HTTPs breaks aswell as absoute URLs
+	if (tinyMCE.isMSIE)
+		iframe.setAttribute("src", this.settings['default_document']);
+
+	iframe.style.width = tinyMCE.settings['area_width'];
+	iframe.style.height = tinyMCE.settings['area_height'];
+
+	// MSIE 5.0 issue
+	if (tinyMCE.isMSIE)
+		replace_element.outerHTML = iframe.outerHTML;
+	else
+		replace_element.parentNode.replaceChild(iframe, replace_element);
+
+	if (tinyMCE.isMSIE)
+		return window.frames[id];
+	else
+		return iframe;
+};
+
+TinyMCE.prototype.setupContent = function(editor_id) {
+	var inst = tinyMCE.instances[editor_id];
+	var doc = inst.getDoc();
+	var head = doc.getElementsByTagName('head').item(0);
+	var content = inst.startContent;
+
+	inst.switchSettings();
+
+	// Not loaded correctly hit it again, Mozilla bug #997860
+	if (!tinyMCE.isMSIE && doc.title != "blank_page") {
+		// This part will remove the designMode status
+		doc.location.href = tinyMCE.baseURL + "/blank.htm";
+		window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 1000);
+		return;
+	}
+
+	if (!head) {
+		window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 10);
+		return;
+	}
+
+	tinyMCE.importCSS(inst.getDoc(), inst.settings['content_css']);
+	tinyMCE.executeCallback('init_instance_callback', '_initInstance', 0, inst);
+
+	if (tinyMCE.settings['nowrap'])
+		doc.body.style.whiteSpace = "nowrap";
+
+	doc.body.dir = this.settings['directionality'];
+	doc.editorId = editor_id;
+
+	// Add on document element in Mozilla
+	if (!tinyMCE.isMSIE)
+		doc.documentElement.editorId = editor_id;
+
+	// Setup base element
+	base = doc.createElement("base");
+	base.setAttribute('href', tinyMCE.settings['base_href']);
+	head.appendChild(base);
+
+	// Replace new line characters to BRs
+	if (tinyMCE.settings['convert_newlines_to_brs']) {
+		content = tinyMCE.regexpReplace(content, "\r\n", "<br />", "gi");
+		content = tinyMCE.regexpReplace(content, "\r", "<br />", "gi");
+		content = tinyMCE.regexpReplace(content, "\n", "<br />", "gi");
+	}
+
+	// Call custom cleanup code
+	content = tinyMCE._customCleanup("insert_to_editor", content);
+
+	if (tinyMCE.isMSIE) {
+		// Ugly!!!
+		window.setInterval('try{tinyMCE.getCSSClasses(document.frames["' + editor_id + '"].document, "' + editor_id + '");}catch(e){}', 500);
+
+		if (tinyMCE.settings["force_br_newlines"])
+			document.frames[editor_id].document.styleSheets[0].addRule("p", "margin: 0px;");
+
+		var body = document.frames[editor_id].document.body;
+
+		tinyMCE.addEvent(body, "beforepaste", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(body, "beforecut", TinyMCE.prototype.eventPatch);
+		tinyMCE.addEvent(body, "paste", TinyMCE.prototype.eventPatch);
+
+		body.editorId = editor_id;
+	}
+
+	// Fix for bug #958637
+	if (!tinyMCE.isMSIE) {
+		var contentElement = inst.getDoc().createElement("body");
+		var doc = inst.getDoc();
+
+		contentElement.innerHTML = content;
+
+		// Remove weridness!
+		if (tinyMCE.settings['force_p_newlines'])
+			content = content.replace(new RegExp('&lt;&gt;', 'g'), "");
+
+		if (tinyMCE.settings['cleanup_on_startup'])
+			inst.getBody().innerHTML = tinyMCE._cleanupHTML(doc, this.settings, contentElement);
+		else {
+			// Convert all strong/em to b/i
+			content = tinyMCE.regexpReplace(content, "<strong", "<b", "gi");
+			content = tinyMCE.regexpReplace(content, "<em", "<i", "gi");
+			content = tinyMCE.regexpReplace(content, "</strong>", "</b>", "gi");
+			content = tinyMCE.regexpReplace(content, "</em>", "</i>", "gi");
+			inst.getBody().innerHTML = content;
+		}
+
+		inst.convertAllRelativeURLs();
+	} else {
+		if (tinyMCE.settings['cleanup_on_startup']) {
+			tinyMCE._setHTML(inst.getDoc(), content);
+			// Produces permission denied error in MSIE 5.5
+			eval('try {inst.getBody().innerHTML = tinyMCE._cleanupHTML(inst.contentDocument, this.settings, inst.getBody());} catch(e) {}');
+		} else
+			inst.getBody().innerHTML = content;
+	}
+
+	tinyMCE._convertOnClick(inst.getBody());
+
+	// Fix for bug #957681
+	//inst.getDoc().designMode = inst.getDoc().designMode;
+
+	// Setup element references
+	var parentElm = document.getElementById(inst.editorId + '_parent');
+	if (parentElm.lastChild.nodeName.toLowerCase() == "input")
+		inst.formElement = parentElm.lastChild;
+	else
+		inst.formElement = parentElm.nextSibling;
+
+	tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual']);
+	tinyMCE.executeCallback('setupcontent_callback', '_setupContent', 0, editor_id, inst.getBody(), inst.getDoc());
+
+	// Re-add design mode on mozilla
+	if (!tinyMCE.isMSIE)
+		TinyMCE.prototype.addEventHandlers(editor_id);
+
+	inst.startContent = inst.getBody().innerHTML;
+
+	// Trigger node change, this call locks buttons for tables and so forth
+	tinyMCE.selectedInstance = inst;
+	tinyMCE.selectedElement = inst.contentWindow.document.body;
+	tinyMCE.triggerNodeChange(false, true);
+
+	// Call custom DOM cleanup
+	tinyMCE._customCleanup("insert_to_editor_dom", inst.contentWindow.document.body);
+};
+
+TinyMCE.prototype.cancelEvent = function(e) {
+	if (tinyMCE.isMSIE) {
+		e.returnValue = false;
+		e.cancelBubble = true;
+	} else
+		e.preventDefault();
+};
+
+TinyMCE.prototype.removeTinyMCEFormElements = function(form_obj) {
+	// Disable all UI form elements that TinyMCE created
+	for (var i=0; i<form_obj.elements.length; i++) {
+		var elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
+
+		if (elementId.indexOf('mce_editor_') == 0)
+			form_obj.elements[i].disabled = true;
+	}
+};
+
+TinyMCE.prototype.handleEvent = function(e) {
+	// Remove odd, error
+	if (typeof(tinyMCE) == "undefined")
+		return true;
+
+	//debug(e.type + " " + e.target.nodeName + " " + (e.relatedTarget ? e.relatedTarget.nodeName : ""));
+
+	switch (e.type) {
+		case "submit":
+			tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
+			tinyMCE.triggerSave();
+			return;
+
+		case "reset":
+			var formObj = tinyMCE.isMSIE ? window.event.srcElement : e.target;
+
+			for (var i=0; i<document.forms.length; i++) {
+				if (document.forms[i] == formObj)
+					window.setTimeout('tinyMCE.resetForm(' + i + ');', 10);
+			}
+			return;
+
+		case "paste":
+			if (tinyMCE.settings['auto_cleanup_word'])
+				window.setTimeout("tinyMCE.execInstanceCommand('" + e.target.editorId + "', 'mceCleanupWord', false, null);", 1);
+
+			break;
+
+		case "beforecut":
+		case "beforepaste":
+			if (tinyMCE.selectedInstance)
+				tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+			break;
+
+		case "keypress":
+			if (e.target.editorId) {
+				tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+			} else {
+				if (e.target.ownerDocument.editorId)
+					tinyMCE.selectedInstance = tinyMCE.instances[e.target.ownerDocument.editorId];
+			}
+
+			if (tinyMCE.selectedInstance)
+				tinyMCE.selectedInstance.switchSettings();
+
+			// Insert space instead of &nbsp;
+/*			if (tinyMCE.isGecko && e.charCode == 32) {
+				if (tinyMCE.selectedInstance._insertSpace()) {
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+			}*/
+
+			// Insert P element
+			if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && e.keyCode == 13 && !e.shiftKey) {
+				// Insert P element instead of BR
+				if (tinyMCE.selectedInstance._insertPara(e)) {
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+			}
+
+			// Handle backspace
+			if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+				// Insert P element instead of BR
+				if (tinyMCE.selectedInstance._handleBackSpace(e.type)) {
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+			}
+
+			// Mozilla custom key handling
+			if (!tinyMCE.isMSIE && e.ctrlKey && tinyMCE.settings['custom_undo_redo']) {
+				if (e.charCode == 120 || e.charCode == 118) { // Ctrl+X, Ctrl+V
+					tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+					return;
+				}
+
+				if (tinyMCE.settings['custom_undo_redo_keyboard_shortcuts']) {
+					if (e.charCode == 122) { // Ctrl+Z
+						tinyMCE.selectedInstance.execCommand("Undo");
+
+						// Cancel event
+						e.preventDefault();
+						return false;
+					}
+
+					if (e.charCode == 121) { // Ctrl+Y
+						tinyMCE.selectedInstance.execCommand("Redo");
+
+						// Cancel event
+						e.preventDefault();
+						return false;
+					}
+				}
+
+				if (e.charCode == 98) { // Ctrl+B
+					tinyMCE.selectedInstance.execCommand("Bold");
+
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+
+				if (e.charCode == 105) { // Ctrl+I
+					tinyMCE.selectedInstance.execCommand("Italic");
+
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+
+				if (e.charCode == 117) { // Ctrl+U
+					tinyMCE.selectedInstance.execCommand("Underline");
+
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+			}
+
+			if (tinyMCE.settings['custom_undo_redo']) {
+				// Check if it's a position key press
+				var keys = new Array(13,45,36,35,33,34,37,38,39,40);
+				var posKey = false;
+				for (var i=0; i<keys.length; i++) {
+					if (keys[i] == e.keyCode) {
+						tinyMCE.selectedInstance.typing = false;
+						posKey = true;
+						break;
+					}
+				}
+
+				// Add typing undo level
+				if (!tinyMCE.selectedInstance.typing && !posKey) {
+					tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+					tinyMCE.selectedInstance.typing = true;
+				}
+			}
+
+			//window.status = e.keyCode;
+			//window.status = e.type + " " + e.target.nodeName;
+
+			// Return key pressed
+			if (tinyMCE.isMSIE && tinyMCE.settings['force_br_newlines'] && e.keyCode == 13) {
+				if (e.target.editorId)
+					tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+
+				if (tinyMCE.selectedInstance) {
+					var sel = tinyMCE.selectedInstance.getDoc().selection;
+					var rng = sel.createRange();
+
+					if (tinyMCE.getParentElement(rng.parentElement(), "li") != null)
+						return false;
+
+					// Cancel event
+					e.returnValue = false;
+					e.cancelBubble = true;
+
+					// Insert BR element
+					rng.pasteHTML("<br />");
+					rng.collapse(false);
+					rng.select();
+
+					tinyMCE.triggerNodeChange(false);
+					return false;
+				}
+			}
+
+			// Backspace or delete
+			if (e.keyCode == 8 || e.keyCode == 46) {
+				tinyMCE.selectedElement = e.target;
+				tinyMCE.linkElement = tinyMCE.getParentElement(e.target, "a");
+				tinyMCE.imgElement = tinyMCE.getParentElement(e.target, "img");
+				tinyMCE.triggerNodeChange(false);
+			}
+
+			return false;
+		break;
+
+		case "keyup":
+		case "keydown":
+			if (e.target.editorId)
+				tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+			else
+				return;
+
+			if (tinyMCE.selectedInstance)
+				tinyMCE.selectedInstance.switchSettings();
+
+			// Handle backspace
+			if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+				// Insert P element instead of BR
+				if (tinyMCE.selectedInstance._handleBackSpace(e.type)) {
+					// Cancel event
+					e.preventDefault();
+					return false;
+				}
+			}
+
+			tinyMCE.selectedElement = null;
+			tinyMCE.selectedNode = null;
+			var elm = tinyMCE.selectedInstance.getFocusElement();
+			tinyMCE.linkElement = tinyMCE.getParentElement(elm, "a");
+			tinyMCE.imgElement = tinyMCE.getParentElement(elm, "img");
+			tinyMCE.selectedElement = elm;
+
+			// Update visualaids on tabs
+			if (tinyMCE.isGecko && e.type == "keyup" && e.keyCode == 9)
+				tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(), true, tinyMCE.settings['visual']);
+
+			// Run image/link fix on Gecko if diffrent document base on paste
+			if (tinyMCE.isGecko && tinyMCE.settings['document_base_url'] != "" + document.location.href && e.type == "keyup" && e.ctrlKey && e.keyCode == 86)
+				tinyMCE.selectedInstance.fixBrokenURLs();
+
+			// Insert space instead of &nbsp;
+/*			if (e.type == "keydown" && e.keyCode == 32) {
+				if (tinyMCE.selectedInstance._insertSpace()) {
+					// Cancel event
+					e.returnValue = false;
+					e.cancelBubble = true;
+					return false;
+				}
+			}*/
+
+			// MSIE custom key handling
+			if (tinyMCE.isMSIE && tinyMCE.settings['custom_undo_redo']) {
+				// Check if it's a position key press
+				var keys = new Array(13,45,36,35,33,34,37,38,39,40);
+				var posKey = false;
+				for (var i=0; i<keys.length; i++) {
+					if (keys[i] == e.keyCode) {
+						tinyMCE.selectedInstance.typing = false;
+						posKey = true;
+						break;
+					}
+				}
+
+				// Add typing undo level (unless pos keys or shift, alt, ctrl, capslock)
+				if (!tinyMCE.selectedInstance.typing && !posKey && (e.keyCode < 16 || e.keyCode > 18 && e.keyCode != 255)) {
+					tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+					tinyMCE.selectedInstance.typing = true;
+					tinyMCE.triggerNodeChange(false);
+				}
+
+				if (posKey && e.type == "keyup")
+					tinyMCE.triggerNodeChange(false);
+
+				var keys = new Array(8,46); // Backspace,Delete
+				for (var i=0; i<keys.length; i++) {
+					if (keys[i] == e.keyCode) {
+						if (!tinyMCE.selectedInstance.typing) {
+							tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+							tinyMCE.selectedInstance.typing = true;
+						}
+
+						if (e.type == "keyup")
+							tinyMCE.triggerNodeChange(false);
+
+						return true;
+					}
+				}
+
+				var ctrlKeys = new Array(66,73,85,86,88); // B/I/U/V/X
+				for (var i=0; i<keys.length; i++) {
+					if (ctrlKeys[i] == e.keyCode && e.ctrlKey) {
+						tinyMCE.selectedInstance.execCommand("mceAddUndoLevel");
+						tinyMCE.triggerNodeChange(false);
+						return true;
+					}
+				}
+
+				if (tinyMCE.settings['custom_undo_redo_keyboard_shortcuts']) {
+					if (e.keyCode == 90 && e.ctrlKey && e.type == "keydown") { // Ctrl+Z
+						tinyMCE.selectedInstance.execCommand("Undo");
+						tinyMCE.triggerNodeChange(false);
+
+						// Cancel event
+						e.returnValue = false;
+						e.cancelBubble = true;
+						return false;
+					}
+
+					if (e.keyCode == 89 && e.ctrlKey && e.type == "keydown") { // Ctrl+Y
+						tinyMCE.selectedInstance.execCommand("Redo");
+						tinyMCE.triggerNodeChange(false);
+
+						// Cancel event
+						e.returnValue = false;
+						e.cancelBubble = true;
+						return false;
+					}
+				}
+			}
+
+			// Check if it's a position key press
+			var keys = new Array(13,45,36,35,33,34,37,38,39,40);
+			var posKey = false;
+			for (var i=0; i<keys.length; i++) {
+				if (keys[i] == e.keyCode) {
+					posKey = true;
+					break;
+				}
+			}
+
+			// Trigger some nodechange on keyup
+			if (posKey && e.type == "keyup")
+				tinyMCE.triggerNodeChange(false);
+		break;
+
+		case "mousedown":
+		case "mouseup":
+		case "click":
+		case "focus":
+			if (tinyMCE.selectedInstance)
+				tinyMCE.selectedInstance.switchSettings();
+
+			// Check instance event trigged on
+			var targetBody = tinyMCE.getParentElement(e.target, "body");
+			for (var instanceName in tinyMCE.instances) {
+				var inst = tinyMCE.instances[instanceName];
+
+				// Reset design mode if lost (on everything just in case)
+				inst.autoResetDesignMode();
+
+				if (inst.getBody() == targetBody) {
+					tinyMCE.selectedInstance = inst;
+					tinyMCE.selectedElement = e.target;
+					tinyMCE.linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+					tinyMCE.imgElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "img");
+
+					// Reset typing
+					tinyMCE.selectedInstance.typing = false;
+					break;
+				}
+			}
+
+			// Reset selected node
+			if (e.type != "focus")
+				tinyMCE.selectedNode = null;
+
+			tinyMCE.triggerNodeChange(false);
+
+			// Just in case
+			if (!tinyMCE.selectedInstance && e.target.editorId)
+				tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+
+			// Was it alt click on link
+			if (e.target.nodeName.toLowerCase() == "a" && e.type == "click" && e.altKey) {
+				var evalCode = "" + tinyMCE.cleanupEventStr(e.target.getAttribute("mce_onclick"));
+
+				// Remove any return too
+				eval(evalCode.replace('return false;', ''));
+			}
+
+			//if (tinyMCE.selectedInstance)
+			//	tinyMCE.selectedInstance.fixBrokenURLs();
+
+			// Run image/link fix on Gecko if diffrent document base
+			if (tinyMCE.isGecko && tinyMCE.settings['document_base_url'] != "" + document.location.href)
+				window.setTimeout('tinyMCE.getInstanceById("' + inst.editorId + '").fixBrokenURLs();', 10);
+
+			return false;
+		break;
+    } // end switch
+}; // end function
+
+TinyMCE.prototype.switchClass = function(element, class_name, lock_state) {
+	var lockChanged = false;
+
+	if (typeof(lock_state) != "undefined" && element != null) {
+		element.classLock = lock_state;
+		lockChanged = true;
+	}
+
+	if (element != null && (lockChanged || !element.classLock)) {
+		element.oldClassName = element.className;
+		element.className = class_name;
+	}
+};
+
+TinyMCE.prototype.restoreAndSwitchClass = function(element, class_name) {
+	if (element != null && !element.classLock) {
+		this.restoreClass(element);
+		this.switchClass(element, class_name);
+	}
+};
+
+TinyMCE.prototype.switchClassSticky = function(element_name, class_name, lock_state) {
+	var element, lockChanged = false;
+
+	// Performance issue
+	if (!this.stickyClassesLookup[element_name])
+		this.stickyClassesLookup[element_name] = document.getElementById(element_name);
+
+//	element = document.getElementById(element_name);
+	element = this.stickyClassesLookup[element_name];
+
+	if (typeof(lock_state) != "undefined" && element != null) {
+		element.classLock = lock_state;
+		lockChanged = true;
+	}
+
+	if (element != null && (lockChanged || !element.classLock)) {
+		element.className = class_name;
+		element.oldClassName = class_name;
+	}
+};
+
+TinyMCE.prototype.restoreClass = function(element) {
+	if (element != null && element.oldClassName && !element.classLock) {
+		element.className = element.oldClassName;
+		element.oldClassName = null;
+	}
+};
+
+TinyMCE.prototype.setClassLock = function(element, lock_state) {
+	if (element != null)
+		element.classLock = lock_state;
+};
+
+TinyMCE.prototype.addEvent = function(obj, name, handler) {
+	if (tinyMCE.isMSIE) {
+		obj.attachEvent("on" + name, handler);
+	} else
+		obj.addEventListener(name, handler, false);
+};
+
+TinyMCE.prototype.submitPatch = function() {
+	tinyMCE.removeTinyMCEFormElements(this);
+	tinyMCE.triggerSave();
+	this.oldSubmit();
+};
+
+TinyMCE.prototype.onLoad = function() {
+	for (var c=0; c<tinyMCE.configs.length; c++) {
+		tinyMCE.settings = tinyMCE.configs[c];
+
+		var elementRefAr = new Array();
+
+		// Add submit triggers
+		if (document.forms && tinyMCE.settings['add_form_submit_trigger'] && !tinyMCE.submitTriggers) {
+			for (var i=0; i<document.forms.length; i++) {
+				var form = document.forms[i];
+
+				tinyMCE.addEvent(form, "submit", TinyMCE.prototype.handleEvent);
+				tinyMCE.addEvent(form, "reset", TinyMCE.prototype.handleEvent);
+				tinyMCE.submitTriggers = true; // Do it only once
+
+				// Patch the form.submit function
+				if (tinyMCE.settings['submit_patch']) {
+					try {
+						form.oldSubmit = form.submit;
+						form.submit = TinyMCE.prototype.submitPatch;
+					} catch (e) {
+						// Do nothing
+					}
+				}
+			}
+		}
+
+		// Add editor instances based on mode
+		var mode = tinyMCE.settings['mode'];
+		switch (mode) {
+			case "exact":
+				var elements = tinyMCE.getParam('elements', '', true, ',');
+
+				for (var i=0; i<elements.length; i++) {
+					var element = tinyMCE._getElementById(elements[i]);
+					var trigger = element ? element.getAttribute(tinyMCE.settings['textarea_trigger']) : "";
+
+					if (trigger == "false")
+						continue;
+
+					if (tinyMCE.settings['ask'] && element) {
+						elementRefAr[elementRefAr.length] = element;
+						continue;
+					}
+
+					if (element)
+						tinyMCE.addMCEControl(element, elements[i]);
+					else if (tinyMCE.settings['debug'])
+						alert("Error: Could not find element by id or name: " + elements[i]);
+				}
+			break;
+
+			case "specific_textareas":
+			case "textareas":
+				var nodeList = document.getElementsByTagName("textarea");
+
+				for (var i=0; i<nodeList.length; i++) {
+					var trigger = nodeList.item(i).getAttribute(tinyMCE.settings['textarea_trigger']);
+
+					if ((mode == "specific_textareas" && trigger == "true") || (mode == "textareas" && trigger != "false"))
+						elementRefAr[elementRefAr.length] = nodeList.item(i);
+				}
+			break;
+		}
+
+		for (var i=0; i<elementRefAr.length; i++) {
+			var element = elementRefAr[i];
+			var elementId = element.name ? element.name : element.id;
+
+			if (tinyMCE.settings['ask']) {
+				// Focus breaks in Mozilla
+				if (tinyMCE.isGecko) {
+					var settings = tinyMCE.settings;
+
+					tinyMCE.addEvent(element, "focus", function (e) {window.setTimeout(function() {TinyMCE.prototype.confirmAdd(e, settings);}, 10);});
+				} else {
+					var settings = tinyMCE.settings;
+
+					tinyMCE.addEvent(element, "focus", function () { TinyMCE.prototype.confirmAdd(null, settings); });
+				}
+			} else
+				tinyMCE.addMCEControl(element, elementId);
+		}
+
+		// Handle auto focus
+		if (tinyMCE.settings['auto_focus']) {
+			window.setTimeout(function () {
+				var inst = tinyMCE.getInstanceById(tinyMCE.settings['auto_focus']);
+				inst.selectNode(inst.getBody(), true, true);
+				inst.contentWindow.focus();
+			}, 10);
+		}
+
+		tinyMCE.executeCallback('oninit', '_oninit', 0);
+	}
+};
+
+TinyMCE.prototype.removeMCEControl = function(editor_id) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+
+	if (inst) {
+		inst.switchSettings();
+
+		editor_id = inst.editorId;
+		var html = tinyMCE.getContent(editor_id);
+
+		// Remove editor instance from instances array
+		var tmpInstances = new Array();
+		for (var instanceName in tinyMCE.instances) {
+			var instance = tinyMCE.instances[instanceName];
+			if (instanceName != editor_id)
+					tmpInstances[instanceName] = instance;
+		}
+		tinyMCE.instances = tmpInstances;
+
+		tinyMCE.selectedElement = null;
+		tinyMCE.selectedInstance = null;
+
+		// Remove element
+		var replaceElement = document.getElementById(editor_id + "_parent");
+		var oldTargetElement = inst.oldTargetElement;
+		var targetName = oldTargetElement.nodeName.toLowerCase();
+
+		if (targetName == "textarea" || targetName == "input") {
+			// Just show the old text area
+			replaceElement.parentNode.removeChild(replaceElement);
+			oldTargetElement.style.display = "inline";
+			oldTargetElement.value = html;
+		} else {
+			oldTargetElement.innerHTML = html;
+
+			replaceElement.parentNode.insertBefore(oldTargetElement, replaceElement);
+			replaceElement.parentNode.removeChild(replaceElement);
+		}
+	}
+};
+
+TinyMCE.prototype._cleanupElementName = function(element_name, element) {
+	element_name = element_name.toLowerCase();
+
+	// Never include body
+	if (element_name == "body")
+		return null;
+
+	// If verification mode
+	if (tinyMCE.cleanup_verify_html) {
+		// Check if invalid element
+		for (var i=0; i<tinyMCE.cleanup_invalidElements.length; i++) {
+			if (tinyMCE.cleanup_invalidElements[i] == element_name)
+				return null;
+		}
+
+		// Check if valid element
+		var validElement = false;
+		var elementAttribs = null;
+		for (var i=0; i<tinyMCE.cleanup_validElements.length && !elementAttribs; i++) {
+			for (var x=0, n=tinyMCE.cleanup_validElements[i][0].length; x<n; x++) {
+				var elmMatch = tinyMCE.cleanup_validElements[i][0][x];
+
+				if (elmMatch.charAt(0) == '+')
+					elmMatch = elmMatch.substring(1);
+
+				// Handle wildcard/regexp
+				if (elmMatch.match(new RegExp('\\*|\\?|\\+', 'g')) != null) {
+					elmMatch = elmMatch.replace(new RegExp('\\?', 'g'), '(\\S?)');
+					elmMatch = elmMatch.replace(new RegExp('\\+', 'g'), '(\\S+)');
+					elmMatch = elmMatch.replace(new RegExp('\\*', 'g'), '(\\S*)');
+					elmMatch = "^" + elmMatch + "$";
+					if (element_name.match(new RegExp(elmMatch, 'g'))) {
+						elementAttribs = tinyMCE.cleanup_validElements[i];
+						validElement = true;
+						break;
+					}
+				}
+
+				// Handle non regexp
+				if (element_name == elmMatch) {
+					elementAttribs = tinyMCE.cleanup_validElements[i];
+					validElement = true;
+					element_name = elementAttribs[0][0];
+					break;
+				}
+			}
+		}
+
+		if (!validElement)
+			return null;
+	}
+
+	// Special Mozilla stuff
+	if (!tinyMCE.isMSIE) {
+		// Fix for bug #958498
+		if (element_name == "strong" && !tinyMCE.cleanup_on_save)
+			element_name = "b";
+		else if (element_name == "em" && !tinyMCE.cleanup_on_save)
+			element_name = "i";
+	}
+
+	// Special MSIE stuff
+	if (tinyMCE.isMSIE) {
+		if (element_name == "table") {
+			var attribValue = element.style.pixelWidth == 0 ? element.getAttribute("width") : element.style.pixelWidth;
+			element.setAttribute("width", attribValue);
+
+			attribValue = element.style.pixelHeight == 0 ? element.getAttribute("height") : element.style.pixelHeight;
+			element.setAttribute("height", attribValue);
+		}
+	}
+
+	var elmData = new Object();
+
+	elmData.element_name = element_name;
+	elmData.valid_attribs = elementAttribs;
+
+	return elmData;
+};
+
+/**
+ * Converts some element attributes to inline styles.
+ */
+TinyMCE.prototype._fixInlineStyles = function(elm) {
+	// Handle non table elements
+	if (elm.nodeName.toLowerCase() != "table") {
+		var value;
+
+		// Setup width
+		value = tinyMCE.isMSIE ? elm.width : elm.getAttribute("width");
+		if (value && value != "") {
+			if (typeof(value) != "string" || !value.indexOf("%"))
+				value += "px";
+
+			elm.style.width = value;
+		}
+
+		// Setup height
+		value = tinyMCE.isMSIE ? elm.height : elm.getAttribute("height");
+		if (value && value != "") {
+			if (typeof(value) != "string" || !value.indexOf("%"))
+				value += "px";
+
+			elm.style.height = value;
+		}
+
+		// Setup border
+		value = tinyMCE.isMSIE ? elm.border : elm.getAttribute("border");
+		if (value && value != "")
+			elm.style.borderWidth = value + "px";
+	}
+
+	// Setup align
+	value = elm.getAttribute("align");
+	if (value && value != "") {
+		if (elm.nodeName.toLowerCase() == "img") {
+			if (tinyMCE.isMSIE)
+				elm.style.styleFloat = value;
+			else
+				elm.style.cssFloat = value;
+		} else
+			elm.style.textAlign = value;
+	}
+
+	// Setup vspace
+	value = elm.getAttribute("vspace");
+	if (value && value != "") {
+		elm.style.marginTop = value + "px";
+		elm.style.marginBottom = value + "px";
+	}
+
+	// Setup hspace
+	value = elm.getAttribute("hspace");
+	if (value && value != "") {
+		elm.style.marginLeft = value + "px";
+		elm.style.marginRight = value + "px";
+	}
+};
+
+TinyMCE.prototype._cleanupAttribute = function(valid_attributes, element_name, attribute_node, element_node) {
+	var attribName = attribute_node.nodeName.toLowerCase();
+	var attribValue = attribute_node.nodeValue;
+	var attribMustBeValue = null;
+	var verified = false;
+
+	// Inline styling, skip them
+	if (tinyMCE.cleanup_inline_styles && element_name != "table" && element_name != "td") {
+		if (attribName == "width" || attribName == "height" || attribName == "border" || attribName == "align" || attribName == "valign" || attribName == "hspace" || attribName == "vspace")
+			return null;
+	}
+
+	// Mozilla attibute, remove them
+	if (attribName.indexOf('moz_') != -1)
+		return null;
+
+	// Mozilla fix for drag-drop/copy/paste images
+	if (!tinyMCE.isMSIE && (attribName == "mce_real_href" || attribName == "mce_real_src")) {
+		if (!tinyMCE.cleanup_on_save) {
+			var attrib = new Object();
+
+			attrib.name = attribName;
+			attrib.value = attribValue;
+
+			return attrib;
+		} else
+			return null;
+	}
+
+	// Auto verify 
+	if (attribName == "mce_onclick")
+		verified = true;
+
+	// Verify attrib
+	if (tinyMCE.cleanup_verify_html && !verified) {
+		for (var i=1; i<valid_attributes.length; i++) {
+			var attribMatch = valid_attributes[i][0];
+			var re = null;
+
+			// Build regexp from wildcard
+			if (attribMatch.match(new RegExp('\\*|\\?|\\+', 'g')) != null) {
+				attribMatch = attribMatch.replace(new RegExp('\\?', 'g'), '(\\S?)');
+				attribMatch = attribMatch.replace(new RegExp('\\+', 'g'), '(\\S+)');
+				attribMatch = attribMatch.replace(new RegExp('\\*', 'g'), '(\\S*)');
+				attribMatch = "^" + attribMatch + "$";
+				re = new RegExp(attribMatch, 'g');
+			}
+
+			if ((re && attribName.match(re) != null) || attribName == attribMatch) {
+				verified = true;
+				attribMustBeValue = valid_attributes[i][3];
+				break;
+			}
+		}
+
+		// Allways pass styles on table and td elements if visual_aid
+		if ((element_name == "table" || element_name == "td") && attribName == "style")
+			verified = true;
+
+		if (!verified)
+			return false;
+	} else
+		verified = true;
+
+	// Treat some attribs diffrent
+	switch (attribName) {
+		case "size":
+			if (tinyMCE.isMSIE5 && element_name == "font")
+				attribValue = element_node.size;
+			break;
+
+		case "color":
+			if (tinyMCE.isMSIE5 && element_name == "font")
+				attribValue = element_node.color;
+			break;
+
+		case "width":
+			// MSIE 5.5 issue
+			if (tinyMCE.isMSIE)
+				attribValue = element_node.width;
+			break;
+
+		case "height":
+			// MSIE 5.5 issue
+			if (tinyMCE.isMSIE)
+				attribValue = element_node.height;
+			break;
+
+		case "border":
+			// MSIE 5.5 issue
+			if (tinyMCE.isMSIE)
+				attribValue = element_node.border;
+			break;
+
+//		case "className":
+		case "class":
+			if (element_name == "table" || element_name == "td") {
+				// Handle visual aid
+				if (tinyMCE.cleanup_visual_table_class != "")
+					attribValue = tinyMCE.getVisualAidClass(attribValue, !tinyMCE.cleanup_on_save);
+			}
+
+			if (!tinyMCE._verifyClass(element_node) || attribValue == "")
+				return null;
+
+//			if (tinyMCE.isMSIE)
+//				attribValue = node.getAttribute('className');
+
+			break;
+
+		case "style":
+			attribValue = element_node.style.cssText.toLowerCase();
+
+			// Compress borders some
+			if (tinyMCE.isMSIE) {
+				var border = element_node.style.border;
+				var bt = element_node.style.borderTop;
+				var bl = element_node.style.borderLeft;
+				var br = element_node.style.borderRight;
+				var bb = element_node.style.borderBottom;
+
+				// All the same
+				if (border != "" && (bt == border && bl == border && br == border && bb == border)) {
+					attribValue = tinyMCE.regexpReplace(attribValue, 'border-top: ' + border + '?; ?', '');
+					attribValue = tinyMCE.regexpReplace(attribValue, 'border-left: ' + border  + '?; ?', '');
+					attribValue = tinyMCE.regexpReplace(attribValue, 'border-right: ' + border  + '?; ?', '');
+					attribValue = tinyMCE.regexpReplace(attribValue, 'border-bottom: ' + border + '?;( ?)', 'border: ' + border + ';$1');
+				}
+			}
+			break;
+
+		// Handle onclick
+		case "onclick":
+		case "mce_onclick":
+			// Skip on MSIE < 6+
+			if (tinyMCE.isMSIE5)
+				break;
+
+			// Fix onclick attrib
+			if (tinyMCE.cleanup_on_save) {
+				if (element_node.getAttribute("mce_onclick")) {
+					attribName = "onclick";
+					attribValue = "" + element_node.getAttribute("mce_onclick");
+				}
+			} else {
+				if (attribName == "onclick" && !tinyMCE.cleanup_on_save)
+					return null;
+			}
+
+			break;
+
+		// Convert the URLs of these
+		case "href":
+		case "src":
+			// Fix for dragdrop/copy paste Mozilla issue
+			if (!tinyMCE.isMSIE && attribName == "href" && element_node.getAttribute("mce_real_href"))
+				attribValue = element_node.getAttribute("mce_real_href");
+
+			// Fix for dragdrop/copy paste Mozilla issue
+			if (!tinyMCE.isMSIE && attribName == "src" && element_node.getAttribute("mce_real_src"))
+				attribValue = element_node.getAttribute("mce_real_src");
+
+			// Force absolute URLs in Firefox
+			if (tinyMCE.isGecko && !tinyMCE.settings['relative_urls'])
+				attribValue = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], attribValue);
+
+			attribValue = eval(tinyMCE.cleanup_urlconverter_callback + "(attribValue, element_node, tinyMCE.cleanup_on_save);");
+			break;
+
+		case "colspan":
+		case "rowspan":
+			// Not needed
+			if (attribValue == "1")
+				return null;
+			break;
+
+		// Skip these
+		case "_moz-userdefined":
+		case "editorid":
+		case "editor_id":
+		case "mce_real_href":
+		case "mce_real_src":
+			return null;
+	}
+
+	// Not the must be value
+	if (attribMustBeValue != null) {
+		var isCorrect = false;
+		for (var i=0; i<attribMustBeValue.length; i++) {
+			if (attribValue == attribMustBeValue[i]) {
+				isCorrect = true;
+				break;
+			}
+		}
+
+		if (!isCorrect)
+			return null;
+	}
+
+	var attrib = new Object();
+
+	attrib.name = attribName;
+	attrib.value = attribValue;
+
+	return attrib;
+};
+
+TinyMCE.prototype._verifyClass = function(node) {
+	// Sometimes the class gets set to null, weird Gecko bug?
+	if (tinyMCE.isGecko) {
+		var className = node.getAttribute('class');
+		if (!className)
+			return false;
+	}
+
+	// Trim CSS class
+	if (tinyMCE.isMSIE)
+		var className = node.getAttribute('className');
+
+	if (tinyMCE.cleanup_verify_css_classes && tinyMCE.cleanup_on_save) {
+		var csses = tinyMCE.getCSSClasses();
+		nonDefinedCSS = true;
+		for (var c=0; c<csses.length; c++) {
+			if (csses[c] == className) {
+				nonDefinedCSS = false;
+				break;
+			}
+		}
+
+		if (nonDefinedCSS && className.indexOf('mce_') != 0) {
+			node.removeAttribute('className');
+			node.removeAttribute('class');
+			return false;
+		}
+	}
+
+	return true;
+};
+
+TinyMCE.prototype.cleanupNode = function(node) {
+	var output = "";
+
+	switch (node.nodeType) {
+		case 1: // Element
+			var elementData = tinyMCE._cleanupElementName(node.nodeName, node);
+			var elementName = elementData ? elementData.element_name : null;
+			var elementValidAttribs = elementData ? elementData.valid_attribs : null;
+			var elementAttribs = "";
+			var openTag = false;
+
+			if (elementName != null && elementName.charAt(0) == '+') {
+				elementName = elementName.substring(1);
+				openTag = true;
+			}
+
+			// Checking DOM tree for MSIE weirdness!!
+			if (tinyMCE.isMSIE && tinyMCE.settings['fix_content_duplication']) {
+				var lookup = tinyMCE.cleanup_elementLookupTable;
+
+				for (var i=0; i<lookup.length; i++) {
+					// Found element reference else were, hmm?
+					if (lookup[i] == node)
+						return output;
+				}
+
+				// Add element to lookup table
+				lookup[lookup.length] = node;
+			}
+
+			// Element not valid (only render children)
+			if (!elementName) {
+				if (node.hasChildNodes()) {
+					for (var i=0; i<node.childNodes.length; i++)
+						output += this.cleanupNode(node.childNodes[i]);
+				}
+
+				return output;
+			}
+
+			// Has mso/microsuck crap or empty attrib
+			if (node.style && (node.style.cssText.indexOf('mso-') != -1 && tinyMCE.settings['auto_cleanup_word']) || node.style.cssText == "") {
+				node.style.cssText = "";
+				node.removeAttribute("style");
+			}
+
+			// Handle inline styles
+			if (tinyMCE.cleanup_inline_styles)
+				tinyMCE._fixInlineStyles(node);
+
+			// Set attrib data
+			if (elementValidAttribs) {
+				for (var a=1; a<elementValidAttribs.length; a++) {
+					var attribName, attribDefaultValue, attribForceValue, attribValue;
+
+					attribName = elementValidAttribs[a][0];
+					attribDefaultValue = elementValidAttribs[a][1];
+					attribForceValue = elementValidAttribs[a][2];
+
+					if (attribDefaultValue != null || attribForceValue != null) {
+						var attribValue = node.getAttribute(attribName);
+
+						if (node.getAttribute(attribName) == null || node.getAttribute(attribName) == "")
+							attribValue = attribDefaultValue;
+
+						attribValue = attribForceValue ? attribForceValue : attribValue;
+
+						// Is to generate id
+						if (attribValue == "{$uid}")
+							attribValue = "uid_" + (tinyMCE.cleanup_idCount++);
+
+						node.setAttribute(attribName, attribValue);
+						//alert(attribName + "=" + attribValue);
+					}
+				}
+			}
+
+			// Remove non needed span elements
+			if (elementName == "span" && tinyMCE.cleanup_trim_span_elements) {
+				var re = new RegExp('^[ \t]+', 'g');
+				var onlyWhiteSpace = true;
+				for (var a=0; a<node.childNodes.length; a++) {
+					var tmpNode = node.childNodes[a];
+					if ((tmpNode.nodeType == 3 && !tmpNode.nodeValue.match(re)) || tmpNode.nodeName.toLowerCase() != "span") {
+						onlyWhiteSpace = false;
+						break;
+					}
+				}
+
+				// Count attributes
+				tinyMCE._verifyClass(node);
+				var numAttribs = 0;
+				for (var i=0; i<node.attributes.length; i++) {
+					if (node.attributes[i].specified)
+						numAttribs++;
+				}
+
+				// Is not a valid span, remove it
+				if (onlyWhiteSpace || numAttribs == 0) {
+					if (node.hasChildNodes()) {
+						for (var i=0; i<node.childNodes.length; i++)
+							output += this.cleanupNode(node.childNodes[i]);
+					}
+
+					return output;
+				}
+			}
+
+			// Add some visual aids
+/*			if (elementName == "table" || elementName == "td") {
+				// Handle visual aid
+				if (tinyMCE.cleanup_visual_table_class != "") {
+					// Find parent table
+					var tableElement = node;
+					if (elementName == "td")
+						tableElement = tinyMCE.getParentElement(tableElement, "table");
+
+					if (tableElement && tableElement.getAttribute("border") == 0) {
+						if (tinyMCE.cleanup_visual_aid)
+							elementAttribs += ' class="' + tinyMCE.getVisualAidClass(tinyMCE.getAttrib(node, "class")) + '"';
+					}
+				}
+			}*/
+
+			// Remove empty tables
+			if (elementName == "table" && !node.hasChildNodes())
+				return "";
+
+			// Fix width/height attributes if the styles is specified
+			if (tinyMCE.isGecko && elementName == "img") {
+				var w = node.style.width;
+				if (w != null && w != "")
+					node.setAttribute("width", w);
+
+				var h = node.style.height;
+				if (h != null && h != "")
+					node.setAttribute("height", h);
+			}
+
+			// Handle element attributes
+			if (node.attributes.length > 0) {
+				for (var i=0; i<node.attributes.length; i++) {
+					if (node.attributes[i].specified) {
+						var attrib = tinyMCE._cleanupAttribute(elementValidAttribs, elementName, node.attributes[i], node);
+						if (attrib)
+							elementAttribs += " " + attrib.name + "=" + '"' + attrib.value + '"';
+					}
+				}
+
+				//alert(elementAttribs);
+			}
+
+			// MSIE form element issue
+			if (tinyMCE.isMSIE && elementName == "input") {
+				if (node.type)
+					elementAttribs += " type=" + '"' + node.type + '"';
+
+				if (node.value)
+					elementAttribs += " value=" + '"' + node.value + '"';
+			}
+
+			// Add nbsp to some elements
+			if ((elementName == "p" || elementName == "td") && (node.innerHTML == "" || node.innerHTML == "&nbsp;"))
+				return "<" + elementName + elementAttribs + ">" + this.convertStringToXML(String.fromCharCode(160)) + "</" + elementName + ">";
+
+			// Is MSIE script element
+			if (tinyMCE.isMSIE && elementName == "script")
+				return "<" + elementName + elementAttribs + ">" + node.text + "</" + elementName + ">";
+
+			// Clean up children
+			if (node.hasChildNodes()) {
+				// Force BR
+				if (elementName == "p" && tinyMCE.cleanup_force_br_newlines)
+					output += "<div" + elementAttribs + ">";
+				else
+					output += "<" + elementName + elementAttribs + ">";
+
+				for (var i=0; i<node.childNodes.length; i++)
+					output += this.cleanupNode(node.childNodes[i]);
+
+				// Force BR
+				if (elementName == "p" && tinyMCE.cleanup_force_br_newlines)
+					output += "</div><br />";
+				else
+					output += "</" + elementName + ">";
+			} else {
+				// Allways leave anchor elements open
+				if (openTag)
+					output += "<" + elementName + elementAttribs + "></" + elementName + ">";
+				else {
+					// No children
+					output += "<" + elementName + elementAttribs + " />";
+				}
+			}
+
+			return output;
+
+		case 3: // Text
+			// Do not convert script elements
+			if (node.parentNode.nodeName.toLowerCase() == "script")
+				return node.nodeValue;
+
+			return this.convertStringToXML(node.nodeValue);
+
+		case 8: // Comment
+			return "<!--" + node.nodeValue + "-->";
+
+		default: // Unknown
+			return "[UNKNOWN NODETYPE " + node.nodeType + "]";
+	}
+};
+
+TinyMCE.prototype.convertStringToXML = function(html_data) {
+    var output = "";
+
+	for (var i=0; i<html_data.length; i++) {
+		var chr = html_data.charCodeAt(i);
+
+		// Numeric entities
+		if (tinyMCE.settings['entity_encoding'] == "numeric") {
+			if (chr > 127)
+				output += '&#' + chr + ";";
+			else
+				output += String.fromCharCode(chr);
+
+			continue;
+		}
+
+		// Raw entities
+		if (tinyMCE.settings['entity_encoding'] == "raw") {
+			output += String.fromCharCode(chr);
+			continue;
+		}
+
+		// Named entities
+		if (typeof(tinyMCE.cleanup_entities["c" + chr]) != 'undefined' && tinyMCE.cleanup_entities["c" + chr] != '')
+			output += '&' + tinyMCE.cleanup_entities["c" + chr] + ';';
+		else
+			output += '' + String.fromCharCode(chr);
+    }
+
+    return output;
+};
+
+TinyMCE.prototype._getCleanupElementName = function(chunk) {
+	var pos;
+
+	if (chunk.charAt(0) == '+')
+		chunk = chunk.substring(1);
+
+	if ((pos = chunk.indexOf('/')) != -1)
+		chunk = chunk.substring(0, pos);
+
+	if ((pos = chunk.indexOf('[')) != -1)
+		chunk = chunk.substring(0, pos);
+
+	return chunk;
+};
+
+TinyMCE.prototype._initCleanup = function() {
+	// Parse valid elements and attributes
+	var validElements = tinyMCE.settings["valid_elements"];
+	validElements = validElements.split(',');
+
+	// Handle extended valid elements
+	var extendedValidElements = tinyMCE.settings["extended_valid_elements"];
+	extendedValidElements = extendedValidElements.split(',');
+	for (var i=0; i<extendedValidElements.length; i++) {
+		var elementName = this._getCleanupElementName(extendedValidElements[i]);
+		var skipAdd = false;
+
+		// Check if it's defined before, if so override that one
+		for (var x=0; x<validElements.length; x++) {
+			if (this._getCleanupElementName(validElements[x]) == elementName) {
+				validElements[x] = extendedValidElements[i];
+				skipAdd = true;
+				break;
+			}
+		}
+
+		if (!skipAdd)
+			validElements[validElements.length] = extendedValidElements[i];
+	}
+
+	for (var i=0; i<validElements.length; i++) {
+		var item = validElements[i];
+
+		item = item.replace('[','|');
+		item = item.replace(']','');
+
+		// Split and convert
+		var attribs = item.split('|');
+		for (var x=0; x<attribs.length; x++)
+			attribs[x] = attribs[x].toLowerCase();
+
+		// Handle change elements
+		attribs[0] = attribs[0].split('/');
+
+		// Handle default attribute values
+		for (var x=1; x<attribs.length; x++) {
+			var attribName = attribs[x];
+			var attribDefault = null;
+			var attribForce = null;
+			var attribMustBe = null;
+
+			// Default value
+			if ((pos = attribName.indexOf('=')) != -1) {
+				attribDefault = attribName.substring(pos+1);
+				attribName = attribName.substring(0, pos);
+			}
+
+			// Force check
+			if ((pos = attribName.indexOf(':')) != -1) {
+				attribForce = attribName.substring(pos+1);
+				attribName = attribName.substring(0, pos);
+			}
+
+			// Force check
+			if ((pos = attribName.indexOf('<')) != -1) {
+				attribMustBe = attribName.substring(pos+1).split('?');
+				attribName = attribName.substring(0, pos);
+			}
+
+			attribs[x] = new Array(attribName, attribDefault, attribForce, attribMustBe);
+		}
+
+		validElements[i] = attribs;
+	}
+
+	var invalidElements = tinyMCE.settings['invalid_elements'].split(',');
+	for (var i=0; i<invalidElements.length; i++)
+		invalidElements[i] = invalidElements[i].toLowerCase();
+
+	// Set these for performance
+	tinyMCE.settings['cleanup_validElements'] = validElements;
+	tinyMCE.settings['cleanup_invalidElements'] = invalidElements;
+
+	// Setup entities
+	tinyMCE.settings['cleanup_entities'] = new Array();
+	var entities = tinyMCE.getParam('entities', '', true, ',');
+	for (var i=0; i<entities.length; i+=2)
+		tinyMCE.settings['cleanup_entities']['c' + entities[i]] = entities[i+1];
+};
+
+TinyMCE.prototype._cleanupHTML = function(doc, config, element, visual, on_save) {
+	if (!tinyMCE.settings['cleanup'])
+		return element.innerHTML;
+
+	// Call custom cleanup code
+	tinyMCE._customCleanup(on_save ? "get_from_editor_dom" : "insert_to_editor_dom", doc.body);
+
+	// Set these for performance
+	tinyMCE.cleanup_validElements = tinyMCE.settings['cleanup_validElements'];
+	tinyMCE.cleanup_entities = tinyMCE.settings['cleanup_entities'];
+	tinyMCE.cleanup_invalidElements = tinyMCE.settings['cleanup_invalidElements'];
+	tinyMCE.cleanup_verify_html = tinyMCE.settings['verify_html'];
+	tinyMCE.cleanup_force_br_newlines = tinyMCE.settings['force_br_newlines'];
+	tinyMCE.cleanup_urlconverter_callback = tinyMCE.settings['urlconverter_callback'];
+	tinyMCE.cleanup_verify_css_classes = tinyMCE.settings['verify_css_classes'];
+	tinyMCE.cleanup_visual_table_class = tinyMCE.settings['visual_table_class'];
+	tinyMCE.cleanup_apply_source_formatting = tinyMCE.settings['apply_source_formatting'];
+	tinyMCE.cleanup_trim_span_elements = tinyMCE.settings['trim_span_elements'];
+	tinyMCE.cleanup_inline_styles = tinyMCE.settings['inline_styles'];
+	tinyMCE.cleanup_visual_aid = visual;
+	tinyMCE.cleanup_on_save = on_save;
+	tinyMCE.cleanup_idCount = 0;
+	tinyMCE.cleanup_elementLookupTable = new Array();
+
+	var startTime = new Date().getTime();
+
+	tinyMCE._convertOnClick(element);
+
+	// Cleanup madness that breaks the editor in MSIE
+	if (tinyMCE.isMSIE) {
+		element.innerHTML = tinyMCE.regexpReplace(element.innerHTML, '<p>[ \n\r]*<hr id=null>[ \n\r]*</p>', '<hr />', 'gi');
+		element.innerHTML = tinyMCE.regexpReplace(element.innerHTML, '<!([^-(DOCTYPE)]* )|<!/[^-]*>', '', 'gi');
+	}
+
+	var html = this.cleanupNode(element);
+
+	if (tinyMCE.settings['debug'])
+		alert("Cleanup process executed in: " + (new Date().getTime()-startTime) + " ms.");
+
+	// Remove pesky HR paragraphs
+	html = tinyMCE.regexpReplace(html, '<p><hr /></p>', '<hr />');
+	html = tinyMCE.regexpReplace(html, '<p>&nbsp;</p><hr /><p>&nbsp;</p>', '<hr />');
+
+	// Remove some mozilla crap
+	if (!tinyMCE.isMSIE)
+		html = html.replace(new RegExp('<o:p _moz-userdefined="" />', 'g'), "");
+
+	if (tinyMCE.settings['apply_source_formatting']) {
+		html = html.replace(new RegExp('<(p|div)([^>]*)>', 'g'), "\n<$1$2>\n");
+		html = html.replace(new RegExp('<\/(p|div)([^>]*)>', 'g'), "\n</$1$2>\n");
+		html = html.replace(new RegExp('<br />', 'g'), "<br />\n");
+	}
+
+	if (tinyMCE.settings['force_br_newlines']) {
+		var re = new RegExp('<p>&nbsp;</p>', 'g');
+		html = html.replace(re, "<br />");
+	}
+
+	if (tinyMCE.settings['force_p_newlines']) {
+		// Remove weridness!
+		var re = new RegExp('&lt;&gt;', 'g');
+		html = html.replace(re, "");
+	}
+
+	if (tinyMCE.settings['remove_linebreaks'])
+		html = html.replace(new RegExp('\r|\n', 'g'), ' ');
+
+	// Call custom cleanup code
+	html = tinyMCE._customCleanup(on_save ? "get_from_editor" : "insert_to_editor", html);
+
+	// Emtpy node, return empty
+	var chk = tinyMCE.regexpReplace(html, "[ \t\r\n]", "");
+	if (chk == "<br/>" || chk == "<br>" || chk == "<p>&nbsp;</p>" || chk == "<p>&#160;</p>" || chk == "<p></p>")
+		html = "";
+
+	if (tinyMCE.settings["preformatted"])
+		return "<pre>" + html + "</pre>";
+
+	return html;
+};
+
+TinyMCE.prototype.setAttrib = function(element, name, value, no_fix_value) {
+	if (!no_fix_value && value != null) {
+		var re = new RegExp('[^0-9%]', 'g');
+		value = value.replace(re, '');
+	}
+
+	if (value != null && value != "")
+		element.setAttribute(name, value);
+	else
+		element.removeAttribute(name);
+
+	if (value != null && value != "")
+		element.setAttribute(name, value);
+	else
+		element.removeAttribute(name);
+};
+
+TinyMCE.prototype.insertLink = function(href, target, title, onclick) {
+	this.execCommand("mceAddUndoLevel");
+
+	if (this.selectedInstance && this.selectedElement && this.selectedElement.nodeName.toLowerCase() == "img") {
+		var doc = this.selectedInstance.getDoc();
+		var linkElement = tinyMCE.getParentElement(this.selectedElement, "a");
+		var newLink = false;
+
+		if (!linkElement) {
+			linkElement = doc.createElement("a");
+			newLink = true;
+		}
+
+		href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, linkElement);");
+		tinyMCE.setAttrib(linkElement, 'href', href);
+		tinyMCE.setAttrib(linkElement, 'target', target);
+		tinyMCE.setAttrib(linkElement, 'title', title);
+        tinyMCE.setAttrib(linkElement, 'mce_onclick', onclick);
+
+		if (newLink) {
+			linkElement.appendChild(this.selectedElement.cloneNode(true));
+			this.selectedElement.parentNode.replaceChild(linkElement, this.selectedElement);
+		}
+
+		return;
+	}
+
+	if (!this.linkElement && this.selectedInstance) {
+		this.selectedInstance.contentDocument.execCommand("createlink", false, "#mce_temp_url#");
+		tinyMCE.linkElement = this.getElementByAttributeValue(this.selectedInstance.contentDocument.body, "a", "href", "#mce_temp_url#");
+
+		var elementArray = this.getElementsByAttributeValue(this.selectedInstance.contentDocument.body, "a", "href", "#mce_temp_url#");
+
+		for (var i=0; i<elementArray.length; i++) {
+			href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, elementArray[i]);");
+			tinyMCE.setAttrib(elementArray[i], 'href', href);
+			tinyMCE.setAttrib(elementArray[i], 'mce_real_href', href);
+			tinyMCE.setAttrib(elementArray[i], 'target', target);
+			tinyMCE.setAttrib(elementArray[i], 'title', title);
+            tinyMCE.setAttrib(elementArray[i], 'mce_onclick', onclick);
+		}
+
+		tinyMCE.linkElement = elementArray[0];
+	}
+
+	if (this.linkElement) {
+		href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, this.linkElement);");
+		tinyMCE.setAttrib(this.linkElement, 'href', href);
+		tinyMCE.setAttrib(this.linkElement, 'mce_real_href', href);
+		tinyMCE.setAttrib(this.linkElement, 'target', target);
+		tinyMCE.setAttrib(this.linkElement, 'title', title);
+        tinyMCE.setAttrib(this.linkElement, 'mce_onclick', onclick);
+	}
+};
+
+TinyMCE.prototype.insertImage = function(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout) {
+	if (src == "")
+		return;
+
+	this.execCommand("mceAddUndoLevel");
+
+	if (!this.imgElement && this.selectedInstance) {
+		this.selectedInstance.contentDocument.execCommand("insertimage", false, "#mce_temp_url#");
+		tinyMCE.imgElement = this.getElementByAttributeValue(this.selectedInstance.contentDocument.body, "img", "src", "#mce_temp_url#");
+	}
+
+	if (this.imgElement) {
+		var needsRepaint = false;
+
+		src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, tinyMCE.imgElement);");
+
+		if (onmouseover && onmouseover != "")
+			onmouseover = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, tinyMCE.imgElement);") + "';";
+
+		if (onmouseout && onmouseout != "")
+			onmouseout = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, tinyMCE.imgElement);") + "';";
+
+		// Use alt as title if it's undefined
+		if (typeof(title) == "undefined")
+			title = alt;
+
+		if (width != this.imgElement.getAttribute("width") || height != this.imgElement.getAttribute("height") || align != this.imgElement.getAttribute("align"))
+			needsRepaint = true;
+
+		tinyMCE.setAttrib(this.imgElement, 'src', src);
+		tinyMCE.setAttrib(this.imgElement, 'mce_real_src', src);
+		tinyMCE.setAttrib(this.imgElement, 'alt', alt);
+		tinyMCE.setAttrib(this.imgElement, 'title', title);
+		tinyMCE.setAttrib(this.imgElement, 'align', align);
+		tinyMCE.setAttrib(this.imgElement, 'border', border, true);
+		tinyMCE.setAttrib(this.imgElement, 'hspace', hspace, true);
+		tinyMCE.setAttrib(this.imgElement, 'vspace', vspace, true);
+		tinyMCE.setAttrib(this.imgElement, 'width', width, true);
+		tinyMCE.setAttrib(this.imgElement, 'height', height, true);
+		tinyMCE.setAttrib(this.imgElement, 'onmouseover', onmouseover);
+		tinyMCE.setAttrib(this.imgElement, 'onmouseout', onmouseout);
+
+		// Fix for bug #989846 - Image resize bug
+		if (width && width != "")
+			this.imgElement.style.pixelWidth = width;
+
+		if (height && height != "")
+			this.imgElement.style.pixelHeight = height;
+
+		if (needsRepaint)
+			tinyMCE.selectedInstance.repaint();
+	}
+};
+
+TinyMCE.prototype.getElementByAttributeValue = function(node, element_name, attrib, value) {
+	var elements = this.getElementsByAttributeValue(node, element_name, attrib, value);
+	if (elements.length == 0)
+		return null;
+
+	return elements[0];
+};
+
+TinyMCE.prototype.getElementsByAttributeValue = function(node, element_name, attrib, value) {
+	var elements = new Array();
+
+	if (node && node.nodeName.toLowerCase() == element_name) {
+		if (node.getAttribute(attrib) && node.getAttribute(attrib).indexOf(value) != -1)
+			elements[elements.length] = node;
+	}
+
+	if (node.hasChildNodes) {
+		for (var x=0, n=node.childNodes.length; x<n; x++) {
+			var childElements = this.getElementsByAttributeValue(node.childNodes[x], element_name, attrib, value);
+			for (var i=0, m=childElements.length; i<m; i++)
+				elements[elements.length] = childElements[i];
+		}
+	}
+
+	return elements;
+};
+
+TinyMCE.prototype.isBlockElement = function(node) {
+	return node != null && node.nodeType == 1 && this.blockRegExp.test(node.nodeName);
+};
+
+TinyMCE.prototype.getParentBlockElement = function(node) {
+	// Search up the tree for block element
+	while (node) {
+		if (this.blockRegExp.test(node.nodeName))
+			return node;
+
+		node = node.parentNode;
+	}
+
+	return null;
+};
+
+TinyMCE.prototype.getNodeTree = function(node, node_array, type, node_name) {
+	if (typeof(type) == "undefined" || node.nodeType == type && (typeof(node_name) == "undefined" || node.nodeName.toLowerCase() == node_name.toLowerCase()))
+		node_array[node_array.length] = node;
+
+	if (node.hasChildNodes()) {
+		for (var i=0; i<node.childNodes.length; i++)
+			tinyMCE.getNodeTree(node.childNodes[i], node_array, type, node_name);
+	}
+
+	return node_array;
+};
+
+TinyMCE.prototype.getParentElement = function(node, names, attrib_name, attrib_value) {
+	if (typeof(names) == "undefined") {
+		if (node.nodeType == 1)
+			return node;
+
+		// Find parent node that is a element
+		while ((node = node.parentNode) != null && node.nodeType != 1) ;
+
+		return node;
+	}
+
+	var namesAr = names.split(',');
+
+	if (node == null)
+		return null;
+
+	do {
+		for (var i=0; i<namesAr.length; i++) {
+			if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() || names == "*") {
+				if (typeof(attrib_name) == "undefined")
+					return node;
+				else if (node.getAttribute(attrib_name)) {
+					if (typeof(attrib_value) == "undefined") {
+						if (node.getAttribute(attrib_name) != "")
+							return node;
+					} else if (node.getAttribute(attrib_name) == attrib_value)
+						return node;
+				}
+			}
+		}
+	} while (node = node.parentNode);
+
+	return null;
+};
+
+TinyMCE.prototype.convertURL = function(url, node, on_save) {
+	var prot = document.location.protocol;
+	var host = document.location.hostname;
+	var port = document.location.port;
+
+	var fileProto = (prot == "file:");
+
+	// Something is wrong, remove weirdness
+	url = tinyMCE.regexpReplace(url, '(http|https):///', '/');
+
+	// Mailto link or anchor (Pass through)
+	if (url.indexOf('mailto:') != -1 || url.indexOf('javascript:') != -1 || tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0) == "#")
+		return url;
+
+	// Fix relative/Mozilla
+	if (!tinyMCE.isMSIE && !on_save && url.indexOf("://") == -1 && url.charAt(0) != '/')
+		return tinyMCE.settings['base_href'] + url;
+
+	// Handle absolute url anchors
+	if (!tinyMCE.settings['relative_urls']) {
+		var urlParts = tinyMCE.parseURL(url);
+		var baseUrlParts = tinyMCE.parseURL(tinyMCE.settings['base_href']);
+
+		// If anchor and path is the same page
+		if (urlParts['anchor'] && urlParts['path'] == baseUrlParts['path'])
+			return "#" + urlParts['anchor'];
+	}
+
+	// Convert to relative urls
+	if (on_save && tinyMCE.settings['relative_urls']) {
+		var urlParts = tinyMCE.parseURL(url);
+
+		// If not absolute url, do nothing (Mozilla)
+		// WEIRD STUFF?!
+/*		if (!urlParts['protocol'] && !tinyMCE.isMSIE) {
+			var urlPrefix = "http://";
+			urlPrefix += host;
+			if (port != "")
+				urlPrefix += ":" + port;
+
+			url = urlPrefix + url;
+			urlParts = tinyMCE.parseURL(url);
+		}*/
+
+		var tmpUrlParts = tinyMCE.parseURL(tinyMCE.settings['document_base_url']);
+
+		// Link is within this site
+		if (urlParts['host'] == tmpUrlParts['host'] && (!urlParts['port'] || urlParts['port'] == tmpUrlParts['port']))
+			return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'], url);
+	}
+
+	// Remove current domain
+	if (!fileProto && tinyMCE.settings['remove_script_host']) {
+		var start = "", portPart = "";
+
+		if (port != "")
+			portPart = ":" + port;
+
+		start = prot + "//" + host + portPart + "/";
+
+		if (url.indexOf(start) == 0)
+			url = url.substring(start.length-1);
+
+		// Add first slash if missing on a absolute URL
+		if (!tinyMCE.settings['relative_urls'] && url.indexOf('://') == -1 && url.charAt(0) != '/')
+			url = '/' + url;
+	}
+
+	return url;
+};
+
+/**
+ * Parses a URL in to its diffrent components.
+ */
+TinyMCE.prototype.parseURL = function(url_str) {
+	var urlParts = new Array();
+
+	if (url_str) {
+		var pos, lastPos;
+
+		// Parse protocol part
+		pos = url_str.indexOf('://');
+		if (pos != -1) {
+			urlParts['protocol'] = url_str.substring(0, pos);
+			lastPos = pos + 3;
+		}
+
+		// Find port or path start
+		for (var i=lastPos; i<url_str.length; i++) {
+			var chr = url_str.charAt(i);
+
+			if (chr == ':')
+				break;
+
+			if (chr == '/')
+				break;
+		}
+		pos = i;
+
+		// Get host
+		urlParts['host'] = url_str.substring(lastPos, pos);
+
+		// Get port
+		lastPos = pos;
+		if (url_str.charAt(pos) == ':') {
+			pos = url_str.indexOf('/', lastPos);
+			urlParts['port'] = url_str.substring(lastPos+1, pos);
+		}
+
+		// Get path
+		lastPos = pos;
+		pos = url_str.indexOf('?', lastPos);
+
+		if (pos == -1)
+			pos = url_str.indexOf('#', lastPos);
+
+		if (pos == -1)
+			pos = url_str.length;
+
+		urlParts['path'] = url_str.substring(lastPos, pos);
+
+		// Get query
+		lastPos = pos;
+		if (url_str.charAt(pos) == '?') {
+			pos = url_str.indexOf('#');
+			pos = (pos == -1) ? url_str.length : pos;
+			urlParts['query'] = url_str.substring(lastPos+1, pos);
+		}
+
+		// Get anchor
+		lastPos = pos;
+		if (url_str.charAt(pos) == '#') {
+			pos = url_str.length;
+			urlParts['anchor'] = url_str.substring(lastPos+1, pos);
+		}
+	}
+
+	return urlParts;
+};
+
+/**
+ * Converts an absolute path to relative path.
+ */
+TinyMCE.prototype.convertAbsoluteURLToRelativeURL = function(base_url, url_to_relative) {
+	var strTok1;
+	var strTok2;
+	var breakPoint = 0;
+	var outputString = "";
+
+	// Crop away last path part
+	base_url = base_url.substring(0, base_url.lastIndexOf('/'));
+	strTok1 = base_url.split('/');
+	strTok2 = url_to_relative.split('/');
+
+	if (strTok1.length >= strTok2.length) {
+		for (var i=0; i<strTok1.length; i++) {
+			if (i >= strTok2.length || strTok1[i] != strTok2[i]) {
+				breakPoint = i + 1;
+				break;
+			}
+		}
+	}
+
+	if (strTok1.length < strTok2.length) {
+		for (var i=0; i<strTok2.length; i++) {
+			if (i >= strTok1.length || strTok1[i] != strTok2[i]) {
+				breakPoint = i + 1;
+				break;
+			}
+		}
+	}
+
+	if (breakPoint == 1)
+		return url_to_relative;
+
+	for (var i=0; i<(strTok1.length-(breakPoint-1)); i++)
+		outputString += "../";
+
+	for (var i=breakPoint-1; i<strTok2.length; i++) {
+		if (i != (breakPoint-1))
+			outputString += "/" + strTok2[i];
+		else
+			outputString += strTok2[i];
+	}
+
+	return outputString;
+};
+
+TinyMCE.prototype.convertRelativeToAbsoluteURL = function(base_url, relative_url) {
+	var baseURL = TinyMCE.prototype.parseURL(base_url);
+	var relURL = TinyMCE.prototype.parseURL(relative_url);
+
+	if (relative_url == "" || relative_url.charAt(0) == '/' || relative_url.indexOf('://') != -1 || relative_url.indexOf('mailto:') != -1 || relative_url.indexOf('javascript:') != -1 || tinyMCE.regexpReplace(relative_url,'[ \t\r\n\+]|%20','').charAt(0) == "#")
+		return relative_url;
+
+	// Split parts
+	baseURLParts = baseURL['path'].split('/');
+	relURLParts = relURL['path'].split('/');
+
+	// Remove empty chunks
+	var newBaseURLParts = new Array();
+	for (var i=baseURLParts.length-1; i>=0; i--) {
+		if (baseURLParts[i].length == 0)
+			continue;
+
+		newBaseURLParts[newBaseURLParts.length] = baseURLParts[i];
+	}
+	baseURLParts = newBaseURLParts.reverse();
+
+	// Merge relURLParts chunks
+	var newRelURLParts = new Array();
+	var numBack = 0;
+	for (var i=relURLParts.length-1; i>=0; i--) {
+		if (relURLParts[i].length == 0 || relURLParts[i] == ".")
+			continue;
+
+		if (relURLParts[i] == '..') {
+			numBack++;
+			continue;
+		}
+
+		if (numBack > 0) {
+			numBack--;
+			continue;
+		}
+
+		newRelURLParts[newRelURLParts.length] = relURLParts[i];
+	}
+
+	relURLParts = newRelURLParts.reverse();
+
+	// Remove end from absolute path
+	var len = baseURLParts.length-numBack;
+	var absPath = (len <= 0 ? "" : "/") + baseURLParts.slice(0, len).join('/') + "/" + relURLParts.join('/');
+	var start = "", end = "";
+
+	// Build start part
+	if (baseURL['protocol'])
+		start += baseURL['protocol'] + "://";
+
+	if (baseURL['host'])
+		start += baseURL['host'];
+
+	if (baseURL['port'])
+		start += ":" + baseURL['port'];
+
+	// Build end part
+	if (relURL['query'])
+		end += "?" + relURL['query'];
+
+	if (relURL['anchor'])
+		end += "#" + relURL['anchor'];
+
+	// Re-add trailing slash if it's removed
+	if (relative_url.charAt(relative_url.length-1) == "/")
+		end += "/";
+
+	return start + absPath + end;
+};
+
+TinyMCE.prototype.getParam = function(name, default_value, strip_whitespace, split_chr) {
+	var value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	if (strip_whitespace)
+		value = tinyMCE.regexpReplace(value, "[ \t\r\n]", "");
+
+	if (typeof(split_chr) != "undefined" && split_chr != null) {
+		value = value.split(split_chr);
+		var outArray = new Array();
+
+		for (var i=0; i<value.length; i++) {
+			if (value[i] && value[i] != "")
+				outArray[outArray.length] = value[i];
+		}
+
+		value = outArray;
+	}
+
+	return value;
+};
+
+TinyMCE.prototype.getLang = function(name, default_value, parse_entities) {
+	var value = (typeof(tinyMCELang[name]) == "undefined") ? default_value : tinyMCELang[name];
+
+	if (parse_entities) {
+		var el = document.createElement("div");
+		el.innerHTML = value;
+		value = el.innerHTML;
+	}
+
+	return value;
+};
+
+TinyMCE.prototype.replaceVar = function(replace_haystack, replace_var, replace_str) {
+	var re = new RegExp('{\\\$' + replace_var + '}', 'g');
+	return replace_haystack.replace(re, replace_str);
+};
+
+TinyMCE.prototype.replaceVars = function(replace_haystack, replace_vars) {
+	for (var key in replace_vars) {
+		var value = replace_vars[key];
+		replace_haystack = tinyMCE.replaceVar(replace_haystack, key, value);
+	}
+
+	return replace_haystack;
+};
+
+TinyMCE.prototype.triggerNodeChange = function(focus, setup_content) {
+	if (tinyMCE.settings['handleNodeChangeCallback']) {
+		if (tinyMCE.selectedInstance) {
+			var inst = tinyMCE.selectedInstance;
+			var editorId = inst.editorId;
+			var elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
+			var undoIndex = -1;
+			var undoLevels = -1;
+			var anySelection = false;
+			var selectedText = inst.getSelectedText();
+
+			if (tinyMCE.settings["auto_resize"]) {
+				var doc = inst.getDoc();
+
+				inst.iframeElement.style.width = doc.body.offsetWidth + "px";
+				inst.iframeElement.style.height = doc.body.offsetHeight + "px";
+			}
+
+			if (tinyMCE.selectedElement)
+				anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == "img") || (selectedText && selectedText.length > 0);
+
+			if (tinyMCE.settings['custom_undo_redo']) {
+				undoIndex = inst.undoIndex;
+				undoLevels = inst.undoLevels.length;
+			}
+
+			tinyMCE.executeCallback('handleNodeChangeCallback', '_handleNodeChange', 0, editorId, elm, undoIndex, undoLevels, inst.visualAid, anySelection);
+		}
+	}
+
+	if (this.selectedInstance && (typeof(focus) == "undefined" || focus))
+		this.selectedInstance.contentWindow.focus();
+};
+
+TinyMCE.prototype._customCleanup = function(type, content) {
+	// Call custom cleanup
+	var customCleanup = tinyMCE.settings['cleanup_callback'];
+	if (customCleanup != "" && eval("typeof(" + customCleanup + ")") != "undefined")
+		content = eval(customCleanup + "(type, content);");
+
+	// Trigger plugin cleanups
+	var plugins = tinyMCE.getParam('plugins', '', true, ',');
+	for (var i=0; i<plugins.length; i++) {
+		if (eval("typeof(TinyMCE_" + plugins[i] +  "_cleanup)") != "undefined")
+			content = eval("TinyMCE_" + plugins[i] +  "_cleanup(type, content);");
+	}
+
+	return content;
+};
+
+TinyMCE.prototype.getContent = function(editor_id) {
+	if (typeof(editor_id) != "undefined")
+		tinyMCE.selectedInstance = tinyMCE.getInstanceById(editor_id);
+
+	if (tinyMCE.selectedInstance)
+		return tinyMCE._cleanupHTML(this.selectedInstance.getDoc(), tinyMCE.settings, this.selectedInstance.getBody(), false, true);
+
+	return null;
+};
+
+TinyMCE.prototype.setContent = function(html_content) {
+	if (tinyMCE.selectedInstance)
+		tinyMCE.selectedInstance.execCommand('mceSetContent', false, html_content);
+};
+
+TinyMCE.prototype.importThemeLanguagePack = function(name) {
+	if (typeof(name) == "undefined")
+		name = tinyMCE.settings['theme'];
+
+	tinyMCE.loadScript(tinyMCE.baseURL + '/themes/' + name + '/langs/' + tinyMCE.settings['language'] + '.js');
+};
+
+TinyMCE.prototype.importPluginLanguagePack = function(name, valid_languages) {
+	var lang = "en";
+
+	valid_languages = valid_languages.split(',');
+	for (var i=0; i<valid_languages.length; i++) {
+		if (tinyMCE.settings['language'] == valid_languages[i])
+			lang = tinyMCE.settings['language'];
+	}
+
+	tinyMCE.loadScript(tinyMCE.baseURL + '/plugins/' + name + '/langs/' + lang +  '.js');
+};
+
+/**
+ * Adds themeurl, settings and lang to HTML code.
+ */
+TinyMCE.prototype.applyTemplate = function(html, args) {
+	html = tinyMCE.replaceVar(html, "themeurl", tinyMCE.themeURL);
+
+	if (typeof(args) != "undefined")
+		html = tinyMCE.replaceVars(html, args);
+
+	html = tinyMCE.replaceVars(html, tinyMCE.settings);
+	html = tinyMCE.replaceVars(html, tinyMCELang);
+
+	return html;
+};
+
+TinyMCE.prototype.openWindow = function(template, args) {
+	var html, width, height, x, y, resizable, scrollbars, url;
+
+	args['mce_template_file'] = template['file'];
+	tinyMCE.windowArgs = args;
+
+	html = template['html'];
+	if (!(width = template['width']))
+		width = 320;
+
+	if (!(height = template['height']))
+		height = 200;
+
+	// Add to height in M$ due to SP2 WHY DON'T YOU GUYS IMPLEMENT innerWidth of windows!!
+	if (tinyMCE.isMSIE)
+		height += 30;
+
+	x = parseInt(screen.width / 2.0) - (width / 2.0);
+	y = parseInt(screen.height / 2.0) - (height / 2.0);
+
+	resizable = (args && args['resizable']) ? args['resizable'] : "no";
+	scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
+	url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template['file'];
+
+	// Replace all args as variables in URL
+	for (var name in args)
+		url = tinyMCE.replaceVar(url, name, escape(args[name]));
+
+	if (html) {
+		html = tinyMCE.replaceVar(html, "css", this.settings['popups_css']);
+		html = tinyMCE.applyTemplate(html, args);
+
+		var win = window.open("", "mcePopup", "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=yes,minimizable=" + resizable + ",modal=yes,width=" + width + ",height=" + height + ",resizable=" + resizable);
+		win.document.write(html);
+		win.document.close();
+		win.resizeTo(width, height);
+		win.focus();
+	} else {
+		if (tinyMCE.isMSIE && resizable != 'yes') {
+            var features = "resizable:" + resizable 
+                + ";scroll:"
+                + scrollbars + ";status:yes;center:yes;help:no;dialogWidth:"
+                + width + "px;dialogHeight:" + height + "px;";
+
+			window.showModalDialog(url, window, features);
+		} else {
+			var modal = (resizable == "yes") ? "no" : "yes";
+
+			var win = window.open(url, "mcePopup", "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=" + modal + ",minimizable=" + resizable + ",modal=" + modal + ",width=" + width + ",height=" + height + ",resizable=" + resizable);
+			eval('try { win.resizeTo(width, height); } catch(e) { }');
+			win.focus();
+		}
+	}
+};
+
+TinyMCE.prototype.getVisualAidClass = function(class_name, state) {
+	var aidClass = tinyMCE.settings['visual_table_class'];
+
+	if (typeof(state) == "undefined")
+		state = tinyMCE.settings['visual'];
+
+	// Split
+	var classNames = new Array();
+	var ar = class_name.split(' ');
+	for (var i=0; i<ar.length; i++) {
+		if (ar[i] == aidClass)
+			ar[i] = "";
+
+		if (ar[i] != "")
+			classNames[classNames.length] = ar[i];
+	}
+
+	if (state)
+		classNames[classNames.length] = aidClass;
+
+	// Glue
+	var className = "";
+	for (var i=0; i<classNames.length; i++) {
+		if (i > 0)
+			className += " ";
+
+		className += classNames[i];
+	}
+
+	return className;
+};
+
+TinyMCE.prototype.handleVisualAid = function(element, deep, state) {
+	if (!element)
+		return;
+
+	var tableElement = null;
+
+	switch (element.nodeName.toLowerCase()) {
+		case "table":
+			var oldW = element.style.width;
+			var oldH = element.style.height;
+
+			element.className = tinyMCE.getVisualAidClass(element.className, state && element.getAttribute("border") == 0);
+
+			element.style.width = oldW;
+			element.style.height = oldH;
+
+			for (var y=0; y<element.rows.length; y++) {
+				for (var x=0; x<element.rows[y].cells.length; x++) {
+					var className = tinyMCE.getVisualAidClass(element.rows[y].cells[x].className, state && element.getAttribute("border") == 0);
+					element.rows[y].cells[x].className = className;
+				}
+			}
+
+			break;
+
+/*		case "a":
+			var name = element.getAttribute("name");
+			if (name && name != "" && state) {
+				//element.innerHTML += '<img mceVisualAid="true" src="' + (tinyMCE.themeURL + "/images/anchor.gif") + '" />';
+				return;
+			}
+
+			break;*/
+	}
+
+	if (deep && element.hasChildNodes()) {
+		for (var i=0; i<element.childNodes.length; i++)
+			tinyMCE.handleVisualAid(element.childNodes[i], deep, state);
+	}
+};
+
+TinyMCE.prototype.getAttrib = function(elm, name, default_value) {
+	var v = elm.getAttribute(name);
+
+	// Try className for class attrib
+	if (name == "class" && !v)
+		v = elm.className;
+
+	if (typeof(default_value) == "undefined")
+		default_value = "";
+
+	return (v && v != "") ? v : default_value;
+};
+
+TinyMCE.prototype.setAttrib = function(element, name, value, fix_value) {
+	if (typeof(value) == "number")
+		value = "" + value;
+
+	if (fix_value) {
+		if (value == null)
+			value = "";
+
+		var re = new RegExp('[^0-9%]', 'g');
+		value = value.replace(re, '');
+	}
+
+	if (name == "class")
+		element.className = value;
+
+	if (value != null && value != "" && value != -1)
+		element.setAttribute(name, value);
+	else
+		element.removeAttribute(name);
+};
+
+TinyMCE.prototype._setHTML = function(doc, html_content) {
+	// Weird MSIE bug, <p><hr /></p> breaks runtime?
+	if (tinyMCE.isMSIE) {
+		var re = new RegExp('<p><hr /></p>', 'g');
+		html_content = html_content.replace(re, "<hr>");
+	}
+
+	doc.body.innerHTML = html_content;
+
+	// Content duplication bug fix
+	if (tinyMCE.isMSIE && tinyMCE.settings['fix_content_duplication']) {
+		// Remove P elements in P elements
+		var paras = doc.getElementsByTagName("P");
+		for (var i=0; i<paras.length; i++) {
+			var node = paras[i];
+			while ((node = node.parentNode) != null) {
+				if (node.nodeName.toLowerCase() == "p")
+					node.outerHTML = node.innerHTML;
+			}
+		}
+
+		// Content duplication bug fix (Seems to be word crap)
+		var html = doc.body.innerHTML;
+
+		if (html.indexOf('="mso') != -1) {
+			for (var i=0; i<doc.body.all.length; i++) {
+				var el = doc.body.all[i];
+				el.removeAttribute("className","",0);
+				el.removeAttribute("style","",0);
+			}
+
+			html = doc.body.innerHTML;
+			html = tinyMCE.regexpReplace(html, "<o:p><\/o:p>", "<br />");
+			html = tinyMCE.regexpReplace(html, "<o:p>&nbsp;<\/o:p>", "");
+			html = tinyMCE.regexpReplace(html, "<st1:.*?>", "");
+			html = tinyMCE.regexpReplace(html, "<p><\/p>", "");
+			html = tinyMCE.regexpReplace(html, "<p><\/p>\r\n<p><\/p>", "");
+			html = tinyMCE.regexpReplace(html, "<p>&nbsp;<\/p>", "<br />");
+			html = tinyMCE.regexpReplace(html, "<p>\s*(<p>\s*)?", "<p>");
+			html = tinyMCE.regexpReplace(html, "<\/p>\s*(<\/p>\s*)?", "</p>");
+		}
+
+		// Always set the htmlText output
+		doc.body.innerHTML = html;
+	}
+};
+
+TinyMCE.prototype.getImageSrc = function(str) {
+	var pos = -1;
+
+	if (!str)
+		return "";
+
+	if ((pos = str.indexOf('this.src=')) != -1) {
+		var src = str.substring(pos + 10);
+
+		src = src.substring(0, src.indexOf('\''));
+
+		return src;
+	}
+
+	return "";
+};
+
+TinyMCE.prototype._getElementById = function(element_id) {
+	var elm = document.getElementById(element_id);
+	if (!elm) {
+		// Check for element in forms
+		for (var j=0; j<document.forms.length; j++) {
+			for (var k=0; k<document.forms[j].elements.length; k++) {
+				if (document.forms[j].elements[k].name == element_id) {
+					elm = document.forms[j].elements[k];
+					break;
+				}
+			}
+		}
+	}
+
+	return elm;
+};
+
+TinyMCE.prototype.getEditorId = function(form_element) {
+	var inst = this.getInstanceById(form_element);
+	if (!inst)
+		return null;
+
+	return inst.editorId;
+};
+
+TinyMCE.prototype.getInstanceById = function(editor_id) {
+	var inst = this.instances[editor_id];
+	if (!inst) {
+		for (var instanceName in tinyMCE.instances) {
+			var instance = tinyMCE.instances[instanceName];
+			if (instance.formTargetElementId == editor_id) {
+				inst = instance;
+				break;
+			}
+		}
+	}
+
+	return inst;
+};
+
+TinyMCE.prototype.queryInstanceCommandValue = function(editor_id, command) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	if (inst)
+		return inst.queryCommandValue(command);
+
+	return false;
+};
+
+TinyMCE.prototype.queryInstanceCommandState = function(editor_id, command) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	if (inst)
+		return inst.queryCommandState(command);
+
+	return null;
+};
+
+TinyMCE.prototype.setWindowArg = function(name, value) {
+	this.windowArgs[name] = value;
+};
+
+TinyMCE.prototype.getWindowArg = function(name, default_value) {
+	return (typeof(this.windowArgs[name]) == "undefined") ? default_value : this.windowArgs[name];
+};
+
+TinyMCE.prototype.getCSSClasses = function(editor_id, doc) {
+	var output = new Array();
+
+	// Is cached, use that
+	if (typeof(tinyMCE.cssClasses) != "undefined")
+		return tinyMCE.cssClasses;
+
+	if (typeof(editor_id) == "undefined" && typeof(doc) == "undefined") {
+		var instance;
+
+		for (var instanceName in tinyMCE.instances) {
+			instance = tinyMCE.instances[instanceName];
+			break;
+		}
+
+		doc = instance.getDoc();
+	}
+
+	if (typeof(doc) == "undefined") {
+		var instance = tinyMCE.getInstanceById(editor_id);
+		doc = instance.getDoc();
+	}
+
+	if (doc) {
+		var styles = tinyMCE.isMSIE ? doc.styleSheets : doc.styleSheets;
+
+		if (styles && styles.length > 0) {
+			var csses = null;
+
+			// Just ignore any errors
+			eval("try {var csses = tinyMCE.isMSIE ? doc.styleSheets(0).rules : doc.styleSheets[0].cssRules;} catch(e) {}");
+			if (!csses)
+				return new Array();
+
+			for (var i=0; i<csses.length; i++) {
+				var selectorText = csses[i].selectorText;
+
+				// Can be multiple rules per selector
+				if (selectorText) {
+					var rules = selectorText.split(',');
+					for (var c=0; c<rules.length; c++) {
+						// Invalid rule
+						if (rules[c].indexOf(' ') != -1 || rules[c].indexOf(':') != -1 || rules[c].indexOf('mce_') == 1)
+							continue;
+
+						if (rules[c] == "." + tinyMCE.settings['visual_table_class'])
+							continue;
+
+						// Is class rule
+						if (rules[c].indexOf('.') != -1) {
+							//alert(rules[c].substring(rules[c].indexOf('.')));
+							output[output.length] = rules[c].substring(rules[c].indexOf('.')+1);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Cache em
+	if (output.length > 0)
+		tinyMCE.cssClasses = output;
+
+	return output;
+};
+
+TinyMCE.prototype.regexpReplace = function(in_str, reg_exp, replace_str, opts) {
+	if (typeof(opts) == "undefined")
+		opts = 'g';
+
+	var re = new RegExp(reg_exp, opts);
+	return in_str.replace(re, replace_str);
+};
+
+TinyMCE.prototype.cleanupEventStr = function(str) {
+	str = "" + str;
+	str = str.replace('function anonymous()\n{\n', '');
+	str = str.replace('\n}', '');
+
+	return str;
+};
+
+TinyMCE.prototype.getAbsPosition = function(node) {
+	var pos = new Object();
+
+	pos.absLeft = pos.absTop = 0;
+
+	var parentNode = node;
+	while (parentNode) {
+		pos.absLeft += parentNode.offsetLeft;
+		pos.absTop += parentNode.offsetTop;
+
+		parentNode = parentNode.offsetParent;
+	}
+
+	return pos;
+};
+
+TinyMCE.prototype.openFileBrowser = function(field_name, url, type, win) {
+	var cb = tinyMCE.getParam("file_browser_callback");
+
+	this.setWindowArg("window", win);
+
+	// Call to external callback
+	if(eval('typeof('+cb+')') == "undefined")
+		alert("Callback function: " + cb + " could not be found.");
+	else
+		eval(cb + "(field_name, url, type, win);");
+};
+
+TinyMCE.prototype.getControlHTML = function(control_name) {
+	var themePlugins = tinyMCE.getParam('plugins', '', true, ',');
+	var templateFunction;
+
+	// Is it defined in any plugins
+	for (var i=themePlugins.length; i>=0; i--) {
+		templateFunction = 'TinyMCE_' + themePlugins[i] + "_getControlHTML";
+		if (eval("typeof(" + templateFunction + ")") != 'undefined') {
+			var html = eval(templateFunction + "('" + control_name + "');");
+			if (html != "")
+				return tinyMCE.replaceVar(html, "pluginurl", tinyMCE.baseURL + "/plugins/" + themePlugins[i]);
+		}
+	}
+
+	return eval('TinyMCE_' + tinyMCE.settings['theme'] + "_getControlHTML" + "('" + control_name + "');");
+};
+
+TinyMCE.prototype._themeExecCommand = function(editor_id, element, command, user_interface, value) {
+	var themePlugins = tinyMCE.getParam('plugins', '', true, ',');
+	var templateFunction;
+
+	// Is it defined in any plugins
+	for (var i=themePlugins.length; i>=0; i--) {
+		templateFunction = 'TinyMCE_' + themePlugins[i] + "_execCommand";
+		if (eval("typeof(" + templateFunction + ")") != 'undefined') {
+			if (eval(templateFunction + "(editor_id, element, command, user_interface, value);"))
+				return true;
+		}
+	}
+
+	// Theme funtion
+	templateFunction = 'TinyMCE_' + tinyMCE.settings['theme'] + "_execCommand";
+	if (eval("typeof(" + templateFunction + ")") != 'undefined')
+		return eval(templateFunction + "(editor_id, element, command, user_interface, value);");
+
+	// Pass to normal
+	return false;
+};
+
+TinyMCE.prototype._getThemeFunction = function(suffix, skip_plugins) {
+	if (skip_plugins)
+		return 'TinyMCE_' + tinyMCE.settings['theme'] + suffix;
+
+	var themePlugins = tinyMCE.getParam('plugins', '', true, ',');
+	var templateFunction;
+
+	// Is it defined in any plugins
+	for (var i=themePlugins.length; i>=0; i--) {
+		templateFunction = 'TinyMCE_' + themePlugins[i] + suffix;
+		if (eval("typeof(" + templateFunction + ")") != 'undefined')
+			return templateFunction;
+	}
+
+	return 'TinyMCE_' + tinyMCE.settings['theme'] + suffix;
+};
+
+
+TinyMCE.prototype.isFunc = function(func_name) {
+	if (func_name == null || func_name == "")
+		return false;
+
+	return eval("typeof(" + func_name + ")") != "undefined";
+};
+
+TinyMCE.prototype.exec = function(func_name, args) {
+	var str = func_name + '(';
+
+	// Add all arguments
+	for (var i=3; i<args.length; i++) {
+		str += 'args[' + i + ']';
+
+		if (i < args.length-1)
+			str += ',';
+	}
+
+	str += ');';
+
+	return eval(str);
+};
+
+TinyMCE.prototype.executeCallback = function(param, suffix, mode) {
+	switch (mode) {
+		// No chain
+		case 0:
+			var state = false;
+
+			// Execute each plugin callback
+			var plugins = tinyMCE.getParam('plugins', '', true, ',');
+			for (var i=0; i<plugins.length; i++) {
+				var func = "TinyMCE_" + plugins[i] + suffix;
+				if (tinyMCE.isFunc(func)) {
+					tinyMCE.exec(func, this.executeCallback.arguments);
+					state = true;
+				}
+			}
+
+			// Execute theme callback
+			var func = 'TinyMCE_' + tinyMCE.settings['theme'] + suffix;
+			if (tinyMCE.isFunc(func)) {
+				tinyMCE.exec(func, this.executeCallback.arguments);
+				state = true;
+			}
+
+			// Execute settings callback
+			var func = tinyMCE.getParam(param, '');
+			if (tinyMCE.isFunc(func)) {
+				tinyMCE.exec(func, this.executeCallback.arguments);
+				state = true;
+			}
+
+			return state;
+
+		// Chain mode
+		case 1:
+			// Execute each plugin callback
+			var plugins = tinyMCE.getParam('plugins', '', true, ',');
+			for (var i=0; i<plugins.length; i++) {
+				var func = "TinyMCE_" + plugins[i] + suffix;
+				if (tinyMCE.isFunc(func)) {
+					if (tinyMCE.exec(func, this.executeCallback.arguments))
+						return true;
+				}
+			}
+
+			// Execute theme callback
+			var func = 'TinyMCE_' + tinyMCE.settings['theme'] + suffix;
+			if (tinyMCE.isFunc(func)) {
+				if (tinyMCE.exec(func, this.executeCallback.arguments))
+					return true;
+			}
+
+			// Execute settings callback
+			var func = tinyMCE.getParam(param, '');
+			if (tinyMCE.isFunc(func)) {
+				if (tinyMCE.exec(func, this.executeCallback.arguments))
+					return true;
+			}
+
+			return false;
+	}
+};
+
+// TinyMCEControl
+function TinyMCEControl(settings) {
+	// Undo levels
+	this.undoLevels = new Array();
+	this.undoIndex = 0;
+	this.isDirty = false;
+
+	// Default settings
+	this.settings = settings;
+	this.settings['theme'] = tinyMCE.getParam("theme", "default");
+	this.settings['width'] = tinyMCE.getParam("width", -1);
+	this.settings['height'] = tinyMCE.getParam("height", -1);
+};
+
+TinyMCEControl.prototype.repaint = function() {
+	if (tinyMCE.isMSIE)
+		return;
+
+	this.getBody().style.display = 'none';
+	this.getBody().style.display = 'block';
+};
+
+TinyMCEControl.prototype.switchSettings = function() {
+	if (tinyMCE.configs.length > 1 && tinyMCE.currentConfig != this.settings['index']) {
+		tinyMCE.settings = this.settings;
+		tinyMCE.currentConfig = this.settings['index'];
+	}
+};
+
+TinyMCEControl.prototype.fixBrokenURLs = function() {
+	var body = this.getBody();
+
+	var elms = body.getElementsByTagName("img");
+	for (var i=0; i<elms.length; i++) {
+		var src = elms[i].getAttribute('mce_real_src');
+		if (src && src != "")
+			elms[i].setAttribute("src", src);
+	}
+
+	var elms = body.getElementsByTagName("a");
+	for (var i=0; i<elms.length; i++) {
+		var href = elms[i].getAttribute('mce_real_href');
+		if (href && href != "")
+			elms[i].setAttribute("href", href);
+	}
+};
+
+TinyMCEControl.prototype.convertAllRelativeURLs = function() {
+	var body = this.getBody();
+
+	// Convert all image URL:s to absolute URL
+	var elms = body.getElementsByTagName("img");
+	for (var i=0; i<elms.length; i++) {
+		var src = elms[i].getAttribute('src');
+		if (src && src != "") {
+			src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], src);
+			elms[i].setAttribute("src", src);
+			elms[i].setAttribute("mce_real_src", src);
+		}
+	}
+
+	// Convert all link URL:s to absolute URL
+	var elms = body.getElementsByTagName("a");
+	for (var i=0; i<elms.length; i++) {
+		var href = elms[i].getAttribute('href');
+		if (href && href != "") {
+			href = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], href);
+			elms[i].setAttribute("href", href);
+			elms[i].setAttribute("mce_real_href", href);
+		}
+	}
+};
+
+TinyMCEControl.prototype.getSelectedHTML = function() {
+	var elm = document.createElement("body");
+
+	if (tinyMCE.isGecko)
+		elm.appendChild(this.getRng().cloneContents());
+	else
+		elm.innerHTML = this.getRng().htmlText;
+
+	return tinyMCE._cleanupHTML(this.contentDocument, this.settings, elm, this.visualAid);
+};
+
+TinyMCEControl.prototype.getSelectedText = function() {
+	if (tinyMCE.isMSIE) {
+		var doc = this.getDoc();
+
+		if (doc.selection.type == "Text") {
+			var rng = doc.selection.createRange();
+			selectedText = rng.text;
+		} else
+			selectedText = '';
+	} else {
+		var sel = this.getSel();
+
+		if (sel && sel.toString)
+			selectedText = sel.toString();
+		else
+			selectedText = '';
+	}
+
+	return selectedText;
+};
+
+TinyMCEControl.prototype.selectNode = function(node, collapse, select_text_node, to_start) {
+	if (!node)
+		return;
+
+	if (typeof(collapse) == "undefined")
+		collapse = true;
+
+	if (typeof(select_text_node) == "undefined")
+		select_text_node = false;
+
+	if (typeof(to_start) == "undefined")
+		to_start = true;
+
+	if (tinyMCE.isMSIE) {
+		var rng = this.getBody().createTextRange();
+
+		try {
+			rng.moveToElementText(node);
+
+			if (collapse)
+				rng.collapse(to_start);
+
+			rng.select();
+		} catch (e) {
+			// Throws illigal agrument in MSIE some times
+		}
+	} else {
+		var sel = this.getSel();
+
+		if (!sel)
+			return;
+
+		if (tinyMCE.isSafari) {
+			sel.realSelection.setBaseAndExtent(node, 0, node, node.innerText.length);
+
+			if (collapse) {
+				if (to_start)
+					sel.realSelection.collapseToStart();
+				else
+					sel.realSelection.collapseToEnd();
+			}
+
+			this.scrollToNode(node);
+
+			return;
+		}
+
+		var rng = this.getDoc().createRange();
+
+		if (select_text_node) {
+			// Find first textnode in tree
+			var nodes = tinyMCE.getNodeTree(node, new Array(), 3);
+			if (nodes.length > 0)
+				rng.selectNodeContents(nodes[0]);
+			else
+				rng.selectNodeContents(node);
+		} else
+			rng.selectNode(node);
+
+		if (collapse) {
+			// Special treatment of textnode collapse
+			if (!to_start && node.nodeType == 3) {
+				rng.setStart(node, node.nodeValue.length);
+				rng.setEnd(node, node.nodeValue.length);
+			} else
+				rng.collapse(to_start);
+		}
+
+		sel.removeAllRanges();
+		sel.addRange(rng);
+	}
+
+	this.scrollToNode(node);
+
+	// Set selected element
+	tinyMCE.selectedElement = null;
+	if (node.nodeType == 1)
+		tinyMCE.selectedElement = node;
+};
+
+TinyMCEControl.prototype.scrollToNode = function(node) {
+	// Scroll to node position
+	var pos = tinyMCE.getAbsPosition(node);
+	var doc = this.getDoc();
+	var scrollX = doc.body.scrollLeft + doc.documentElement.scrollLeft;
+	var scrollY = doc.body.scrollTop + doc.documentElement.scrollTop;
+	var height = tinyMCE.isMSIE ? document.getElementById(this.editorId).style.pixelHeight : this.targetElement.clientHeight;
+
+	// Only scroll if out of visible area
+	if (!tinyMCE.settings['auto_resize'] && !(node.absTop > scrollY && node.absTop < (scrollY - 25 + height)))
+		this.contentWindow.scrollTo(pos.absLeft, pos.absTop - height + 25);
+};
+
+TinyMCEControl.prototype.getBody = function() {
+	return this.getDoc().body;
+};
+
+TinyMCEControl.prototype.getDoc = function() {
+	return this.contentWindow.document;
+};
+
+TinyMCEControl.prototype.getWin = function() {
+	return this.contentWindow;
+};
+
+TinyMCEControl.prototype.getSel = function() {
+	if (tinyMCE.isMSIE)
+		return this.getDoc().selection;
+
+	var sel = this.contentWindow.getSelection();
+
+	// Fake getRangeAt
+	if (tinyMCE.isSafari && !sel.getRangeAt) {
+		var newSel = new Object();
+		var doc = this.getDoc();
+
+		function getRangeAt(idx) {
+			var rng = new Object();
+
+			rng.startContainer = this.focusNode;
+			rng.endContainer = this.anchorNode;
+			rng.commonAncestorContainer = this.focusNode;
+			rng.createContextualFragment = function (html) {
+				// Seems to be a tag
+				if (html.charAt(0) == '<') {
+					var elm = doc.createElement("div");
+
+					elm.innerHTML = html;
+
+					return elm.firstChild;
+				}
+
+				return doc.createTextNode("UNSUPPORTED, DUE TO LIMITATIONS IN SAFARI!");
+			};
+
+			rng.deleteContents = function () {
+				doc.execCommand("Delete", false, "");
+			};
+
+			return rng;
+		}
+
+		// Patch selection
+
+		newSel.focusNode = sel.baseNode;
+		newSel.focusOffset = sel.baseOffset;
+		newSel.anchorNode = sel.extentNode;
+		newSel.anchorOffset = sel.extentOffset;
+		newSel.getRangeAt = getRangeAt;
+		newSel.text = "" + sel;
+		newSel.realSelection = sel;
+
+		newSel.toString = function () {return this.text;};
+
+		return newSel;
+	}
+
+	return sel;
+};
+
+TinyMCEControl.prototype.getRng = function() {
+	var sel = this.getSel();
+	if (sel == null)
+		return null;
+
+	if (tinyMCE.isMSIE)
+		return sel.createRange();
+
+	return this.getSel().getRangeAt(0);
+};
+
+TinyMCEControl.prototype._insertPara = function(e) {
+	function isEmpty(para) {
+		function isEmptyHTML(html) {
+			return html.replace(new RegExp('[ \t\r\n]+', 'g'), '').toLowerCase() == "";
+		}
+
+		// Check for images
+		if (para.getElementsByTagName("img").length > 0)
+			return false;
+
+		// Check for tables
+		if (para.getElementsByTagName("table").length > 0)
+			return false;
+
+		// Check for HRs
+		if (para.getElementsByTagName("hr").length > 0)
+			return false;
+
+		// Check all textnodes
+		var nodes = tinyMCE.getNodeTree(para, new Array(), 3);
+		for (var i=0; i<nodes.length; i++) {
+			if (!isEmptyHTML(nodes[i].nodeValue))
+				return false;
+		}
+
+		// No images, no tables, no hrs, no text content then it's empty
+		return true;
+	}
+
+	var doc = this.getDoc();
+	var sel = this.getSel();
+	var win = this.contentWindow;
+	var rng = sel.getRangeAt(0);
+	var body = doc.body;
+	var rootElm = doc.documentElement;
+	var self = this;
+	var blockName = "P";
+
+//	debug(e.target, sel.anchorNode.nodeName, sel.focusNode.nodeName, rng.startContainer, rng.endContainer, rng.commonAncestorContainer, sel.anchorOffset, sel.focusOffset, rng.toString());
+
+	// Setup before range
+	var rngBefore = doc.createRange();
+	rngBefore.setStart(sel.anchorNode, sel.anchorOffset);
+	rngBefore.collapse(true);
+
+	// Setup after range
+	var rngAfter = doc.createRange();
+	rngAfter.setStart(sel.focusNode, sel.focusOffset);
+	rngAfter.collapse(true);
+
+	// Setup start/end points
+	var direct = rngBefore.compareBoundaryPoints(rngBefore.START_TO_END, rngAfter) < 0;
+	var startNode = direct ? sel.anchorNode : sel.focusNode;
+	var startOffset = direct ? sel.anchorOffset : sel.focusOffset;
+	var endNode = direct ? sel.focusNode : sel.anchorNode;
+	var endOffset = direct ? sel.focusOffset : sel.anchorOffset;
+
+	// Get block elements
+	var startBlock = tinyMCE.getParentBlockElement(startNode);
+	var endBlock = tinyMCE.getParentBlockElement(endNode);
+
+	// Use current block name
+	if (startBlock != null) {
+		blockName = startBlock.nodeName.toUpperCase();
+
+		// Use P instead
+		if (blockName == "TD" || blockName == "TABLE")
+			blockName = "P";
+	}
+
+	// Within a list item (use normal behavior)
+	if ((startBlock != null && startBlock.nodeName.toLowerCase() == "li") || (endBlock != null && endBlock.nodeName.toLowerCase() == "li"))
+		return false;
+
+	// Within a table create new paragraphs
+	if ((startBlock != null && startBlock.nodeName.toLowerCase() == "table") || (endBlock != null && endBlock.nodeName.toLowerCase() == "table"))
+		startBlock = endBlock = null;
+
+	// Setup new paragraphs
+	var paraBefore = (startBlock != null && startBlock.nodeName.toUpperCase() == blockName) ? startBlock.cloneNode(false) : doc.createElement(blockName);
+	var paraAfter = (endBlock != null && endBlock.nodeName.toUpperCase() == blockName) ? endBlock.cloneNode(false) : doc.createElement(blockName);
+
+	// Setup chop nodes
+	var startChop = startNode;
+	var endChop = endNode;
+
+	// Get startChop node
+	node = startChop;
+	do {
+		if (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
+			break;
+
+		startChop = node;
+	} while ((node = node.previousSibling ? node.previousSibling : node.parentNode));
+
+	// Get endChop node
+	node = endChop;
+	do {
+		if (node == body || node.nodeType == 9 || tinyMCE.isBlockElement(node))
+			break;
+
+		endChop = node;
+	} while ((node = node.nextSibling ? node.nextSibling : node.parentNode));
+
+	// If not in a block element
+	if (startBlock == null) {
+		// Delete selection
+		rng.deleteContents();
+		sel.removeAllRanges();
+
+		if (startChop != rootElm && endChop != rootElm) {
+			// Insert paragraph before
+			rngBefore = rng.cloneRange();
+
+			if (startChop == body)
+				rngBefore.setStart(startChop, 0);
+			else
+				rngBefore.setStartBefore(startChop);
+
+			paraBefore.appendChild(rngBefore.cloneContents());
+
+			// Insert paragraph after
+			if (endChop.parentNode.nodeName == blockName)
+				endChop = endChop.parentNode;
+
+			rng.setEndAfter(endChop);
+
+			var contents = rng.cloneContents();
+			if (contents.firstChild && (contents.firstChild.nodeName == blockName || contents.firstChild.nodeName.toLowerCase() == "body")) {
+				var nodes = contents.firstChild.childNodes;
+				for (var i=0; i<nodes.length; i++) {
+					if (nodes[i].nodeName.toLowerCase() != "body")
+						paraAfter.appendChild(nodes[i]);
+				}
+			} else
+				paraAfter.appendChild(contents);
+
+			// Check if it's a empty paragraph
+			if (isEmpty(paraBefore))
+				paraBefore.innerHTML = "&nbsp;";
+
+			// Check if it's a empty paragraph
+			if (isEmpty(paraAfter))
+				paraAfter.innerHTML = "&nbsp;";
+
+			// Delete old contents
+			rng.deleteContents();
+			rngAfter.deleteContents();
+			rngBefore.deleteContents();
+
+			// Insert new paragraphs
+			paraAfter.normalize();
+			rngBefore.insertNode(paraAfter);
+			paraBefore.normalize();
+			rngBefore.insertNode(paraBefore);
+
+			// debug("1: ", paraBefore.innerHTML, paraAfter.innerHTML);
+		} else {
+			body.innerHTML = "<" + blockName + ">&nbsp;</" + blockName + "><" + blockName + ">&nbsp;</" + blockName + ">";
+			paraAfter = body.childNodes[1];
+		}
+
+		this.selectNode(paraAfter, true, true);
+
+		return true;
+	}
+
+	// Place first part within new paragraph
+	if (startChop.nodeName == blockName)
+		rngBefore.setStart(startChop, 0);
+	else
+		rngBefore.setStartBefore(startChop);
+	rngBefore.setEnd(startNode, startOffset);
+	paraBefore.appendChild(rngBefore.cloneContents());
+
+	// Place secound part within new paragraph
+	rngAfter.setEndAfter(endChop);
+	rngAfter.setStart(endNode, endOffset);
+	var contents = rngAfter.cloneContents();
+	if (contents.firstChild && contents.firstChild.nodeName == blockName) {
+		var nodes = contents.firstChild.childNodes;
+		for (var i=0; i<nodes.length; i++) {
+			if (nodes[i].nodeName.toLowerCase() != "body")
+				paraAfter.appendChild(nodes[i]);
+		}
+	} else
+		paraAfter.appendChild(contents);
+
+	// Check if it's a empty paragraph
+	if (isEmpty(paraBefore))
+		paraBefore.innerHTML = "&nbsp;";
+
+	// Check if it's a empty paragraph
+	if (isEmpty(paraAfter))
+		paraAfter.innerHTML = "&nbsp;";
+
+	// Create a range around everything
+	var rng = doc.createRange();
+
+	if (!startChop.previousSibling && startChop.parentNode.nodeName.toUpperCase() == blockName) {
+		rng.setStartBefore(startChop.parentNode);
+	} else {
+		if (rngBefore.startContainer.nodeName.toUpperCase() == blockName && rngBefore.startOffset == 0)
+			rng.setStartBefore(rngBefore.startContainer);
+		else
+			rng.setStart(rngBefore.startContainer, rngBefore.startOffset);
+	}
+
+	if (!endChop.nextSibling && endChop.parentNode.nodeName.toUpperCase() == blockName)
+		rng.setEndAfter(endChop.parentNode);
+	else
+		rng.setEnd(rngAfter.endContainer, rngAfter.endOffset);
+
+	// Delete all contents and insert new paragraphs
+	rng.deleteContents();
+	rng.insertNode(paraAfter);
+	rng.insertNode(paraBefore);
+	// debug("2", paraBefore.innerHTML, paraAfter.innerHTML);
+
+	// Normalize
+	paraAfter.normalize();
+	paraBefore.normalize();
+
+	this.selectNode(paraAfter, true, true);
+
+	return true;
+};
+
+TinyMCEControl.prototype._handleBackSpace = function(evt_type) {
+	var doc = this.getDoc();
+	var sel = this.getSel();
+	if (sel == null)
+		return false;
+
+	var rng = sel.getRangeAt(0);
+	var node = rng.startContainer;
+	var elm = node.nodeType == 3 ? node.parentNode : node;
+
+	if (node == null)
+		return;
+
+	// Empty node, wrap contents in paragraph
+	if (elm && elm.nodeName == "") {
+		var para = doc.createElement("p");
+
+		while (elm.firstChild)
+			para.appendChild(elm.firstChild);
+
+		elm.parentNode.insertBefore(para, elm);
+		elm.parentNode.removeChild(elm);
+
+		var rng = rng.cloneRange();
+		rng.setStartBefore(node.nextSibling);
+		rng.setEndAfter(node.nextSibling);
+		rng.extractContents();
+
+		this.selectNode(node.nextSibling, true, true);
+	}
+
+	// Remove empty paragraphs
+	var para = tinyMCE.getParentBlockElement(node);
+	if (para != null && para.nodeName.toLowerCase() == 'p' && evt_type == "keypress") {
+		var htm = para.innerHTML;
+		var block = tinyMCE.getParentBlockElement(node);
+
+		// Empty node, we do the killing!!
+		if (htm == "" || htm == "&nbsp;" || block.nodeName.toLowerCase() == "li") {
+			var prevElm = para.previousSibling;
+
+			while (prevElm != null && prevElm.nodeType != 1)
+				prevElm = prevElm.previousSibling;
+
+			if (prevElm == null)
+				return false;
+
+			// Get previous elements last text node
+			var nodes = tinyMCE.getNodeTree(prevElm, new Array(), 3);
+			var lastTextNode = nodes.length == 0 ? null : nodes[nodes.length-1];
+
+			// Select the last text node and move curstor to end
+			if (lastTextNode != null)
+				this.selectNode(lastTextNode, true, false, false);
+
+			// Remove the empty paragrapsh
+			para.parentNode.removeChild(para);
+
+			//debug("within p element" + para.innerHTML);
+			//showHTML(this.getBody().innerHTML);
+			return true;
+		}
+	}
+
+	// Remove BR elements
+/*	while (node != null && (node = node.nextSibling) != null) {
+		if (node.nodeName.toLowerCase() == 'br')
+			node.parentNode.removeChild(node);
+		else if (node.nodeType == 1) // Break at other element
+			break;
+	}*/
+
+	//showHTML(this.getBody().innerHTML);
+
+	return false;
+};
+
+TinyMCEControl.prototype._insertSpace = function() {
+	return true;
+};
+
+TinyMCEControl.prototype.autoResetDesignMode = function() {
+	// Add fix for tab/style.display none/block problems in Gecko
+	if (!tinyMCE.isMSIE && tinyMCE.settings['auto_reset_designmode']) {
+		var sel = this.getSel();
+
+		// Weird, wheres that cursor selection?
+		if (!sel || !sel.rangeCount || sel.rangeCount == 0)
+			eval('try { this.getDoc().designMode = "On"; } catch(e) {}');
+	}
+};
+
+TinyMCEControl.prototype.isDirty = function() {
+	return this.isDirty;
+};
+
+TinyMCEControl.prototype.execCommand = function(command, user_interface, value) {
+	var doc = this.getDoc();
+	var win = this.getWin();
+
+	// Mozilla issue
+	if (!tinyMCE.isMSIE && !this.useCSS) {
+		doc.execCommand("useCSS", false, true);
+		this.useCSS = true;
+	}
+
+	//debug("command: " + command + ", user_interface: " + user_interface + ", value: " + value);
+	this.contentDocument = doc; // <-- Strange, unless this is applied Mozilla 1.3 breaks
+
+	// Call theme execcommand
+	if (tinyMCE._themeExecCommand(this.editorId, this.getBody(), command, user_interface, value))
+		return;
+
+	// Add undo level of operation
+	if (command != "mceAddUndoLevel" && command != "Undo" && command != "Redo" && command != "mceImage" && command != "mceLink" && command != "mceToggleVisualAid" && (command != "mceInsertTable" && !user_interface))
+		this.execCommand("mceAddUndoLevel");
+
+	// Fix align on images
+	if (this.getFocusElement() && this.getFocusElement().nodeName.toLowerCase() == "img") {
+		var align = this.getFocusElement().getAttribute('align');
+
+		switch (command) {
+			case "JustifyLeft":
+				if (align == 'left')
+					this.getFocusElement().removeAttribute('align');
+				else
+					this.getFocusElement().setAttribute('align', 'left');
+
+				tinyMCE.triggerNodeChange();
+				return;
+
+			case "JustifyCenter":
+				if (align == 'middle')
+					this.getFocusElement().removeAttribute('align');
+				else
+					this.getFocusElement().setAttribute('align', 'middle');
+
+				tinyMCE.triggerNodeChange();
+				return;
+
+			case "JustifyRight":
+				if (align == 'right')
+					this.getFocusElement().removeAttribute('align');
+				else
+					this.getFocusElement().setAttribute('align', 'right');
+
+				tinyMCE.triggerNodeChange();
+				return;
+		}
+	}
+
+	if (tinyMCE.settings['force_br_newlines']) {
+		var alignValue = "";
+
+		if (doc.selection.type != "Control") {
+			switch (command) {
+					case "JustifyLeft":
+						alignValue = "left";
+						break;
+
+					case "JustifyCenter":
+						alignValue = "center";
+						break;
+
+					case "JustifyFull":
+						alignValue = "justify";
+						break;
+
+					case "JustifyRight":
+						alignValue = "right";
+						break;
+			}
+
+			if (alignValue != "") {
+				var rng = doc.selection.createRange();
+
+				if ((divElm = tinyMCE.getParentElement(rng.parentElement(), "div")) != null)
+					divElm.setAttribute("align", alignValue);
+				else if (rng.pasteHTML && rng.htmlText.length > 0)
+					rng.pasteHTML('<div align="' + alignValue + '">' + rng.htmlText + "</div>");
+
+				tinyMCE.triggerNodeChange();
+				return;
+			}
+		}
+	}
+
+	switch (command) {
+		case "mceSelectNode":
+			this.selectNode(value);
+			tinyMCE.triggerNodeChange();
+			tinyMCE.selectedNode = value;
+			break;
+
+		case "mceSelectNodeDepth":
+			var parentNode = this.getFocusElement();
+			for (var i=0; parentNode; i++) {
+				if (parentNode.nodeName.toLowerCase() == "body")
+					break;
+
+				if (parentNode.nodeName.toLowerCase() == "#text") {
+					i--;
+					parentNode = parentNode.parentNode;
+					continue;
+				}
+
+				if (i == value) {
+					this.selectNode(parentNode, false);
+					tinyMCE.triggerNodeChange();
+					tinyMCE.selectedNode = parentNode;
+					return;
+				}
+
+				parentNode = parentNode.parentNode;
+			}
+
+			break;
+
+		case "HiliteColor":
+			if (tinyMCE.isGecko) {
+				this.getDoc().execCommand("useCSS", false, false);
+				this.getDoc().execCommand('hilitecolor', false, value);
+				this.getDoc().execCommand("useCSS", false, true);
+			} else
+				this.getDoc().execCommand('BackColor', false, value);
+
+			break;
+
+		case "Cut":
+		case "Copy":
+		case "Paste":
+			var cmdFailed = false;
+
+			// Try executing command
+			eval('try {this.getDoc().execCommand(command, user_interface, value);} catch (e) {cmdFailed = true;}');
+
+			// Alert error in gecko if command failed
+			if (tinyMCE.isGecko && cmdFailed) {
+				// Confirm more info
+				if (confirm(tinyMCE.getLang('lang_clipboard_msg')))
+					window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');
+
+				return;
+			} else
+				tinyMCE.triggerNodeChange();
+		break;
+
+		case "mceSetContent":
+			if (!value)
+				value = "";
+
+			// Call custom cleanup code
+			html_content = tinyMCE._customCleanup("insert_to_editor", value);
+			tinyMCE._setHTML(doc, value);
+			doc.body.innerHTML = tinyMCE._cleanupHTML(doc, tinyMCE.settings, doc.body);
+			tinyMCE.handleVisualAid(doc.body, true, this.visualAid);
+			return true;
+
+		case "mceLink":
+			var selectedText = "";
+
+			if (tinyMCE.isMSIE) {
+				var rng = doc.selection.createRange();
+				selectedText = rng.text;
+			} else
+				selectedText = this.getSel().toString();
+
+			if (!tinyMCE.linkElement) {
+				if ((tinyMCE.selectedElement.nodeName.toLowerCase() != "img") && (selectedText.length <= 0))
+					return;
+			}
+
+			var href = "", target = "", title = "", onclick = "", action = "insert";
+
+			if (tinyMCE.selectedElement.nodeName.toLowerCase() == "a")
+				tinyMCE.linkElement = tinyMCE.selectedElement;
+
+			// Is anchor not a link
+			if (tinyMCE.linkElement != null && tinyMCE.getAttrib(tinyMCE.linkElement, 'href') == "")
+				tinyMCE.linkElement = null;
+
+			if (tinyMCE.linkElement) {
+				href = tinyMCE.getAttrib(tinyMCE.linkElement, 'href');
+				target = tinyMCE.getAttrib(tinyMCE.linkElement, 'target');
+				title = tinyMCE.getAttrib(tinyMCE.linkElement, 'title');
+                onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'mce_onclick');
+
+				// Try old onclick to if copy/pasted content
+				if (onclick == "")
+					onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'onclick');
+
+				onclick = tinyMCE.cleanupEventStr(onclick);
+
+				// Fix for drag-drop/copy paste bug in Mozilla
+				mceRealHref = tinyMCE.getAttrib(tinyMCE.linkElement, 'mce_real_href');
+				if (mceRealHref != "")
+					href = mceRealHref;
+
+				href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement, true);");
+				action = "update";
+			}
+
+			if (this.settings['insertlink_callback']) {
+				var returnVal = eval(this.settings['insertlink_callback'] + "(href, target, title, onclick, action);");
+				if (returnVal && returnVal['href'])
+					tinyMCE.insertLink(returnVal['href'], returnVal['target'], returnVal['title'], returnVal['onclick']);
+			} else {
+				tinyMCE.openWindow(this.insertLinkTemplate, {href : href, target : target, title : title, onclick : onclick, action : action});
+			}
+		break;
+
+		case "mceImage":
+			var src = "", alt = "", border = "", hspace = "", vspace = "", width = "", height = "", align = "";
+			var title = "", onmouseover = "", onmouseout = "", action = "insert";
+			var img = tinyMCE.imgElement;
+
+			if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "img") {
+				img = tinyMCE.selectedElement;
+				tinyMCE.imgElement = img;
+			}
+
+			if (img) {
+				// Is it a internal MCE visual aid image, then skip this one.
+				if (tinyMCE.getAttrib(img, 'name').indexOf('mce_') == 0)
+					return;
+
+				src = tinyMCE.getAttrib(img, 'src');
+				alt = tinyMCE.getAttrib(img, 'alt');
+
+				// Try polling out the title
+				if (alt == "")
+					alt = tinyMCE.getAttrib(img, 'title');
+
+				// Fix width/height attributes if the styles is specified
+				if (tinyMCE.isGecko) {
+					var w = img.style.width;
+					if (w != null && w != "")
+						img.setAttribute("width", w);
+
+					var h = img.style.height;
+					if (h != null && h != "")
+						img.setAttribute("height", h);
+				}
+
+				border = tinyMCE.getAttrib(img, 'border');
+				hspace = tinyMCE.getAttrib(img, 'hspace');
+				vspace = tinyMCE.getAttrib(img, 'vspace');
+				width = tinyMCE.getAttrib(img, 'width');
+				height = tinyMCE.getAttrib(img, 'height');
+				align = tinyMCE.getAttrib(img, 'align');
+                onmouseover = tinyMCE.getAttrib(img, 'onmouseover');
+                onmouseout = tinyMCE.getAttrib(img, 'onmouseout');
+                title = tinyMCE.getAttrib(img, 'title');
+
+				// Is realy specified?
+				if (tinyMCE.isMSIE) {
+					width = img.attributes['width'].specified ? width : "";
+					height = img.attributes['height'].specified ? height : "";
+				}
+
+				onmouseover = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseover));
+				onmouseout = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseout));
+
+				// Fix for drag-drop/copy paste bug in Mozilla
+				mceRealSrc = tinyMCE.getAttrib(img, 'mce_real_src');
+				if (mceRealSrc != "")
+					src = mceRealSrc;
+
+				src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, img, true);");
+
+				if (onmouseover != "")
+					onmouseover = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, img, true);");
+
+				if (onmouseout != "")
+					onmouseout = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, img, true);");
+
+				action = "update";
+			}
+
+			if (this.settings['insertimage_callback']) {
+				var returnVal = eval(this.settings['insertimage_callback'] + "(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");
+				if (returnVal && returnVal['src'])
+					tinyMCE.insertImage(returnVal['src'], returnVal['alt'], returnVal['border'], returnVal['hspace'], returnVal['vspace'], returnVal['width'], returnVal['height'], returnVal['align'], returnVal['title'], returnVal['onmouseover'], returnVal['onmouseout']);
+			} else
+				tinyMCE.openWindow(this.insertImageTemplate, {src : src, alt : alt, border : border, hspace : hspace, vspace : vspace, width : width, height : height, align : align, title : title, onmouseover : onmouseover, onmouseout : onmouseout, action : action});
+		break;
+
+		case "mceCleanupWord":
+			if (tinyMCE.isMSIE) {
+				var html = this.getBody().createTextRange().htmlText;
+
+				if (html.indexOf('="mso') != -1) {
+					tinyMCE._setHTML(this.contentDocument, this.getBody().innerHTML);
+					html = tinyMCE._cleanupHTML(this.contentDocument, this.settings, this.getBody(), this.visualAid);
+				}
+
+				this.getBody().innerHTML = html;
+			}
+		break;
+
+		case "mceCleanup":
+			tinyMCE._setHTML(this.contentDocument, this.getBody().innerHTML);
+			this.getBody().innerHTML = tinyMCE._cleanupHTML(this.contentDocument, this.settings, this.getBody(), this.visualAid);
+			tinyMCE.handleVisualAid(this.getBody(), true, this.visualAid);
+			this.repaint();
+			tinyMCE.triggerNodeChange();
+		break;
+
+		case "mceAnchor":
+			if (!user_interface) {
+				var aElm = tinyMCE.getParentElement(this.getFocusElement(), "a", "name");
+				if (aElm) {
+					if (value == null || value == "") {
+						if (tinyMCE.isMSIE) {
+							aElm.outerHTML = aElm.innerHTML;
+						} else {
+							var rng = aElm.ownerDocument.createRange();
+							rng.setStartBefore(aElm);
+							rng.setEndAfter(aElm);
+							rng.deleteContents();
+							rng.insertNode(rng.createContextualFragment(aElm.innerHTML));
+						}
+					} else
+						aElm.setAttribute('name', value);
+				} else {
+					this.getDoc().execCommand("fontname", false, "#mce_temp_font#");
+					var elementArray = tinyMCE.getElementsByAttributeValue(this.getBody(), "font", "face", "#mce_temp_font#");
+					for (var x=0; x<elementArray.length; x++) {
+						elm = elementArray[x];
+
+						var aElm = this.getDoc().createElement("a");
+						aElm.setAttribute('name', value);
+
+						if (elm.hasChildNodes()) {
+							for (var i=0; i<elm.childNodes.length; i++)
+								aElm.appendChild(elm.childNodes[i].cloneNode(true));
+						}
+
+						elm.parentNode.replaceChild(aElm, elm);
+					}
+				}
+
+				tinyMCE.triggerNodeChange();
+			}
+			break;
+
+		case "mceReplaceContent":
+			var selectedText = "";
+
+			if (tinyMCE.isMSIE) {
+				var rng = doc.selection.createRange();
+				selectedText = rng.text;
+			} else
+				selectedText = this.getSel().toString();
+
+			if (selectedText.length > 0) {
+				value = tinyMCE.replaceVar(value, "selection", selectedText);
+				tinyMCE.execCommand('mceInsertContent',false,value);
+			}
+
+			tinyMCE.triggerNodeChange();
+		break;
+
+		case "mceSetAttribute":
+			if (typeof(value) == 'object') {
+				var targetElms = (typeof(value['targets']) == "undefined") ? "p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address" : value['targets'];
+				var targetNode = tinyMCE.getParentElement(this.getFocusElement(), targetElms);
+
+				if (targetNode) {
+					targetNode.setAttribute(value['name'], value['value']);
+					tinyMCE.triggerNodeChange();
+				}
+			}
+		break;
+
+		case "mceSetCSSClass":
+			var selectedText = false;
+
+			if (tinyMCE.isMSIE) {
+				var rng = doc.selection.createRange();
+				selectedText = (rng.text && rng.text.length > 0);
+			} else
+				selectedText = (this.getSel().toString().length > 0);
+
+			// Use selectedNode instead if defined
+			if (tinyMCE.selectedNode)
+				tinyMCE.selectedElement = tinyMCE.selectedNode;
+
+			if (selectedText && !tinyMCE.selectedNode) {
+				this.getDoc().execCommand("RemoveFormat", false, null);
+				if (value == null)
+					return this.execCommand("RemoveFormat", false, null);
+
+				this.getDoc().execCommand("fontname", false, "#mce_temp_font#");
+				var elementArray = tinyMCE.getElementsByAttributeValue(this.getBody(), "font", "face", "#mce_temp_font#");
+
+				// Change them all
+				for (var x=0; x<elementArray.length; x++) {
+					elm = elementArray[x];
+					if (elm) {
+						var spanElm = this.getDoc().createElement("span");
+						spanElm.className = value;
+						if (elm.hasChildNodes()) {
+							for (var i=0; i<elm.childNodes.length; i++)
+								spanElm.appendChild(elm.childNodes[i].cloneNode(true));
+						}
+
+						elm.parentNode.replaceChild(spanElm, elm);
+					}
+				}
+			} else {
+				var targetElm = this.getFocusElement();
+
+				// Select element
+				if (tinyMCE.selectedElement.nodeName.toLowerCase() == "img" || tinyMCE.selectedElement.nodeName.toLowerCase() == "table")
+					targetElm = tinyMCE.selectedElement;
+
+				var targetNode = tinyMCE.getParentElement(targetElm, "p,img,span,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+
+				// Selected element
+				if (tinyMCE.selectedElement.nodeType == 1)
+					targetNode = tinyMCE.selectedElement;
+
+				// Mozilla img patch
+				if (!tinyMCE.isMSIE && !targetNode)
+					targetNode = tinyMCE.imgElement;
+
+				if (targetNode) {
+					if (targetNode.nodeName.toLowerCase() == "span" && (!value || value == "")) {
+						if (targetNode.hasChildNodes()) {
+							for (var i=0; i<targetNode.childNodes.length; i++)
+								targetNode.parentNode.insertBefore(targetNode.childNodes[i].cloneNode(true), targetNode);
+						}
+
+						targetNode.parentNode.removeChild(targetNode);
+					} else {
+						if (value != null && value != "")
+							targetNode.className = value;
+						else {
+							targetNode.removeAttribute("className");
+							targetNode.removeAttribute("class");
+						}
+					}
+				}
+			}
+
+			tinyMCE.triggerNodeChange();
+		break;
+
+		case "mceInsertRawHTML":
+			var key = 'tiny_mce_marker';
+
+			// Insert marker key
+			this.execCommand('mceInsertContent', false, key);
+
+			// Find marker and replace with RAW HTML
+			var html = this.getBody().innerHTML;
+			if ((pos = html.indexOf(key)) != -1)
+				this.getBody().innerHTML = html.substring(0, pos) + value + html.substring(pos + key.length);
+
+			break;
+
+		case "mceInsertContent":
+			if (!tinyMCE.isMSIE) {
+				var sel = this.getSel();
+				var rng = sel.getRangeAt(0);
+				var isHTML = value.indexOf('<') != -1;
+
+				if (isHTML)
+					value = rng.createContextualFragment(value);
+				else {
+					// Setup text node
+					var el = document.createElement("div");
+					el.innerHTML = value;
+					value = el.firstChild.nodeValue;
+					value = doc.createTextNode(value);
+				}
+
+				// Insert plain text in Safari
+				if (tinyMCE.isSafari && !isHTML) {
+					this.execCommand('InsertText', false, value.nodeValue);
+					tinyMCE.triggerNodeChange();
+					return true;
+				}
+
+				rng.deleteContents();
+
+				// If target node is text do special treatment, (Mozilla 1.3 fix)
+				if (rng.startContainer.nodeType == 3) {
+					var node = rng.startContainer.splitText(rng.startOffset);
+					node.parentNode.insertBefore(value, node); 
+				} else
+					rng.insertNode(value);
+
+				if (!isHTML) {
+					// Removes weird selection trails
+					sel.selectAllChildren(doc.body);
+					sel.removeAllRanges();
+
+					// Move cursor to end of content
+					var rng = doc.createRange();
+
+					rng.selectNode(value);
+					rng.collapse(false);
+
+					sel.addRange(rng);
+				} else
+					rng.collapse(false);
+			} else {
+				var rng = doc.selection.createRange();
+
+				if (rng.item)
+					rng.item(0).outerHTML = value;
+				else
+					rng.pasteHTML(value);
+			}
+
+			tinyMCE.triggerNodeChange();
+		break;
+
+		case "mceAddUndoLevel":
+			if (tinyMCE.settings['custom_undo_redo']) {
+				var customUndoLevels = tinyMCE.settings['custom_undo_redo_levels'];
+
+				var newHTML = this.getBody().innerHTML;
+//debug("x: " + newHTML, this.undoLevels[this.undoLevels.length-1] + "\n");
+				if (newHTML != this.undoLevels[this.undoLevels.length-1]) {
+//					 debug(newHTML, this.undoLevels[this.undoLevels.length-1]);
+					// Trigger onchange and set is dirty
+					tinyMCE.executeCallback('onchange_callback', '_onchange', 0, this);
+					this.isDirty = true;
+
+					// Time to compress
+					if (customUndoLevels != -1 && this.undoLevels.length > customUndoLevels) {
+						for (var i=0; i<this.undoLevels.length-1; i++) {
+							//alert(this.undoLevels[i] + "=" + this.undoLevels[i+1]);
+							this.undoLevels[i] = this.undoLevels[i+1];
+						}
+
+						this.undoLevels.length--;
+						this.undoIndex--;
+					}
+
+					//alert(newHTML + "=" + this.undoLevels[this.undoIndex]);
+					// Add new level
+					this.undoLevels[this.undoIndex++] = newHTML;
+					this.undoLevels.length = this.undoIndex;
+//					debug("mceAddUndoLevel - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);
+					//window.status = "mceAddUndoLevel - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex;
+				}
+
+				tinyMCE.triggerNodeChange(false);
+			}
+			break;
+
+		case "Undo":
+			if (tinyMCE.settings['custom_undo_redo']) {
+				// Is first level
+				if (this.undoIndex == this.undoLevels.length) {
+					this.execCommand("mceAddUndoLevel");
+					this.undoIndex--;
+				}
+
+				// Do undo
+				if (this.undoIndex > 0) {
+					this.undoIndex--;
+					this.getBody().innerHTML = this.undoLevels[this.undoIndex];
+				}
+
+				// debug("Undo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);
+				tinyMCE.triggerNodeChange();
+			} else
+				this.getDoc().execCommand(command, user_interface, value);
+			break;
+
+		case "Redo":
+			if (tinyMCE.settings['custom_undo_redo']) {
+				if (this.undoIndex < (this.undoLevels.length-1)) {
+					this.undoIndex++;
+					this.getBody().innerHTML = this.undoLevels[this.undoIndex];
+					// debug("Redo - undo levels:" + this.undoLevels.length + ", undo index: " + this.undoIndex);
+				}
+
+				tinyMCE.triggerNodeChange();
+			} else
+				this.getDoc().execCommand(command, user_interface, value);
+			break;
+
+		case "mceToggleVisualAid":
+			this.visualAid = !this.visualAid;
+			tinyMCE.handleVisualAid(this.getBody(), true, this.visualAid);
+			tinyMCE.triggerNodeChange();
+			break;
+
+		case "removeformat":
+			var text = this.getSelectedText();
+
+			if (tinyMCE.isMSIE) {
+				try {
+					win.focus();
+					var rng = doc.selection.createRange();
+					rng.execCommand("RemoveFormat", false, null);
+					rng.pasteHTML(rng.text);
+				} catch (e) {
+					// Do nothing
+				}
+			} else
+				this.getDoc().execCommand(command, user_interface, value);
+
+			// Remove class
+			if (text.length == 0)
+				this.execCommand("mceSetCSSClass", false, "");
+
+			tinyMCE.triggerNodeChange();
+			break;
+
+		default:
+			this.getDoc().execCommand(command, user_interface, value);
+			tinyMCE.triggerNodeChange();
+	}
+};
+
+TinyMCEControl.prototype.queryCommandValue = function(command) {
+	return this.getDoc().queryCommandValue(command);
+};
+
+TinyMCEControl.prototype.queryCommandState = function(command) {
+	return this.getDoc().queryCommandState(command);
+};
+
+TinyMCEControl.prototype.onAdd = function(replace_element, form_element_name, target_document) {
+	var targetDoc = target_document ? target_document : document;
+
+	this.targetDoc = targetDoc;
+
+	tinyMCE.themeURL = tinyMCE.baseURL + "/themes/" + this.settings['theme'];
+	this.settings['themeurl'] = tinyMCE.themeURL;
+
+	if (!replace_element) {
+		alert("Error: Could not find the target element.");
+		return false;
+	}
+
+	var templateFunction = tinyMCE._getThemeFunction('_getInsertLinkTemplate');
+	if (eval("typeof(" + templateFunction + ")") != 'undefined')
+		this.insertLinkTemplate = eval(templateFunction + '(this.settings);');
+
+	var templateFunction = tinyMCE._getThemeFunction('_getInsertImageTemplate');
+	if (eval("typeof(" + templateFunction + ")") != 'undefined')
+		this.insertImageTemplate = eval(templateFunction + '(this.settings);');
+
+	var templateFunction = tinyMCE._getThemeFunction('_getEditorTemplate');
+	if (eval("typeof(" + templateFunction + ")") == 'undefined') {
+		alert("Error: Could not find the template function: " + templateFunction);
+		return false;
+	}
+
+	var editorTemplate = eval(templateFunction + '(this.settings, this.editorId);');
+
+	var deltaWidth = editorTemplate['delta_width'] ? editorTemplate['delta_width'] : 0;
+	var deltaHeight = editorTemplate['delta_height'] ? editorTemplate['delta_height'] : 0;
+	var html = '<span id="' + this.editorId + '_parent">' + editorTemplate['html'];
+
+	var templateFunction = tinyMCE._getThemeFunction('_handleNodeChange', true);
+	if (eval("typeof(" + templateFunction + ")") != 'undefined')
+		this.settings['handleNodeChangeCallback'] = templateFunction;
+
+	html = tinyMCE.replaceVar(html, "editor_id", this.editorId);
+	html = tinyMCE.replaceVar(html, "default_document", tinyMCE.baseURL + "/blank.htm");
+	this.settings['default_document'] = tinyMCE.baseURL + "/blank.htm";
+
+	this.settings['old_width'] = this.settings['width'];
+	this.settings['old_height'] = this.settings['height'];
+
+	// Set default width, height
+	if (this.settings['width'] == -1)
+		this.settings['width'] = replace_element.offsetWidth;
+
+	if (this.settings['height'] == -1)
+		this.settings['height'] = replace_element.offsetHeight;
+
+	// Try the style width
+	if (this.settings['width'] == 0)
+		this.settings['width'] = replace_element.style.width;
+
+	// Try the style height
+	if (this.settings['height'] == 0)
+		this.settings['height'] = replace_element.style.height; 
+
+	// If no width/height then default to 320x240, better than nothing
+	if (this.settings['width'] == 0)
+		this.settings['width'] = 320;
+
+	if (this.settings['height'] == 0)
+		this.settings['height'] = 240;
+
+	this.settings['area_width'] = parseInt(this.settings['width']);
+	this.settings['area_height'] = parseInt(this.settings['height']);
+	this.settings['area_width'] += deltaWidth;
+	this.settings['area_height'] += deltaHeight;
+
+	// Special % handling
+	if (("" + this.settings['width']).indexOf('%') != -1)
+		this.settings['area_width'] = "100%";
+
+	if (("" + this.settings['height']).indexOf('%') != -1)
+		this.settings['area_height'] = "100%";
+
+	if (("" + replace_element.style.width).indexOf('%') != -1) {
+		this.settings['width'] = replace_element.style.width;
+		this.settings['area_width'] = "100%";
+	}
+
+	if (("" + replace_element.style.height).indexOf('%') != -1) {
+		this.settings['height'] = replace_element.style.height;
+		this.settings['area_height'] = "100%";
+	}
+
+	html = tinyMCE.applyTemplate(html);
+
+	this.settings['width'] = this.settings['old_width'];
+	this.settings['height'] = this.settings['old_height'];
+
+	this.visualAid = this.settings['visual'];
+	this.formTargetElementId = form_element_name;
+
+	// Get replace_element contents
+	if (replace_element.nodeName.toLowerCase() == "textarea")
+		this.startContent = replace_element.value;
+	else
+		this.startContent = replace_element.innerHTML;
+
+	// If not text area
+	if (replace_element.nodeName.toLowerCase() != "textarea") {
+		this.oldTargetElement = replace_element.cloneNode(true);
+
+		// Debug mode
+		if (tinyMCE.settings['debug'])
+			html += '<textarea wrap="off" id="' + form_element_name + '" name="' + form_element_name + '" cols="100" rows="15"></textarea>';
+		else
+			html += '<input type="hidden" type="text" id="' + form_element_name + '" name="' + form_element_name + '" />';
+
+		html += '</span>';
+
+		// Output HTML and set editable
+		if (!tinyMCE.isMSIE) {
+			var rng = replace_element.ownerDocument.createRange();
+			rng.setStartBefore(replace_element);
+
+			var fragment = rng.createContextualFragment(html);
+			replace_element.parentNode.replaceChild(fragment, replace_element);
+		} else
+			replace_element.outerHTML = html;
+	} else {
+		html += '</span>';
+
+		// Just hide the textarea element
+		this.oldTargetElement = replace_element;
+
+		if (!tinyMCE.settings['debug'])
+			this.oldTargetElement.style.display = "none";
+
+		// Output HTML and set editable
+		if (!tinyMCE.isMSIE) {
+			var rng = replace_element.ownerDocument.createRange();
+			rng.setStartBefore(replace_element);
+
+			var fragment = rng.createContextualFragment(html);
+			replace_element.parentNode.insertBefore(fragment, replace_element);
+		} else
+			replace_element.insertAdjacentHTML("beforeBegin", html);
+	}
+
+	// Setup iframe
+	var dynamicIFrame = false;
+	var tElm = targetDoc.getElementById(this.editorId);
+
+	if (!tinyMCE.isMSIE) {
+		if (tElm && tElm.nodeName.toLowerCase() == "span") {
+			tElm = tinyMCE._createIFrame(tElm);
+			dynamicIFrame = true;
+		}
+
+		this.targetElement = tElm;
+		this.iframeElement = tElm;
+		this.contentDocument = tElm.contentDocument;
+		this.contentWindow = tElm.contentWindow;
+
+		//this.getDoc().designMode = "on";
+	} else {
+		if (tElm && tElm.nodeName.toLowerCase() == "span")
+			tElm = tinyMCE._createIFrame(tElm);
+		else
+			tElm = targetDoc.frames[this.editorId];
+
+		this.targetElement = tElm;
+		this.iframeElement = targetDoc.getElementById(this.editorId);
+		this.contentDocument = tElm.window.document;
+		this.contentWindow = tElm.window;
+		this.getDoc().designMode = "on";
+	}
+
+	// Setup base HTML
+	var doc = this.contentDocument;
+	if (dynamicIFrame) {
+        var html = ""
+            + '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'
+            + '<html>'
+            + '<head>'
+			+ '<base href="' + tinyMCE.settings['base_href'] + '" />'
+            + '<title>blank_page</title>'
+            + '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'
+            + '</head>'
+            + '<body>'
+            + '</body>'
+            + '</html>';
+
+		try {
+			this.getDoc().designMode = "on";
+			doc.open();
+			doc.write(html);
+			doc.close();
+		} catch (e) {
+			// Failed Mozilla 1.3
+			this.getDoc().location.href = tinyMCE.baseURL + "/blank.htm";
+		}
+	}
+
+	// This timeout is needed in MSIE 5.5 for some odd reason
+	// it seems that the document.frames isn't initialized yet?
+	if (tinyMCE.isMSIE)
+		window.setTimeout("TinyMCE.prototype.addEventHandlers('" + this.editorId + "');", 1);
+
+	tinyMCE.setupContent(this.editorId, true);
+
+	return true;
+};
+
+TinyMCEControl.prototype.getFocusElement = function() {
+	if (tinyMCE.isMSIE) {
+		var doc = this.getDoc();
+		var rng = doc.selection.createRange();
+
+		if (rng.collapse)
+			rng.collapse(true);
+
+		var elm = rng.item ? rng.item(0) : rng.parentElement();
+	} else {
+		var sel = this.getSel();
+		var elm = (sel && sel.anchorNode) ? sel.anchorNode : null;
+
+		if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "img")
+			elm = tinyMCE.selectedElement;
+	}
+
+	return elm;
+};
+
+// Global instances
+var tinyMCE = new TinyMCE();
+var tinyMCELang = new Array();
+
+function debug() {
+	var msg = "";
+
+	var elm = document.getElementById("tinymce_debug");
+	if (!elm) {
+		var debugDiv = document.createElement("div");
+		debugDiv.setAttribute("className", "debugger");
+		debugDiv.className = "debugger";
+		debugDiv.innerHTML = '\
+			Debug output:\
+			<textarea id="tinymce_debug" style="width: 100%; height: 300px">\
+			</textarea>';
+
+		document.body.appendChild(debugDiv);
+		elm = document.getElementById("tinymce_debug");
+	}
+
+	var args = this.debug.arguments;
+	for (var i=0; i<args.length; i++) {
+		msg += args[i];
+		if (i<args.length-1)
+			msg += ', ';
+	}
+
+	elm.value += msg + "\n";
+};
diff --git a/source/web/scripts/webdav.js b/source/web/scripts/webdav.js
new file mode 100644
index 0000000000..b6823ea4c3
--- /dev/null
+++ b/source/web/scripts/webdav.js
@@ -0,0 +1,38 @@
+//
+// Helper functions for launching WebDAV documents for editing
+// Gavin Cornwell 30-11-2005
+//
+
+function openDoc(url)
+{
+   var showDoc = true;
+   var agent = navigator.userAgent.toLowerCase();
+      
+   // work out the context path from the pathname (this means we dont't
+   // have to rely on the context path being passed in an anyway)   
+   var contextPath = window.location.pathname.substring(0, window.location.pathname.indexOf("/", 1));
+   var fullUrl = window.location.protocol + "//" + window.location.host + contextPath + url;
+   
+   // if the link represents an Office document and we are in IE try and
+   // open the file directly to get WebDAV editing capabilities
+   if (agent.indexOf("msie") != -1)
+   {
+      if (fullUrl.indexOf(".doc") != -1 || 
+          fullUrl.indexOf(".dot") != -1 ||
+          fullUrl.indexOf(".xls") != -1 || 
+          fullUrl.indexOf(".ppt") != -1)
+      {
+         var wordDoc = new ActiveXObject("SharePoint.OpenDocuments.1");
+         if (wordDoc)
+         {
+            showDoc = false;
+            wordDoc.EditDocument(fullUrl);
+         }
+      }
+   }
+
+   if (showDoc == true)
+   {
+      window.open(fullUrl, "_blank");
+   }
+}
\ No newline at end of file