Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Feb 2006 16:45:47 -0500 (EST)
From:      Rod Taylor <ports@rbt.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/92822: MAINTAINER-UPDATE: www/bricolage to 1.10.0 
Message-ID:  <200602042145.k14LjlsS020076@home.rbt.ca>
Resent-Message-ID: <200602042150.k14Lo2Vd051070@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         92822
>Category:       ports
>Synopsis:       MAINTAINER-UPDATE: www/bricolage to 1.10.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 04 21:50:01 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Rod Taylor
>Release:        FreeBSD 6.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD home 6.0-RELEASE FreeBSD 6.0-RELEASE #13: Sat Nov 5 00:19:49 EST 2005 root@home:/usr/obj/usr/src/sys/HOME amd64


	
>Description:

	Bricolage upgrade to 1.10.0.
	
>How-To-Repeat:
	
>Fix:

	

--- bricolage.1_10_0.patch begins here ---
diff -crN bricolage.orig/Makefile bricolage/Makefile
*** bricolage.orig/Makefile	Tue Nov 29 13:42:46 2005
--- bricolage/Makefile	Wed Feb  1 00:03:10 2006
***************
*** 6,12 ****
  #
  
  PORTNAME=	bricolage
! PORTVERSION=	1.8.8
  CATEGORIES=	www perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	bricolage
--- 6,12 ----
  #
  
  PORTNAME=	bricolage
! PORTVERSION=	1.10.0
  CATEGORIES=	www perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	bricolage
***************
*** 20,41 ****
  		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
  		${SITE_PERL}/${PERL_ARCH}/Cache/Mmap.pm:${PORTSDIR}/devel/p5-Cache-Mmap \
  		${SITE_PERL}/Class/Container.pm:${PORTSDIR}/devel/p5-Class-Container \
  		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
  		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
  		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \
  		${SITE_PERL}/Term/ReadPassword.pm:${PORTSDIR}/devel/p5-Term-ReadPassword \
  		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
- 		${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
  		${SITE_PERL}/Test/Class.pm:${PORTSDIR}/devel/p5-Test-Class \
  		${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule \
  		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
  		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
  		${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
  		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
  		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
  		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
  		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
! 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
  		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
  		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
  		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
--- 20,48 ----
  		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
  		${SITE_PERL}/${PERL_ARCH}/Cache/Mmap.pm:${PORTSDIR}/devel/p5-Cache-Mmap \
  		${SITE_PERL}/Class/Container.pm:${PORTSDIR}/devel/p5-Class-Container \
+ 		${SITE_PERL}/${PERL_ARCH}/Data/UUID.pm:${PORTSDIR}/devel/p5-Data-UUID \
  		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
  		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
+ 		${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
+ 		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
+ 		${SITE_PERL}/DateTime/TimeZone.pm:${PORTSDIR}/devel/p5-DateTime-TimeZone \
  		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \
  		${SITE_PERL}/Term/ReadPassword.pm:${PORTSDIR}/devel/p5-Term-ReadPassword \
+ 		${SITE_PERL}/${PERL_ARCH}/Text/LevenshteinXS.pm:${PORTSDIR}/devel/p5-Text-LevenshteinXS \
  		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
  		${SITE_PERL}/Test/Class.pm:${PORTSDIR}/devel/p5-Test-Class \
+ 		${SITE_PERL}/Test/File/Contents.pm:${PORTSDIR}/devel/p5-Test-File-Contents \
  		${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule \
  		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
  		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
+ 		${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils \
  		${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
  		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
  		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
  		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
  		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
! 		${SITE_PERL}/Text/Diff/HTML.pm:${PORTSDIR}/textproc/p5-Text-Diff-HTML \
! 		${SITE_PERL}/Text/WordDiff.pm:${PORTSDIR}/textproc/p5-Text-WordDiff \
  		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
  		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
  		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
***************
*** 50,62 ****
  APXS?=		${LOCALBASE}/sbin/apxs
  
  MAKE_ENV+=	INSTALL_VERBOSITY="QUIET"
  
  # Used to determine which versions have perl scripts
  # that need to run for an upgrade. These should be listed
  # in the same order as found within inst/versions.txt
  #
  # Skip 1.8.5
! PREVIOUS_VERSIONS=	1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 1.8.7 1.8.8
  
  USE_REINPLACE=	yes
  PERL_CONFIGURE=	yes
--- 57,70 ----
  APXS?=		${LOCALBASE}/sbin/apxs
  
  MAKE_ENV+=	INSTALL_VERBOSITY="QUIET"
+ MAKE_ENV+=	USE_DEFAULTS=freebsd
  
  # Used to determine which versions have perl scripts
  # that need to run for an upgrade. These should be listed
  # in the same order as found within inst/versions.txt
  #
  # Skip 1.8.5
! PREVIOUS_VERSIONS=	1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 1.8.7 1.8.8 1.8.9 1.9.0 1.9.1 1.10.0
  
  USE_REINPLACE=	yes
  PERL_CONFIGURE=	yes
***************
*** 134,139 ****
--- 142,148 ----
  		Bric::App::Event.3 Bric::App::Handler.3 Bric::App::MediaFunc.3 \
  		Bric::App::PreviewHandler.3 Bric::App::Session.3 Bric::App::Util.3 \
  		Bric::AssetEditing.3 Bric::Biz::ATType.3 Bric::Biz::Asset.3 \
+ 		Bric::Biz::Asset::Template.3 \
  		Bric::Biz::Asset::Business.3 Bric::Biz::Asset::Business::Media.3 \
  		Bric::Biz::Asset::Business::Media::Audio.3 \
  		Bric::Biz::Asset::Business::Media::Image.3 \
***************
*** 143,151 ****
  		Bric::Biz::Asset::Business::Parts::Tile::Data.3 \
  		Bric::Biz::Asset::Business::Story.3 Bric::Biz::Asset::Formatting.3 \
  		Bric::Biz::AssetType.3 Bric::Biz::AssetType::Parts::Data.3 \
! 		Bric::Biz::Category.3 Bric::Biz::Contact.3 Bric::Biz::Keyword.3 \
! 		Bric::Biz::Org.3 Bric::Biz::Org::Parts::Addr.3 Bric::Biz::Org::Person.3 \
! 		Bric::Biz::Org::Source.3 Bric::Biz::OutputChannel.3 \
  		Bric::Biz::OutputChannel::Element.3 Bric::Biz::Person.3 \
  		Bric::Biz::Person::User.3 Bric::Biz::Site.3 Bric::Biz::Workflow.3 \
  		Bric::Biz::Workflow::Parts::Desk.3 Bric::Changes.3 Bric::Config.3 \
--- 152,162 ----
  		Bric::Biz::Asset::Business::Parts::Tile::Data.3 \
  		Bric::Biz::Asset::Business::Story.3 Bric::Biz::Asset::Formatting.3 \
  		Bric::Biz::AssetType.3 Bric::Biz::AssetType::Parts::Data.3 \
! 		Bric::Biz::Category.3 Bric::Biz::Contact.3 Bric::Biz::Element.3 \
! 		Bric::Biz::Element::Container.3 Bric::Biz::Element::Field.3 \
! 		Bric::Biz::ElementType.3 Bric::Biz::ElementType::Parts::FieldType.3 \
! 		Bric::Biz::Keyword.3 Bric::Biz::Org.3 Bric::Biz::Org::Parts::Addr.3 \
! 		Bric::Biz::Org::Person.3 Bric::Biz::Org::Source.3 Bric::Biz::OutputChannel.3 \
  		Bric::Biz::OutputChannel::Element.3 Bric::Biz::Person.3 \
  		Bric::Biz::Person::User.3 Bric::Biz::Site.3 Bric::Biz::Workflow.3 \
  		Bric::Biz::Workflow::Parts::Desk.3 Bric::Changes.3 Bric::Config.3 \
***************
*** 156,177 ****
  		Bric::Dist::Resource.3 Bric::Dist::Server.3 Bric::Dist::ServerType.3 \
  		Bric::ElementAdmin.3 Bric::FAQ.3 Bric::HTMLTemplate.3 Bric::Hacker.3 \
  		Bric::License.3 Bric::SOAP.3 Bric::SOAP::Asset.3 Bric::SOAP::Auth.3 \
! 		Bric::SOAP::Category.3 Bric::SOAP::Desk.3 Bric::SOAP::Element.3 \
! 		Bric::SOAP::Handler.3 Bric::SOAP::Keyword.3 Bric::SOAP::Media.3 \
! 		Bric::SOAP::MediaType.3 Bric::SOAP::Site.3 Bric::SOAP::Story.3 \
! 		Bric::SOAP::Template.3 Bric::SOAP::User.3 Bric::SOAP::Util.3 \
! 		Bric::SOAP::Workflow.3 Bric::Security.3 Bric::Templates.3 Bric::ToDo.3 \
  		Bric::Util::Alert.3 Bric::Util::AlertType.3 \
  		Bric::Util::AlertType::Parts::Rule.3 Bric::Util::Alerted.3 \
! 		Bric::Util::Alerted::Parts::Sent.3 Bric::Util::Async.3 \
  		Bric::Util::Attribute.3 Bric::Util::Attribute::Action.3 \
! 		Bric::Util::Attribute::AssetType.3 Bric::Util::Attribute::AssetTypeData.3 \
! 		Bric::Util::Attribute::Category.3 Bric::Util::Attribute::Formatting.3 \
! 		Bric::Util::Attribute::Grp.3 Bric::Util::Attribute::Media.3 \
! 		Bric::Util::Attribute::MediaDataTile.3 Bric::Util::Attribute::Member.3 \
! 		Bric::Util::Attribute::Person.3 Bric::Util::Attribute::Story.3 \
! 		Bric::Util::Attribute::StoryDataTile.3 Bric::Util::Attribute::Workspace.3 \
! 		Bric::Util::Burner.3 Bric::Util::Burner::Mason.3 \
  		Bric::Util::Burner::Template.3 Bric::Util::Burner::TemplateToolkit.3 \
  		Bric::Util::CharTrans.3 Bric::Util::Class.3 Bric::Util::Coll.3 \
  		Bric::Util::Coll::Action.3 Bric::Util::Coll::Addr.3 \
--- 167,187 ----
  		Bric::Dist::Resource.3 Bric::Dist::Server.3 Bric::Dist::ServerType.3 \
  		Bric::ElementAdmin.3 Bric::FAQ.3 Bric::HTMLTemplate.3 Bric::Hacker.3 \
  		Bric::License.3 Bric::SOAP.3 Bric::SOAP::Asset.3 Bric::SOAP::Auth.3 \
! 		Bric::SOAP::ATType.3 Bric::SOAP::Category.3 Bric::SOAP::Desk.3 \
! 		Bric::SOAP::ElementType.3 Bric::SOAP::Handler.3 Bric::SOAP::Keyword.3 \
! 		Bric::SOAP::Media.3 Bric::SOAP::MediaType.3 Bric::SOAP::OutputChannel.3 \
! 		Bric::SOAP::Site.3 Bric::SOAP::Story.3 Bric::SOAP::Template.3 \
! 		Bric::SOAP::User.3 Bric::SOAP::Util.3 Bric::SOAP::Workflow.3 \
! 		Bric::Security.3 Bric::Templates.3 Bric::ToDo.3 \
  		Bric::Util::Alert.3 Bric::Util::AlertType.3 \
  		Bric::Util::AlertType::Parts::Rule.3 Bric::Util::Alerted.3 \
! 		Bric::Util::Alerted::Parts::Sent.3 \
  		Bric::Util::Attribute.3 Bric::Util::Attribute::Action.3 \
! 		Bric::Util::Attribute::Category.3 Bric::Util::Attribute::ElementType.3 \
! 		Bric::Util::Attribute::FieldType.3 Bric::Util::Attribute::Grp.3 \
! 		Bric::Util::Attribute::Member.3 Bric::Util::AuthInternal.3 \
! 		Bric::Util::AuthLDAP.3 Bric::Util::Burner.3 Bric::Util::Burner::Mason.3 \
! 		Bric::Util::Burner::PHP.3 \
  		Bric::Util::Burner::Template.3 Bric::Util::Burner::TemplateToolkit.3 \
  		Bric::Util::CharTrans.3 Bric::Util::Class.3 Bric::Util::Coll.3 \
  		Bric::Util::Coll::Action.3 Bric::Util::Coll::Addr.3 \
***************
*** 190,204 ****
  		Bric::Util::Fault::Exception::DP.3 Bric::Util::Fault::Exception::GEN.3 \
  		Bric::Util::Fault::Exception::MNI.3 Bric::Util::Grp.3 \
  		Bric::Util::Grp::AlertType.3 Bric::Util::Grp::Asset.3 \
! 		Bric::Util::Grp::AssetLanguage.3 Bric::Util::Grp::AssetType.3 \
! 		Bric::Util::Grp::AssetVersion.3 Bric::Util::Grp::CategorySet.3 \
  		Bric::Util::Grp::ContribType.3 Bric::Util::Grp::Desk.3 \
! 		Bric::Util::Grp::Dest.3 Bric::Util::Grp::Element.3 \
  		Bric::Util::Grp::ElementType.3 Bric::Util::Grp::Event.3 \
! 		Bric::Util::Grp::Formatting.3 Bric::Util::Grp::Grp.3 \
  		Bric::Util::Grp::Job.3 Bric::Util::Grp::Keyword.3 \
  		Bric::Util::Grp::Media.3 Bric::Util::Grp::MediaType.3 \
  		Bric::Util::Grp::Org.3 Bric::Util::Grp::OutputChannel.3 \
  		Bric::Util::Grp::Parts::Member.3 \
  		Bric::Util::Grp::Parts::Member::Contrib.3 Bric::Util::Grp::Person.3 \
  		Bric::Util::Grp::Pref.3 Bric::Util::Grp::Site.3 Bric::Util::Grp::Source.3 \
--- 200,215 ----
  		Bric::Util::Fault::Exception::DP.3 Bric::Util::Fault::Exception::GEN.3 \
  		Bric::Util::Fault::Exception::MNI.3 Bric::Util::Grp.3 \
  		Bric::Util::Grp::AlertType.3 Bric::Util::Grp::Asset.3 \
! 		Bric::Util::Grp::AssetLanguage.3 Bric::Util::Grp::AssetVersion.3 \
! 		Bric::Util::Grp::ATType.3 Bric::Util::Grp::CategorySet.3 \
  		Bric::Util::Grp::ContribType.3 Bric::Util::Grp::Desk.3 \
! 		Bric::Util::Grp::Dest.3 \
  		Bric::Util::Grp::ElementType.3 Bric::Util::Grp::Event.3 \
! 		Bric::Util::Grp::Grp.3 \
  		Bric::Util::Grp::Job.3 Bric::Util::Grp::Keyword.3 \
  		Bric::Util::Grp::Media.3 Bric::Util::Grp::MediaType.3 \
  		Bric::Util::Grp::Org.3 Bric::Util::Grp::OutputChannel.3 \
+ 		Bric::Util::Grp::SubelementType.3 Bric::Util::Grp::Template.3 \
  		Bric::Util::Grp::Parts::Member.3 \
  		Bric::Util::Grp::Parts::Member::Contrib.3 Bric::Util::Grp::Person.3 \
  		Bric::Util::Grp::Pref.3 Bric::Util::Grp::Site.3 Bric::Util::Grp::Source.3 \
***************
*** 217,223 ****
  		Bric::Util::Time.3 Bric::Util::Trans::FS.3 Bric::Util::Trans::FTP.3 \
  		Bric::Util::Trans::Jabber.3 Bric::Util::Trans::Mail.3 \
  		Bric::Util::Trans::SFTP.3 Bric::Util::Trans::WebDAV.3 \
! 		Bric::Util::UserPref.3 Bric::Util::WebDav.3
  
  SQLDIR=		${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
  UPGRADEDIR=		${PREFIX}/bricolage/upgrade
--- 228,234 ----
  		Bric::Util::Time.3 Bric::Util::Trans::FS.3 Bric::Util::Trans::FTP.3 \
  		Bric::Util::Trans::Jabber.3 Bric::Util::Trans::Mail.3 \
  		Bric::Util::Trans::SFTP.3 Bric::Util::Trans::WebDAV.3 \
! 		Bric::Util::UserPref.3
  
  SQLDIR=		${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
  UPGRADEDIR=		${PREFIX}/bricolage/upgrade
diff -crN bricolage.orig/distinfo bricolage/distinfo
*** bricolage.orig/distinfo	Sun Nov 27 14:33:28 2005
--- bricolage/distinfo	Tue Jan 31 21:50:58 2006
***************
*** 1,3 ****
! MD5 (bricolage-1.8.8.tar.gz) = 8546d21ddea434abcd33539c2b460ced
! SHA256 (bricolage-1.8.8.tar.gz) = 2b7f6c82b57281a25dde97b4621da75e87866498e423a61ac79b70662218697f
! SIZE (bricolage-1.8.8.tar.gz) = 2547868
--- 1,3 ----
! MD5 (bricolage-1.10.0.tar.gz) = 5bbdc7906d00e74e444c17c6113500ea
! SHA256 (bricolage-1.10.0.tar.gz) = 6e1e42a0c868047b75a87cb907fae04a3dee310f6d355b4540f98a2449c96862
! SIZE (bricolage-1.10.0.tar.gz) = 2678377
diff -crN bricolage.orig/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh
*** bricolage.orig/files/bric_upgrade.sh	Sun Nov 27 15:10:08 2005
--- bricolage/files/bric_upgrade.sh	Thu Feb  2 12:18:38 2006
***************
*** 12,21 ****
  
  # Ensure the old version exists at the end of the argument list
  OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[0123467]$/OKAY/"`
  if [ "${VTEST}" != "OKAY" ]
  then
! 	echo "The final argument should be the old version of the port, in the format."
  	echo "	$0 [options] <version number>"
  	exit 1
  fi
--- 12,23 ----
  
  # Ensure the old version exists at the end of the argument list
  OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234678]$/OKAY/"`
  if [ "${VTEST}" != "OKAY" ]
  then
! 	echo "Version $OLDVERSION unknown."
! 	echo "The final argument should be the old version of the port."
! 	echo ""
  	echo "	$0 [options] <version number>"
  	exit 1
  fi
diff -crN bricolage.orig/files/patch-Makefile bricolage/files/patch-Makefile
*** bricolage.orig/files/patch-Makefile	Wed Jun 16 09:34:30 2004
--- bricolage/files/patch-Makefile	Tue Jan 31 23:12:38 2006
***************
*** 1,72 ****
! --- Makefile.orig	Sun Apr 11 01:00:23 2004
! +++ Makefile	Mon May 24 00:35:57 2004
! @@ -15,9 +15,13 @@
!  #
!  # See INSTALL for details.
!  #
! +PREFIX?= /usr/local
!  
!  # Set the location of Perl.
! -PERL = /usr/bin/perl
! +PERL = /usr/local/bin/perl
! +
! +# Blank by default, but set to QUIET to ask essential questions only
! +INSTALL_VERBOSITY?= STANDARD
!  
!  # can't load Bric since it loads Bric::Config which has dependencies
!  # that won't be solved till make install.
! @@ -31,13 +35,13 @@
!                    bconf/bricolage.conf build_done
!  
!  required.db	: inst/required.pl
! -	$(PERL) inst/required.pl
! +	$(PERL) inst/required.pl $(INSTALL_VERBOSITY)
!  
!  modules.db 	: inst/modules.pl lib/Bric/Admin.pod
! -	$(PERL) inst/modules.pl
! +	$(PERL) inst/modules.pl $(INSTALL_VERBOSITY)
!  
!  apache.db	: inst/apache.pl required.db
! -	$(PERL) inst/apache.pl
! +	$(PERL) inst/apache.pl $(INSTALL_VERBOSITY)
!  
!  # This shoudl be updated to something more database-independent. In fact,
!  # what should happen is that a script should present a list of supported
! @@ -45,10 +49,10 @@
!  # driver, e.g., "Pg", "mysql", "Oracle", etc.), and then the rest of the
!  # work should just assume that database and do the work for that database.
!  postgres.db 	: inst/postgres.pl required.db
! -	$(PERL) inst/postgres.pl
! +	$(PERL) inst/postgres.pl $(INSTALL_VERBOSITY)
!  
!  config.db	: inst/config.pl required.db apache.db postgres.db
! -	$(PERL) inst/config.pl
! +	$(PERL) inst/config.pl $(INSTALL_VERBOSITY)
!  
!  bconf/bricolage.conf	:  required.db inst/conf.pl
!  	$(PERL) inst/conf.pl INSTALL $(BRIC_VERSION)
! @@ -168,20 +172,20 @@
!  
!  lib 		: 
!  	-rm -f lib/Makefile
! -	cd lib; $(PERL) Makefile.PL; $(MAKE) install
! +	cd lib; $(PERL) Makefile.PL PREFIX="${PREFIX}"; $(MAKE) install
!  
!  bin 		:
!  	-rm -f bin/Makefile
! -	cd bin; $(PERL) Makefile.PL; $(MAKE) install
! +	cd bin; $(PERL) Makefile.PL PREFIX="${PREFIX}"; $(MAKE) install
!  
!  files 		: config.db bconf/bricolage.conf
!  	$(PERL) inst/files.pl
!  
!  db    		: inst/db.pl postgres.db
! -	$(PERL) inst/db.pl
! +# NOOP	$(PERL) inst/db.pl
!  
!  db_grant	: inst/db.pl postgres.db
! -	$(PERL) inst/db_grant.pl
! +# NOOP	$(PERL) inst/db_grant.pl
!  
!  done		: bconf/bricolage.conf db files bin lib cpan
!  	$(PERL) inst/done.pl
--- 1,79 ----
! *** Makefile.orig	Tue Jan 17 19:09:49 2006
! --- Makefile	Tue Jan 31 23:12:14 2006
! ***************
! *** 18,24 ****
!   #
!   
!   # Set the location of Perl.
! ! PERL = /usr/bin/perl
!   
!   # Blank by default, but set to QUIET to ask essential questions only
!   INSTALL_VERBOSITY?= STANDARD
! --- 18,24 ----
!   #
!   
!   # Set the location of Perl.
! ! PERL = /usr/local/bin/perl
!   
!   # Blank by default, but set to QUIET to ask essential questions only
!   INSTALL_VERBOSITY?= STANDARD
! ***************
! *** 161,167 ****
!   # installation rules     #
!   ##########################
!   
! ! install 	: all is_root cpan lib bin files db db_grant done
!   
!   is_root         : inst/is_root.pl
!   	$(PERL) inst/is_root.pl
! --- 161,167 ----
!   # installation rules     #
!   ##########################
!   
! ! install 	: all is_root cpan lib bin files done
!   
!   is_root         : inst/is_root.pl
!   	$(PERL) inst/is_root.pl
! ***************
! *** 171,190 ****
!   
!   lib 		: 
!   	-rm -f lib/Makefile
! ! 	cd lib; $(PERL) Makefile.PL; $(MAKE) install
!   
!   bin 		:
!   	-rm -f bin/Makefile
! ! 	cd bin; $(PERL) Makefile.PL; $(MAKE) install
!   
!   files 		: config.db bconf/bricolage.conf
!   	$(PERL) inst/files.pl
!   
!   db    		: inst/db.pl postgres.db
! ! 	$(PERL) inst/db.pl
!   
!   db_grant	: inst/db.pl postgres.db
! ! 	$(PERL) inst/db_grant.pl
!   
!   done		: bconf/bricolage.conf db files bin lib cpan
!   	$(PERL) inst/done.pl
! --- 171,190 ----
!   
!   lib 		: 
!   	-rm -f lib/Makefile
! ! 	cd lib; $(PERL) Makefile.PL; $(MAKE) all pure_install
!   
!   bin 		:
!   	-rm -f bin/Makefile
! ! 	cd bin; $(PERL) Makefile.PL; $(MAKE) all pure_install
!   
!   files 		: config.db bconf/bricolage.conf
!   	$(PERL) inst/files.pl
!   
!   db    		: inst/db.pl postgres.db
! ! #	$(PERL) inst/db.pl
!   
!   db_grant	: inst/db.pl postgres.db
! ! #	$(PERL) inst/db_grant.pl
!   
!   done		: bconf/bricolage.conf db files bin lib cpan
!   	$(PERL) inst/done.pl
diff -crN bricolage.orig/files/patch-inst::apache.pl bricolage/files/patch-inst::apache.pl
*** bricolage.orig/files/patch-inst::apache.pl	Wed Jun 16 09:34:30 2004
--- bricolage/files/patch-inst::apache.pl	Wed Dec 31 19:00:00 1969
***************
*** 1,44 ****
- --- inst/apache.pl.orig	Sat May 22 14:47:57 2004
- +++ inst/apache.pl	Sat May 22 14:55:05 2004
- @@ -36,6 +36,10 @@
-  use File::Spec::Functions;
-  use Data::Dumper;
-  
- +# check whether questions should be asked
- +our $QUIET;
- +$QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET';
- +
-  print "\n\n==> Probing Apache Configuration <==\n\n";
-  
-  our %AP;
- @@ -290,17 +294,25 @@
-  
-  END
-  
- -    ask_confirm("Apache User:\t\t\t",  \$AP{user});
- -    ask_confirm("Apache Group:\t\t\t", \$AP{group});
- -    ask_confirm("Apache Port:\t\t\t",  \$AP{port});
- -    ask_confirm("Apache Server Name:\t\t",  \$AP{server_name});
- +    if ($QUIET) {
- +        print "Apache User:\t\t\t".  $AP{user}."\n";
- +        print "Apache Group:\t\t\t". $AP{group}."\n";
- +        print "Apache Port:\t\t\t".  $AP{port}."\n";
- +        print "Apache Server Name:\t\t". $AP{server_name}."\n";
- +    }
- +    else {
- +        ask_confirm("Apache User:\t\t\t",  \$AP{user});
- +        ask_confirm("Apache Group:\t\t\t", \$AP{group});
- +        ask_confirm("Apache Port:\t\t\t",  \$AP{port});
- +        ask_confirm("Apache Server Name:\t\t",  \$AP{server_name});
- +    }
-  
-      # install fails if this is wrong
-      $AP{ssl_key} = catfile($AP{HTTPD_ROOT}, "conf", "ssl.key", "server.key");
-      $AP{ssl_cert} = catfile($AP{HTTPD_ROOT}, "conf", "ssl.crt","server.crt");
-  
-      if ($AP{ssl} or $AP{apache_ssl}) {
- -        if (ask_yesno("Do you want to use SSL? [no] ", 0)) {
- +        if (!$QUIET and ask_yesno("Do you want to use SSL? [no] ", 0)) {
-              if ($AP{ssl} and $AP{apache_ssl}) {
-                  $AP{ssl} = ask_choice("Which SSL module do you use? " .
-                                        "(apache_ssl or mod_ssl) ",
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::config.pl bricolage/files/patch-inst::config.pl
*** bricolage.orig/files/patch-inst::config.pl	Thu May  5 00:11:08 2005
--- bricolage/files/patch-inst::config.pl	Tue Jan 31 23:06:52 2006
***************
*** 1,170 ****
! *** inst/config.pl.orig	Fri Mar 18 17:12:51 2005
! --- inst/config.pl	Tue May  3 18:40:57 2005
  ***************
! *** 36,41 ****
! --- 36,45 ----
!   use Config;
!   use Cwd;
!   
! + # check whether questions should be asked
! + our $QUIET;
! + $QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET';
! + 
!   print "\n\n==> Gathering User Configuration <==\n\n";
!   our %CONFIG;
    
- ***************
- *** 73,94 ****
-   
-   END
-   
- !     $CONFIG{set} = ask_choice("Your choice?",
- !                               [ "s", "m" ], "m");
-   
-       # setup the default
-       if ($CONFIG{set} eq 's') {
-           # single system defaults
-           $CONFIG{BRICOLAGE_ROOT}  = '/usr/local/bricolage';
-           $CONFIG{TEMP_DIR}        = tmpdir();
- !         $CONFIG{MODULE_DIR}      = $Config{sitelib};
- !         $CONFIG{BIN_DIR}         = $Config{scriptdir};
- !         $CONFIG{MAN_DIR}         = $Config{man3dir};
-           $CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
-           $CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
-   
-           # remove man3 trailer
- !         $CONFIG{MAN_DIR} =~ s!/man3!!;
-   
-           # construct default system-wide log directory based on Apache
-           # error_log setting
- --- 77,101 ----
-   
-   END
-   
- !     $CONFIG{set} = "s";
- !     ask_choice("Your choice?", 
- !                [ "s", "m" ], $CONFIG{set}) unless $QUIET;
-   
-       # setup the default
-       if ($CONFIG{set} eq 's') {
-           # single system defaults
-           $CONFIG{BRICOLAGE_ROOT}  = '/usr/local/bricolage';
-           $CONFIG{TEMP_DIR}        = tmpdir();
- !         $CONFIG{MODULE_DIR}      = '/usr/local/lib/perl5/site_perl/5.8.2/ '; #$Config{sitelib};
- !         $CONFIG{BIN_DIR}         = '/usr/local/bin'; #$Config{scriptdir};
- !         $CONFIG{MAN1_DIR}         = '/usr/local/man/man1'; #$Config{man1dir};
- !         $CONFIG{MAN3_DIR}         = '/usr/local/lib/perl5/5.8.2/man/man3'; #$Config{man3dir};
-           $CONFIG{MASON_COMP_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/comp';
-           $CONFIG{MASON_DATA_ROOT} = '$CONFIG{BRICOLAGE_ROOT}/data';
-   
-           # remove man3 trailer
- !         $CONFIG{MAN1_DIR} =~ s!/man1!!;
- !         $CONFIG{MAN3_DIR} =~ s!/man3!!;
-   
-           # construct default system-wide log directory based on Apache
-           # error_log setting
- ***************
- *** 115,121 ****
-           $CONFIG{TEMP_DIR}         = '$CONFIG{BRICOLAGE_ROOT}/tmp';
-           $CONFIG{MODULE_DIR}       = '$CONFIG{BRICOLAGE_ROOT}/lib';
-           $CONFIG{BIN_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/bin';
- !         $CONFIG{MAN_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/man';
-           $CONFIG{LOG_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/log';
-           $CONFIG{PID_FILE}         = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
-           $CONFIG{MASON_COMP_ROOT}  = '$CONFIG{BRICOLAGE_ROOT}/comp';
- --- 122,129 ----
-           $CONFIG{TEMP_DIR}         = '$CONFIG{BRICOLAGE_ROOT}/tmp';
-           $CONFIG{MODULE_DIR}       = '$CONFIG{BRICOLAGE_ROOT}/lib';
-           $CONFIG{BIN_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/bin';
- !         $CONFIG{MAN1_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/man';
- !         $CONFIG{MAN3_DIR}          = $CONFIG{MAN1_DIR};
-           $CONFIG{LOG_DIR}          = '$CONFIG{BRICOLAGE_ROOT}/log';
-           $CONFIG{PID_FILE}         = '$CONFIG{BRICOLAGE_ROOT}/log/httpd.pid';
-           $CONFIG{MASON_COMP_ROOT}  = '$CONFIG{BRICOLAGE_ROOT}/comp';
- ***************
- *** 125,131 ****
    
!   sub confirm_settings {
!     my $default_root = $CONFIG{BRICOLAGE_ROOT};
! !   ask_confirm("\nBricolage Root Directory", \$CONFIG{BRICOLAGE_ROOT});
!   
!     # make sure this directory isn't the same at the source directory
!     if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
! --- 133,144 ----
!   
!   sub confirm_settings {
!     my $default_root = $CONFIG{BRICOLAGE_ROOT};
! !   if ($QUIET) {
! !     print "\bBricolage Root Directory ". $CONFIG{BRICOLAGE_ROOT} ."\n";
  !   }
- !   else {
- !     ask_confirm("\nBricolage Root Directory", \$CONFIG{BRICOLAGE_ROOT});
- !   }
-   
-     # make sure this directory isn't the same at the source directory
-     if (canonpath($CONFIG{BRICOLAGE_ROOT}) eq canonpath(cwd())) {
- ***************
- *** 142,165 ****
-         -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
-         print "That directory already contains a Bricolage installation.\n";
-         print "Consider running `make upgrade`, instead.\n";
- !       exit 1 unless ask_yesno("Continue and overwrite existing installation? ".
- !                               "[no] ", 0);
-     }
    
      # some prefs are based on BRICOLAGE_ROOT, need to eval them now
! !   foreach (qw(TEMP_DIR MODULE_DIR BIN_DIR MAN_DIR LOG_DIR PID_FILE
!                 MASON_COMP_ROOT MASON_DATA_ROOT)) {
!       $CONFIG{$_} = eval qq{"$CONFIG{$_}"};
!     }
!   
! !   ask_confirm("Temporary Directory",       \$CONFIG{TEMP_DIR});
! !   ask_confirm("Perl Module Directory",     \$CONFIG{MODULE_DIR});
! !   ask_confirm("Executable Directory",      \$CONFIG{BIN_DIR});
! !   ask_confirm("Man-Page Directory (! to skip)", \$CONFIG{MAN_DIR});
! !   ask_confirm("Log Directory",             \$CONFIG{LOG_DIR});
! !   ask_confirm("PID File Location",         \$CONFIG{PID_FILE});
!     $CONFIG{PID_FILE} = catfile($CONFIG{PID_FILE}, 'httpd.pid')
!       if -d $CONFIG{PID_FILE};
! -   ask_confirm("Mason Component Directory", \$CONFIG{MASON_COMP_ROOT});
! -   ask_confirm("Mason Data Directory",      \$CONFIG{MASON_DATA_ROOT});
!   }
! --- 155,192 ----
!         -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
!         print "That directory already contains a Bricolage installation.\n";
!         print "Consider running `make upgrade`, instead.\n";
! !       exit 1 unless ($QUIET or ask_yesno("Continue and overwrite existing installation? ".
! !                               "[no] ", 0));
!     }
    
      # some prefs are based on BRICOLAGE_ROOT, need to eval them now
! !   foreach (qw(TEMP_DIR MODULE_DIR BIN_DIR MAN1_DIR MAN3_DIR LOG_DIR PID_FILE
!                 MASON_COMP_ROOT MASON_DATA_ROOT)) {
!       $CONFIG{$_} = eval qq{"$CONFIG{$_}"};
!     }
!   
! !   if ($QUIET) {
! !     print "Temporary Directory ".       $CONFIG{TEMP_DIR} ."\n";
! !     print "Perl Module Directory ".     $CONFIG{MODULE_DIR} ."\n";
! !     print "Executable Directory ".      $CONFIG{BIN_DIR} ."\n";
! !     print "Man1-Page Directory ".        $CONFIG{MAN1_DIR} ."\n";
! !     print "Man3-Page Directory ".        $CONFIG{MAN3_DIR} ."\n";
! !     print "Log Directory ".             $CONFIG{LOG_DIR} ."\n";
! !     print "PID File Location ".         $CONFIG{PID_FILE} ."\n";
! !     print "Mason Component Directory ". $CONFIG{MASON_COMP_ROOT} ."\n";
! !     print "Mason Data Directory ".      $CONFIG{MASON_DATA_ROOT} ."\n";
! !   }
! !   else {
! !     ask_confirm("Temporary Directory",       \$CONFIG{TEMP_DIR});
! !     ask_confirm("Perl Module Directory",     \$CONFIG{MODULE_DIR});
! !     ask_confirm("Executable Directory",      \$CONFIG{BIN_DIR});
! !     ask_confirm("Man1-Page Directory (! to skip)", \$CONFIG{MAN1_DIR});
! !     ask_confirm("Man3-Page Directory (! to skip)", \$CONFIG{MAN3_DIR});
! !     ask_confirm("Log Directory",             \$CONFIG{LOG_DIR});
! !     ask_confirm("PID File Location",         \$CONFIG{PID_FILE});
! !     ask_confirm("Mason Component Directory", \$CONFIG{MASON_COMP_ROOT});
! !     ask_confirm("Mason Data Directory",      \$CONFIG{MASON_DATA_ROOT});
! !   }
!     $CONFIG{PID_FILE} = catfile($CONFIG{PID_FILE}, 'httpd.pid')
!       if -d $CONFIG{PID_FILE};
!   }
--- 1,29 ----
! *** inst/config.pl.bak	Sun Jul 24 16:44:16 2005
! --- inst/config.pl	Tue Jan 31 23:06:03 2006
  ***************
! *** 156,167 ****
    
    
!     # make sure this directory doesn't already house a Bricolage install
! !   if (-e $CONFIG{BRICOLAGE_ROOT} and
! !       -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
! !       print "That directory already contains a Bricolage installation.\n";
! !       print "Consider running `make upgrade`, instead.\n";
! !       exit 1 unless ask_yesno("Continue and overwrite existing installation?", 0);
  !   }
    
      # some prefs are based on BRICOLAGE_ROOT, need to eval them now
!     foreach (qw(TEMP_DIR MODULE_DIR BIN_DIR MAN_DIR LOG_DIR PID_FILE
! --- 156,167 ----
!   
!   
!     # make sure this directory doesn't already house a Bricolage install
! ! #  if (-e $CONFIG{BRICOLAGE_ROOT} and
! ! #      -e catfile($CONFIG{BRICOLAGE_ROOT}, "conf", "bricolage.conf")) {
! ! #      print "That directory already contains a Bricolage installation.\n";
! ! #      print "Consider running `make upgrade`, instead.\n";
! ! #      exit 1 unless ask_yesno("Continue and overwrite existing installation?", 0);
! ! #  }
    
      # some prefs are based on BRICOLAGE_ROOT, need to eval them now
!     foreach (qw(TEMP_DIR MODULE_DIR BIN_DIR MAN_DIR LOG_DIR PID_FILE
diff -crN bricolage.orig/files/patch-inst::db_upgrade.pl bricolage/files/patch-inst::db_upgrade.pl
*** bricolage.orig/files/patch-inst::db_upgrade.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::db_upgrade.pl	Fri Feb  3 19:47:36 2006
***************
*** 0 ****
--- 1,19 ----
+ *** inst/db_upgrade.pl.orig	Fri Sep 16 19:50:20 2005
+ --- inst/db_upgrade.pl	Fri Feb  3 19:47:06 2006
+ ***************
+ *** 73,79 ****
+       next unless -d $dir;
+   
+       opendir(DIR, $dir) or die "can't opendir $dir: $!";
+ !     my @scripts = grep { -f $_ } map { catfile($dir, $_) } sort readdir(DIR);
+       closedir DIR;
+   
+       foreach my $script (@scripts) {
+ --- 73,79 ----
+       next unless -d $dir;
+   
+       opendir(DIR, $dir) or die "can't opendir $dir: $!";
+ !     my @scripts = grep { -f $_ and $_ =~ /\.pl$/ } map { catfile($dir, $_) } sort readdir(DIR);
+       closedir DIR;
+   
+       foreach my $script (@scripts) {
diff -crN bricolage.orig/files/patch-inst::defaults::freebsd bricolage/files/patch-inst::defaults::freebsd
*** bricolage.orig/files/patch-inst::defaults::freebsd	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::defaults::freebsd	Sat Jan 28 14:10:05 2006
***************
*** 0 ****
--- 1,65 ----
+ *** inst/defaults/freebsd.orig	Sat Jan 28 14:09:16 2006
+ --- inst/defaults/freebsd	Sat Jan 28 14:06:59 2006
+ ***************
+ *** 0 ****
+ --- 1,60 ----
+ + # Required programs.  PG_CONFIG_PATH is the location of PostgreSQL's pg_config 
+ + # script.  APACHE_PATH is the path to the Apache 1.3 executable.  APACHE_EXE is
+ + # the filename of the executable itself.  EXPAT_PATH is the path to the Expat 
+ + # library libexpat.so (also looks in library paths that Perl knows about), and
+ + # EXPAT_FILE is the filename of the library.
+ + 
+ + PG_CONFIG_PATH = /usr/local/pgsql/bin, /usr/local/postgres/bin, /usr/lib/postgresql/bin, /opt/pgsql/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
+ + APACHE_PATH = /usr/local/apache/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
+ + APACHE_EXE  = httpd, httpsd, apache-perl, apache
+ + EXPAT_PATH  = /sw/lib
+ + EXPAT_FILE  = libexpat.so, libexpat.so.0, libexpat.so.0.0.1, libexpat.dylib, libexpat.0.dylib, libexpat.0.0.1.dylib, libexpat.a, libexpat.la
+ + 
+ + # Apache settings.  APACHE_USER and APACHE_GROUP are the user and group that
+ + # the Apache process will run as.  APACHE_PORT is the port that Apache will
+ + # listen on.  APACHE_SSL_PORT is the port that will listen for https requests.
+ + # APACHE_HOSTNAME is the server's hostname; only set this if you want to 
+ + # override the value returned by the "hostname" command.
+ + 
+ + APACHE_USER     = www
+ + APACHE_GROUP    = www
+ + APACHE_PORT     = 80
+ + APACHE_SSL_PORT = 443
+ + # APACHE_HOSTNAME = localhost
+ + 
+ + # PostgreSQL settings.  POSTGRES_SUPERUSER is the username of the Postgres
+ + # superuser (typically "postgres").  POSTGRES_BRICUSER is the username that 
+ + # Bricolage will use when connecting to the database.  This can be anything 
+ + # you want, but "bric" is typical. POSTGRES_DB is the name of the database 
+ + # Bricolage will use.
+ + #
+ + # In most installations, Postgres allows local users to access the
+ + # server without a username.  If your server requires a password, pass the
+ + # POSTGRES_SUPERPASS environment variable during "make," e.g.:
+ + #
+ + #    make POSTGRES_SUPERPASS=abcdef
+ + #
+ + # The Bricolage Postgres Password (the password used by Bricolage to
+ + # connect to the database) is randomly generated during a silent install.  If
+ + # you need it, it'll be in bricolage.conf after installation.
+ + #
+ + # If PostgreSQL is running on a separate box, you must pass a host name or 
+ + # IP address to "make" through the POSTGRES_HOSTNAME environment variable.
+ + # If it's running on a port other than the default port (5432), pass the 
+ + # appropriate port number with POSTGRES_HOSTPORT.
+ + 
+ + POSTGRES_SUPERUSER   = pgsql
+ + POSTGRES_BRICUSER     = bric
+ + POSTGRES_DB          = bric
+ + 
+ + # Installation locations.
+ + 
+ + BRICOLAGE_ROOT_DIR = /usr/local/bricolage       # Bricolage Root Directory
+ + BRICOLAGE_TMP_DIR  = /usr/local/bricolage/tmp   # Temporary Directory
+ + BRICOLAGE_PERL_DIR = /usr/local/bricolage/lib   # Perl Module Directory
+ + BRICOLAGE_BIN_DIR  = /usr/local/bricolage/bin   # Executable Directory
+ + BRICOLAGE_MAN_DIR  = /usr/local/bricolage/man   # Man-Page Directory (! to skip)
+ + BRICOLAGE_LOG_DIR  = /usr/local/bricolage/log   # Log Directory
+ + BRICOLAGE_PID      = /usr/local/bricolage/log/httpd.pid  # PID File Location
+ + BRICOLAGE_COMP_DIR = /usr/local/bricolage/comp  # Mason Component Directory
+ + BRICOLAGE_DATA_DIR = /usr/local/bricolage/data  # Mason Data Directory
diff -crN bricolage.orig/files/patch-inst::modules.pl bricolage/files/patch-inst::modules.pl
*** bricolage.orig/files/patch-inst::modules.pl	Wed Jun 16 09:34:30 2004
--- bricolage/files/patch-inst::modules.pl	Wed Dec 31 19:00:00 1969
***************
*** 1,37 ****
- --- inst/modules.pl.orig	Fri Dec 12 16:14:45 2003
- +++ inst/modules.pl	Sat May 22 15:11:30 2004
- @@ -36,6 +36,10 @@
-  use File::Spec::Functions;
-  use Data::Dumper;
-  
- +# check whether questions should be asked
- +our $QUIET;
- +$QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET';
- +
-  print "\n\n==> Probing Required Perl Modules <==\n\n";
-  
-  our @MOD;
- @@ -48,9 +52,9 @@
-  foreach my $rec (@MOD) {
-      $rec->{found} = check_module($rec);
-      unless ($rec->{found}) {
- -        if ($rec->{optional} and 
- -            not ask_yesno("Do you want to install the optional module " . 
- -                          "$rec->{name}? [no] ", 0)) {
- +        if ($rec->{optional} and ($QUIET
- +                or not ask_yesno("Do you want to install the optional module " . 
- +                          "$rec->{name}? [no] ", 0))) {
-              $rec->{found} = 1;
-          } else {
-              $MISSING = 1;
- @@ -73,7 +77,9 @@
-  END
-  
-      # for some reason an "exit 1" here doesn't stop the make run.
- -    kill(2, $$) unless ask_yesno("Continue? [yes] ", 1);
- +    if ($QUIET or not ask_yesno("Continue? [yes] ", 1)) {
- +        kill(2, $$);
- +    }
-  }
-  
-  
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::postgres.pl bricolage/files/patch-inst::postgres.pl
*** bricolage.orig/files/patch-inst::postgres.pl	Thu Sep 15 23:06:58 2005
--- bricolage/files/patch-inst::postgres.pl	Wed Dec 31 19:00:00 1969
***************
*** 1,93 ****
- *** inst/postgres.pl.orig	Thu Jul 14 00:03:08 2005
- --- inst/postgres.pl	Fri Aug  5 22:52:39 2005
- ***************
- *** 36,50 ****
-   use File::Spec::Functions;
-   use Data::Dumper;
-   
-   print "\n\n==> Probing PostgreSQL Configuration <==\n\n";
-   
-   our %PG;
-   
-   # setup some defaults
- ! $PG{root_user} = 'postgres';
-   $PG{root_pass} = '';
-   $PG{sys_user}  = 'bric';
- ! $PG{sys_pass}  = 'NONE';
-   $PG{db_name}   = 'bric';
-   $PG{host_name} = '';
-   $PG{host_port} = '';
- --- 36,54 ----
-   use File::Spec::Functions;
-   use Data::Dumper;
-   
- + # check whether questions should be asked
- + our $QUIET;
- + $QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET';
- + 
-   print "\n\n==> Probing PostgreSQL Configuration <==\n\n";
-   
-   our %PG;
-   
-   # setup some defaults
- ! $PG{root_user} = 'pgsql';
-   $PG{root_pass} = '';
-   $PG{sys_user}  = 'bric';
- ! $PG{sys_pass}  = ''; # Ask the user to deal with it
-   $PG{db_name}   = 'bric';
-   $PG{host_name} = '';
-   $PG{host_port} = '';
- ***************
- *** 58,65 ****
-   get_bin_dir();
-   get_psql();
-   get_version();
- ! get_users();
- ! get_host();
-   get_version();
-   
-   # all done, dump out apache database, announce success and exit
- --- 62,70 ----
-   get_bin_dir();
-   get_psql();
-   get_version();
- ! # Skip for automated installation
- ! #get_users();
- ! #get_host();
-   get_version();
-   
-   # all done, dump out apache database, announce success and exit
- ***************
- *** 122,134 ****
-   # ask the user for user settings
-   sub get_users {
-       print "\n";
- !     ask_confirm("Postgres Root Username", \$PG{root_user});
-       ask_password("Postgres Root Password (leave empty for no password)",
-   		\$PG{root_pass});
-   
-       while(1) {
-   	$PG{system_user} = $PG{root_user};
- ! 	ask_confirm("Postgres System Username", \$PG{system_user});
-   	$PG{system_user_uid} = (getpwnam($PG{system_user}))[2];
-   	last if defined $PG{system_user_uid};
-   	print "User \"$PG{system_user}\" not found!  This user must exist ".
- --- 127,144 ----
-   # ask the user for user settings
-   sub get_users {
-       print "\n";
- !     if ($QUIET) {
- !         print "Postgres Root Username ". $PG{root_user} ."\n";
- !     }
- !     else {
- !         ask_confirm("Postgres Root Username", \$PG{root_user});
- !     }
-       ask_password("Postgres Root Password (leave empty for no password)",
-   		\$PG{root_pass});
-   
-       while(1) {
-   	$PG{system_user} = $PG{root_user};
- ! 	ask_confirm("Postgres System Username", \$PG{system_user}) unless $QUIET;
-   	$PG{system_user_uid} = (getpwnam($PG{system_user}))[2];
-   	last if defined $PG{system_user_uid};
-   	print "User \"$PG{system_user}\" not found!  This user must exist ".
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::required.pl bricolage/files/patch-inst::required.pl
*** bricolage.orig/files/patch-inst::required.pl	Sun Nov 27 14:39:22 2005
--- bricolage/files/patch-inst::required.pl	Wed Dec 31 19:00:00 1969
***************
*** 1,71 ****
- *** inst/required.pl.orig	Wed Aug 31 17:11:11 2005
- --- inst/required.pl	Sun Nov 27 14:38:37 2005
- ***************
- *** 67,72 ****
- --- 67,76 ----
-   our %REQ;
-   our %RESULTS;
-   
- + # check to see whether we should ask questions or not
- + our $QUIET;
- + $QUIET = 1 if $ARGV[0] and $ARGV[0] eq 'QUIET';
- + 
-   # collect data - configuration requirements data goes into %REQ, raw
-   # binary pass/fail goes into %RESULTS.
-   
- ***************
- *** 125,136 ****
-       # confirm or deny
-       if ($REQ{PG_CONFIG}) {
-           print "Found PostgreSQL's pg_config at '$REQ{PG_CONFIG}'.\n";
- !         unless (ask_yesno("Is this correct? [yes] ", 1)) {
-               ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG});
-           }
-       } else {
-           print "Failed to find pg_config.\n";
- !         if (ask_yesno("Do you want to provide a path to pg_config? [no] ",
-                         0)) {
-               $REQ{PG_CONFIG} = 'NONE';
-               ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG});
- --- 129,140 ----
-       # confirm or deny
-       if ($REQ{PG_CONFIG}) {
-           print "Found PostgreSQL's pg_config at '$REQ{PG_CONFIG}'.\n";
- !         unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) {
-               ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG});
-           }
-       } else {
-           print "Failed to find pg_config.\n";
- !         if (!$QUIET and ask_yesno("Do you want to provide a path to pg_config? [no] ",
-                         0)) {
-               $REQ{PG_CONFIG} = 'NONE';
-               ask_confirm("Enter path to pg_config", \$REQ{PG_CONFIG});
- ***************
- *** 188,200 ****
-       # confirm or deny
-       if ($REQ{APACHE_EXE}) {
-           print "Found Apache server binary at '$REQ{APACHE_EXE}'.\n";
- !         unless (ask_yesno("Is this correct? [yes] ", 1)) {
-               ask_confirm("Enter path to Apache server binary",
-                           \$REQ{APACHE_EXE});
-           }
-       } else {
-           print "Failed to find Apache server binary.\n";
- !         if (ask_yesno("Do you want to provide a path to the Apache server " .
-                         "binary? [no] ",
-                         0)) {
-               $REQ{APACHE_EXE} = 'NONE';
- --- 192,204 ----
-       # confirm or deny
-       if ($REQ{APACHE_EXE}) {
-           print "Found Apache server binary at '$REQ{APACHE_EXE}'.\n";
- !         unless ($QUIET or ask_yesno("Is this correct? [yes] ", 1)) {
-               ask_confirm("Enter path to Apache server binary",
-                           \$REQ{APACHE_EXE});
-           }
-       } else {
-           print "Failed to find Apache server binary.\n";
- !         if (!$QUIET and ask_yesno("Do you want to provide a path to the Apache server " .
-                         "binary? [no] ",
-                         0)) {
-               $REQ{APACHE_EXE} = 'NONE';
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl bricolage/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl	Fri Feb  3 18:09:13 2006
***************
*** 0 ****
--- 1,19 ----
+ *** inst/upgrade/1.8.9/add_element_member_fks.pl.orig	Mon Oct 31 13:31:35 2005
+ --- inst/upgrade/1.8.9/add_element_member_fks.pl	Fri Feb  3 18:06:48 2006
+ ***************
+ *** 7,13 ****
+   use bric_upgrade qw(:all);
+   
+   exit unless test_table 'element_member';
+ ! exit if test_constraint 'element_member', 'fk_member__at_member';
+   
+   do_sql
+       q{ DELETE FROM element_member
+ --- 7,13 ----
+   use bric_upgrade qw(:all);
+   
+   exit unless test_table 'element_member';
+ ! exit if test_foreign_key 'element_member', 'fk_member__at_member';
+   
+   do_sql
+       q{ DELETE FROM element_member
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl bricolage/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl	Fri Feb  3 18:08:10 2006
***************
*** 0 ****
--- 1,69 ----
+ *** inst/upgrade/1.8.9/fix_publish_status.pl.orig	Thu Jan 19 16:07:05 2006
+ --- inst/upgrade/1.8.9/fix_publish_status.pl	Fri Feb  3 18:05:32 2006
+ ***************
+ *** 6,17 ****
+   use lib catdir $FindBin::Bin, updir, 'lib';
+   use bric_upgrade qw(:all);
+   
+   for my $thing (qw(story media)) {
+       do_sql
+           qq{UPDATE $thing
+ !            SET    publish_status = '1'
+              WHERE  published_version IS NOT NULL
+ !                   AND publish_status = '0'
+           },
+   
+           # We have no idea what version was actually published, so
+ --- 6,23 ----
+   use lib catdir $FindBin::Bin, updir, 'lib';
+   use bric_upgrade qw(:all);
+   
+ + # Later versions will have booleans instead of NUMERIC.
+ + my ($true, $false)
+ +     = test_column('story', 'publish_status', undef, undef, 'boolean')
+ +     ? qw(TRUE FALSE)
+ +     : qw( 1 0 );
+ + 
+   for my $thing (qw(story media)) {
+       do_sql
+           qq{UPDATE $thing
+ !            SET    publish_status = $true
+              WHERE  published_version IS NOT NULL
+ !                   AND publish_status = $false
+           },
+   
+           # We have no idea what version was actually published, so
+ ***************
+ *** 19,25 ****
+           qq{UPDATE $thing
+              SET    published_version = current_version
+              WHERE  published_version IS NULL
+ !                   AND publish_status = '1'
+           },
+   
+           # We don't know if it has been published since the first
+ --- 25,31 ----
+           qq{UPDATE $thing
+              SET    published_version = current_version
+              WHERE  published_version IS NULL
+ !                   AND publish_status = $true
+           },
+   
+           # We don't know if it has been published since the first
+ ***************
+ *** 39,45 ****
+   
+           # Remove the publish_status when there are no publish dates.
+           qq{UPDATE $thing
+ !            SET    publish_status = '0'
+              WHERE  publish_date IS NULL
+           },
+       ;
+ --- 45,51 ----
+   
+           # Remove the publish_status when there are no publish dates.
+           qq{UPDATE $thing
+ !            SET    publish_status = $false
+              WHERE  publish_date IS NULL
+           },
+       ;
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl bricolage/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl	Fri Feb  3 18:08:49 2006
***************
*** 0 ****
--- 1,78 ----
+ *** inst/upgrade/1.8.9/update_publish_status_check.pl.orig	Thu Jan 19 16:07:05 2006
+ --- inst/upgrade/1.8.9/update_publish_status_check.pl	Fri Feb  3 18:05:49 2006
+ ***************
+ *** 9,35 ****
+   # Skip it for later versions of Bricolage.
+   exit unless test_constraint 'story', 'ck_story__publish_status';
+   
+   for my $thing (qw(story media)) {
+       do_sql
+           qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
+   
+ !         qq{ALTER TABLE $thing
+ !            ADD CONSTRAINT ck_$thing\__publish_status CHECK (
+ !                publish_status IN (0,1)
+ !                AND (
+                      (
+ !                        publish_status = 0
+                          AND publish_date IS NULL
+                          AND first_publish_date IS NULL
+                      )
+                      OR (
+ !                        publish_status = 1
+                          AND publish_date IS NOT NULL
+                          AND first_publish_date IS NOT NULL
+                      )
+                  )
+ !            )
+ !         },
+       ;
+   }
+   
+ --- 9,54 ----
+   # Skip it for later versions of Bricolage.
+   exit unless test_constraint 'story', 'ck_story__publish_status';
+   
+ + # Later versions will have booleans instead of NUMERIC.
+ + my $bool = test_column('story', 'publish_status', undef, undef, 'boolean');
+ + 
+   for my $thing (qw(story media)) {
+       do_sql
+           qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
+   
+ !         ($bool
+ !          ?  qq{ALTER TABLE $thing
+ !                ADD CONSTRAINT ck_$thing\__publish_status CHECK (
+                      (
+ !                        publish_status = FALSE
+                          AND publish_date IS NULL
+                          AND first_publish_date IS NULL
+                      )
+                      OR (
+ !                        publish_status = TRUE
+                          AND publish_date IS NOT NULL
+                          AND first_publish_date IS NOT NULL
+                      )
+                  )
+ !             }
+ !          :  qq{ALTER TABLE $thing
+ !                ADD CONSTRAINT ck_$thing\__publish_status CHECK (
+ !                    publish_status IN (0, 1)
+ !                    AND (
+ !                        (
+ !                            publish_status = 0
+ !                            AND publish_date IS NULL
+ !                            AND first_publish_date IS NULL
+ !                        )
+ !                        OR (
+ !                            publish_status = 1
+ !                            AND publish_date IS NOT NULL
+ !                            AND first_publish_date IS NOT NULL
+ !                        )
+ !                    )
+ !                )
+ !             }
+ !         )
+       ;
+   }
+   
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl bricolage/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl	Fri Feb  3 19:44:55 2006
***************
*** 0 ****
--- 1,17 ----
+ *** inst/upgrade/1.9.0/no_more_numeric.pl.orig	Wed Aug 17 18:20:34 2005
+ --- inst/upgrade/1.9.0/no_more_numeric.pl	Fri Feb  3 19:44:17 2006
+ ***************
+ *** 101,106 ****
+ --- 101,112 ----
+           $last =~ s/,$// if $_ =~ /^\);/;
+       }
+   
+ +     # Fix incompatible checks.
+ +     if (/ck_(?:story|media)__publish_status/) {
+ +         s/\(0\)::integer/FALSE/g;
+ +         s/\(1\)::integer/TRUE/g;
+ +     }
+ + 
+       # Print the previouis line.
+       print NEW $last;
+       $last = $_;
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_element_table.pl bricolage/files/patch-inst::upgrade::1.9.1::rename_element_table.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_element_table.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.9.1::rename_element_table.pl	Fri Feb  3 18:52:33 2006
***************
*** 0 ****
--- 1,19 ----
+ *** inst/upgrade/1.9.1/rename_element_table.pl.orig	Mon Dec 19 15:37:14 2005
+ --- inst/upgrade/1.9.1/rename_element_table.pl	Fri Feb  3 18:51:54 2006
+ ***************
+ *** 123,129 ****
+       q{ALTER TABLE element_type__site ALTER COLUMN id
+         SET DEFAULT NEXTVAL('seq_element_type__site')},
+       q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
+ !         test_primary_key('element__site_pkey', 'element_type__site')
+               ? 'element__site_pkey'
+               : 'pk_element__site__id'
+       ),
+ --- 123,129 ----
+       q{ALTER TABLE element_type__site ALTER COLUMN id
+         SET DEFAULT NEXTVAL('seq_element_type__site')},
+       q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
+ !         test_primary_key('element_type__site', 'element__site_pkey')
+               ? 'element__site_pkey'
+               : 'pk_element__site__id'
+       ),
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl bricolage/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl	Fri Feb  3 17:05:31 2006
***************
*** 0 ****
--- 1,19 ----
+ *** inst/upgrade/1.9.1/rename_instance_column.pl.orig	Mon Oct  3 15:30:43 2005
+ --- inst/upgrade/1.9.1/rename_instance_column.pl	Fri Feb  3 17:04:48 2006
+ ***************
+ *** 49,55 ****
+           ALTER TABLE media_container_tile
+           ADD CONSTRAINT fk_mc_tile__related_story
+           FOREIGN KEY (related_story__id)
+ !         REFERENCES media(id) ON DELETE CASCADE
+       },
+   
+       # Add FK constraint for mediacontainer_tile.related_media__id
+ --- 49,55 ----
+           ALTER TABLE media_container_tile
+           ADD CONSTRAINT fk_mc_tile__related_story
+           FOREIGN KEY (related_story__id)
+ !         REFERENCES story(id) ON DELETE CASCADE
+       },
+   
+       # Add FK constraint for mediacontainer_tile.related_media__id
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl bricolage/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl	Sat Feb  4 10:13:59 2006
***************
*** 0 ****
--- 1,40 ----
+ *** inst/upgrade/1.9.1/ze_job_iz_versioned.pl.orig	Sat Feb  4 10:09:39 2006
+ --- inst/upgrade/1.9.1/ze_job_iz_versioned.pl	Sat Feb  4 10:13:13 2006
+ ***************
+ *** 18,24 ****
+       # set, even though they've been published.
+       q{UPDATE story
+         SET    published_version = COALESCE(s.published_version, s.current_version),
+ !              publish_status    = '1'
+         FROM   job j, story s
+         WHERE  story.id = s.id
+                AND j.story_instance__id = s.id
+ --- 18,26 ----
+       # set, even though they've been published.
+       q{UPDATE story
+         SET    published_version = COALESCE(s.published_version, s.current_version),
+ !              publish_status    = '1',
+ !              first_publish_date = COALESCE(s.first_publish_date, s.publish_date, CURRENT_TIMESTAMP),
+ !              publish_date = COALESCE(s.publish_date, s.first_publish_date, CURRENT_TIMESTAMP)
+         FROM   job j, story s
+         WHERE  story.id = s.id
+                AND j.story_instance__id = s.id
+ ***************
+ *** 30,36 ****
+   
+       q{UPDATE media
+         SET    published_version = COALESCE(m.published_version, m.current_version),
+ !              publish_status    = '1'
+         FROM   job j, media m
+         WHERE  media.id = m.id
+                AND j.media_instance__id = m.id
+ --- 32,40 ----
+   
+       q{UPDATE media
+         SET    published_version = COALESCE(m.published_version, m.current_version),
+ !              publish_status    = '1',
+ !              first_publish_date = COALESCE(m.first_publish_date, m.publish_date, CURRENT_TIMESTAMP),
+ !              publish_date = COALESCE(m.publish_date, m.first_publish_date, CURRENT_TIMESTAMP)
+         FROM   job j, media m
+         WHERE  media.id = m.id
+                AND j.media_instance__id = m.id
diff -crN bricolage.orig/files/patch-inst::upgrade::lib::bric_upgrade.pm bricolage/files/patch-inst::upgrade::lib::bric_upgrade.pm
*** bricolage.orig/files/patch-inst::upgrade::lib::bric_upgrade.pm	Wed Dec 31 19:00:00 1969
--- bricolage/files/patch-inst::upgrade::lib::bric_upgrade.pm	Fri Feb  3 18:09:44 2006
***************
*** 0 ****
--- 1,12 ----
+ *** inst/upgrade/lib/bric_upgrade.pm.orig	Mon Dec 19 15:37:14 2005
+ --- inst/upgrade/lib/bric_upgrade.pm	Fri Feb  3 18:06:02 2006
+ ***************
+ *** 288,293 ****
+ --- 288,294 ----
+     exit if test_column $table_name, $column_name, $min_size;
+     exit if test_column $table_name, $column_name, undef, $not_null;
+     exit if test_column $table_name, $column_name, $min_size, $not_null;
+ +   exit if test_column $table_name, $column_name, $min_size, $not_null, $type;
+   
+   This function returns true if the specified column exists in specified table
+   in the Bricolage database, and false if it does not. Use C<test_column()> in
diff -crN bricolage.orig/pkg-plist bricolage/pkg-plist
*** bricolage.orig/pkg-plist	Sun Nov 27 14:48:25 2005
--- bricolage/pkg-plist	Thu Feb  2 00:58:23 2006
***************
*** 38,57 ****
  bricolage/upgrade/1.8.6/fix_resource_idx.pl
  bricolage/upgrade/1.8.6/fix_story_category_seq.pl
  bricolage/upgrade/1.8.7/add_expire_event_types.pl
  bricolage/upgrade/1.8.7/job_partial_index.pl
  bricolage/upgrade/1.8.7/move_media.pl
  bricolage/upgrade/1.8.7/move_media2.pl
  bricolage/upgrade/1.8.7/postgresql_8.1_fixes.pl
  bricolage/upgrade/1.8.8/fix_media_expire.pl
  bricolage/upgrade/1.8.8/fix_media_resources.pl
  bricolage/comp/admin/alerts/dhandler
  bricolage/comp/admin/alerts/recip
- bricolage/comp/admin/control/change_user/dhandler
  bricolage/comp/admin/control/publish/category.html
  bricolage/comp/admin/control/publish/dhandler
  bricolage/comp/admin/events/dhandler
  bricolage/comp/admin/manager/dhandler
! bricolage/comp/admin/manager/element/dhandler
  bricolage/comp/admin/profile/action/dhandler
  bricolage/comp/admin/profile/alert_type/dhandler
  bricolage/comp/admin/profile/alert_type/recip
--- 38,103 ----
  bricolage/upgrade/1.8.6/fix_resource_idx.pl
  bricolage/upgrade/1.8.6/fix_story_category_seq.pl
  bricolage/upgrade/1.8.7/add_expire_event_types.pl
+ bricolage/upgrade/1.8.7/fix_media.pl
+ bricolage/upgrade/1.8.7/fix_media2.pl
  bricolage/upgrade/1.8.7/job_partial_index.pl
  bricolage/upgrade/1.8.7/move_media.pl
  bricolage/upgrade/1.8.7/move_media2.pl
  bricolage/upgrade/1.8.7/postgresql_8.1_fixes.pl
  bricolage/upgrade/1.8.8/fix_media_expire.pl
  bricolage/upgrade/1.8.8/fix_media_resources.pl
+ bricolage/upgrade/1.8.9/add_element_member_fks.pl
+ bricolage/upgrade/1.8.9/add_keyword_fks.pl
+ bricolage/upgrade/1.8.9/add_media_contributor_fks.pl
+ bricolage/upgrade/1.8.9/fix_publish_status.pl
+ bricolage/upgrade/1.8.9/rename_keyword_pks.pl
+ bricolage/upgrade/1.8.9/update_publish_status_check.pl
+ bricolage/upgrade/1.9.0/add_alpha_search_pref.pl
+ bricolage/upgrade/1.9.0/add_media_del_file.pl
+ bricolage/upgrade/1.9.0/add_uuid1.pl
+ bricolage/upgrade/1.9.0/add_uuid2.pl
+ bricolage/upgrade/1.9.0/delete_old_desk_component.pl
+ bricolage/upgrade/1.9.0/flexible_uri_formats.pl
+ bricolage/upgrade/1.9.0/log_user_override.pl
+ bricolage/upgrade/1.9.0/new_strftime_prefs.pl
+ bricolage/upgrade/1.9.0/no_more_numeric.pl
+ bricolage/upgrade/1.9.0/source_privs.pl
+ bricolage/upgrade/1.9.1/add_job_reset_event.pl
+ bricolage/upgrade/1.9.1/add_subelement_type_events.pl
+ bricolage/upgrade/1.9.1/add_uri_slash.pl
+ bricolage/upgrade/1.9.1/add_windows_encodings.pl
+ bricolage/upgrade/1.9.1/delete_old_stuff.pl
+ bricolage/upgrade/1.9.1/delete_super_bulk_edit.pl
+ bricolage/upgrade/1.9.1/move_notes.pl
+ bricolage/upgrade/1.9.1/normalize_elements.pl
+ bricolage/upgrade/1.9.1/normalize_et_data.pl
+ bricolage/upgrade/1.9.1/rename_element_grps.pl
+ bricolage/upgrade/1.9.1/rename_element_table.pl
+ bricolage/upgrade/1.9.1/rename_element_type.pl
+ bricolage/upgrade/1.9.1/rename_field_table.pl
+ bricolage/upgrade/1.9.1/rename_field_type.pl
+ bricolage/upgrade/1.9.1/rename_indexes.pl
+ bricolage/upgrade/1.9.1/rename_instance_column.pl
+ bricolage/upgrade/1.9.1/rename_tile_tables.pl
+ bricolage/upgrade/1.9.1/update_element_classes.pl
+ bricolage/upgrade/1.9.1/xtract_attype.pl
+ bricolage/upgrade/1.9.1/xtract_attype2.pl
+ bricolage/upgrade/1.9.1/xtricate_map_type_id.pl
+ bricolage/upgrade/1.9.1/zap_doc_dates.pl
+ bricolage/upgrade/1.9.1/zap_et_burner.pl
+ bricolage/upgrade/1.9.1/zap_formatting.pl
+ bricolage/upgrade/1.9.1/zap_oc_prefix_suffix.pl
+ bricolage/upgrade/1.9.1/ze_job_iz_versioned.pl
+ bricolage/upgrade/1.10.0/delete_old_stuff.pl
+ bricolage/upgrade/1.10.0/rm_old_sort_prefs.pl
+ bricolage/upgrade/1.10.0/update_publish_status_check.pl
  bricolage/comp/admin/alerts/dhandler
  bricolage/comp/admin/alerts/recip
  bricolage/comp/admin/control/publish/category.html
  bricolage/comp/admin/control/publish/dhandler
  bricolage/comp/admin/events/dhandler
  bricolage/comp/admin/manager/dhandler
! bricolage/comp/admin/manager/element_type/dhandler
  bricolage/comp/admin/profile/action/dhandler
  bricolage/comp/admin/profile/alert_type/dhandler
  bricolage/comp/admin/profile/alert_type/recip
***************
*** 65,74 ****
  bricolage/comp/admin/profile/dest/dhandler
  bricolage/comp/admin/profile/dest/edit.html
  bricolage/comp/admin/profile/dest/new.html
- bricolage/comp/admin/profile/element/dhandler
- bricolage/comp/admin/profile/element/optionalFieldsJavascript.mc
- bricolage/comp/admin/profile/element_data/dhandler
  bricolage/comp/admin/profile/element_type/dhandler
  bricolage/comp/admin/profile/grp/dhandler
  bricolage/comp/admin/profile/grp/perm
  bricolage/comp/admin/profile/job/dhandler
--- 111,118 ----
  bricolage/comp/admin/profile/dest/dhandler
  bricolage/comp/admin/profile/dest/edit.html
  bricolage/comp/admin/profile/dest/new.html
  bricolage/comp/admin/profile/element_type/dhandler
+ bricolage/comp/admin/profile/field_type/dhandler
  bricolage/comp/admin/profile/grp/dhandler
  bricolage/comp/admin/profile/grp/perm
  bricolage/comp/admin/profile/job/dhandler
***************
*** 118,125 ****
  bricolage/comp/help/bo/admin/profile/contrib/extend.html
  bricolage/comp/help/bo/admin/profile/desk.html
  bricolage/comp/help/bo/admin/profile/dest.html
- bricolage/comp/help/bo/admin/profile/element.html
- bricolage/comp/help/bo/admin/profile/element_data.html
  bricolage/comp/help/bo/admin/profile/element_type.html
  bricolage/comp/help/bo/admin/profile/grp.html
  bricolage/comp/help/bo/admin/profile/grp/perm.html
--- 162,167 ----
***************
*** 131,150 ****
  bricolage/comp/help/bo/admin/profile/source.html
  bricolage/comp/help/bo/admin/profile/user.html
  bricolage/comp/help/bo/admin/profile/workflow.html
  bricolage/comp/help/bo/workflow/active/media.html
  bricolage/comp/help/bo/workflow/active/story.html
- bricolage/comp/help/bo/workflow/active/templates.html
  bricolage/comp/help/bo/workflow/events/dhandler
  bricolage/comp/help/bo/workflow/manager/media.html
  bricolage/comp/help/bo/workflow/manager/story.html
- bricolage/comp/help/bo/workflow/manager/templates.html
  bricolage/comp/help/bo/workflow/profile/alerts.html
  bricolage/comp/help/bo/workflow/profile/alias/media.html
  bricolage/comp/help/bo/workflow/profile/alias/story.html
  bricolage/comp/help/bo/workflow/profile/desk.html
  bricolage/comp/help/bo/workflow/profile/media.html
  bricolage/comp/help/bo/workflow/profile/media/category.html
- bricolage/comp/help/bo/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/bo/workflow/profile/media/contributor_role.html
  bricolage/comp/help/bo/workflow/profile/media/contributors.html
  bricolage/comp/help/bo/workflow/profile/media/keywords.html
--- 173,191 ----
  bricolage/comp/help/bo/admin/profile/source.html
  bricolage/comp/help/bo/admin/profile/user.html
  bricolage/comp/help/bo/admin/profile/workflow.html
+ bricolage/comp/help/bo/admin/profile/field_type.html
+ bricolage/comp/help/bo/admin/profile/pref.html
  bricolage/comp/help/bo/workflow/active/media.html
  bricolage/comp/help/bo/workflow/active/story.html
  bricolage/comp/help/bo/workflow/events/dhandler
  bricolage/comp/help/bo/workflow/manager/media.html
  bricolage/comp/help/bo/workflow/manager/story.html
  bricolage/comp/help/bo/workflow/profile/alerts.html
  bricolage/comp/help/bo/workflow/profile/alias/media.html
  bricolage/comp/help/bo/workflow/profile/alias/story.html
  bricolage/comp/help/bo/workflow/profile/desk.html
  bricolage/comp/help/bo/workflow/profile/media.html
  bricolage/comp/help/bo/workflow/profile/media/category.html
  bricolage/comp/help/bo/workflow/profile/media/contributor_role.html
  bricolage/comp/help/bo/workflow/profile/media/contributors.html
  bricolage/comp/help/bo/workflow/profile/media/keywords.html
***************
*** 152,165 ****
  bricolage/comp/help/bo/workflow/profile/story.html
  bricolage/comp/help/bo/workflow/profile/story/actions.html
  bricolage/comp/help/bo/workflow/profile/story/category.html
- bricolage/comp/help/bo/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/bo/workflow/profile/story/contributor_role.html
  bricolage/comp/help/bo/workflow/profile/story/contributors.html
  bricolage/comp/help/bo/workflow/profile/story/desks.html
  bricolage/comp/help/bo/workflow/profile/story/keywords.html
  bricolage/comp/help/bo/workflow/profile/story/new.html
- bricolage/comp/help/bo/workflow/profile/templates.html
- bricolage/comp/help/bo/workflow/profile/templates/new.html
  bricolage/comp/help/bo/workflow/profile/workspace.html
  bricolage/comp/help/bo/workflow/trail/dhandler
  bricolage/comp/help/de_de/about.html
--- 193,204 ----
  bricolage/comp/help/bo/workflow/profile/story.html
  bricolage/comp/help/bo/workflow/profile/story/actions.html
  bricolage/comp/help/bo/workflow/profile/story/category.html
  bricolage/comp/help/bo/workflow/profile/story/contributor_role.html
  bricolage/comp/help/bo/workflow/profile/story/contributors.html
  bricolage/comp/help/bo/workflow/profile/story/desks.html
  bricolage/comp/help/bo/workflow/profile/story/keywords.html
+ bricolage/comp/help/bo/workflow/profile/template.html
  bricolage/comp/help/bo/workflow/profile/story/new.html
  bricolage/comp/help/bo/workflow/profile/workspace.html
  bricolage/comp/help/bo/workflow/trail/dhandler
  bricolage/comp/help/de_de/about.html
***************
*** 191,198 ****
  bricolage/comp/help/de_de/admin/profile/contrib/extend.html
  bricolage/comp/help/de_de/admin/profile/desk.html
  bricolage/comp/help/de_de/admin/profile/dest.html
- bricolage/comp/help/de_de/admin/profile/element.html
- bricolage/comp/help/de_de/admin/profile/element_data.html
  bricolage/comp/help/de_de/admin/profile/element_type.html
  bricolage/comp/help/de_de/admin/profile/grp.html
  bricolage/comp/help/de_de/admin/profile/grp/perm.html
--- 230,235 ----
***************
*** 206,223 ****
  bricolage/comp/help/de_de/admin/profile/workflow.html
  bricolage/comp/help/de_de/workflow/active/media.html
  bricolage/comp/help/de_de/workflow/active/story.html
- bricolage/comp/help/de_de/workflow/active/templates.html
  bricolage/comp/help/de_de/workflow/events/dhandler
  bricolage/comp/help/de_de/workflow/manager/media.html
  bricolage/comp/help/de_de/workflow/manager/story.html
- bricolage/comp/help/de_de/workflow/manager/templates.html
  bricolage/comp/help/de_de/workflow/profile/alerts.html
  bricolage/comp/help/de_de/workflow/profile/alias/media.html
  bricolage/comp/help/de_de/workflow/profile/alias/story.html
  bricolage/comp/help/de_de/workflow/profile/desk.html
  bricolage/comp/help/de_de/workflow/profile/media.html
  bricolage/comp/help/de_de/workflow/profile/media/category.html
- bricolage/comp/help/de_de/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/de_de/workflow/profile/media/contributor_role.html
  bricolage/comp/help/de_de/workflow/profile/media/contributors.html
  bricolage/comp/help/de_de/workflow/profile/media/keywords.html
--- 243,257 ----
***************
*** 226,239 ****
  bricolage/comp/help/de_de/workflow/profile/story.html
  bricolage/comp/help/de_de/workflow/profile/story/actions.html
  bricolage/comp/help/de_de/workflow/profile/story/category.html
- bricolage/comp/help/de_de/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/de_de/workflow/profile/story/contributor_role.html
  bricolage/comp/help/de_de/workflow/profile/story/contributors.html
  bricolage/comp/help/de_de/workflow/profile/story/desks.html
  bricolage/comp/help/de_de/workflow/profile/story/keywords.html
  bricolage/comp/help/de_de/workflow/profile/story/new.html
! bricolage/comp/help/de_de/workflow/profile/templates.html
! bricolage/comp/help/de_de/workflow/profile/templates/new.html
  bricolage/comp/help/de_de/workflow/profile/workspace.html
  bricolage/comp/help/de_de/workflow/trail/dhandler
  bricolage/comp/help/dhandler
--- 260,271 ----
  bricolage/comp/help/de_de/workflow/profile/story.html
  bricolage/comp/help/de_de/workflow/profile/story/actions.html
  bricolage/comp/help/de_de/workflow/profile/story/category.html
  bricolage/comp/help/de_de/workflow/profile/story/contributor_role.html
  bricolage/comp/help/de_de/workflow/profile/story/contributors.html
  bricolage/comp/help/de_de/workflow/profile/story/desks.html
  bricolage/comp/help/de_de/workflow/profile/story/keywords.html
  bricolage/comp/help/de_de/workflow/profile/story/new.html
! bricolage/comp/help/de_de/workflow/profile/template.html
  bricolage/comp/help/de_de/workflow/profile/workspace.html
  bricolage/comp/help/de_de/workflow/trail/dhandler
  bricolage/comp/help/dhandler
***************
*** 246,252 ****
  bricolage/comp/help/en_us/admin/manager/contrib.html
  bricolage/comp/help/en_us/admin/manager/contrib_type.html
  bricolage/comp/help/en_us/admin/manager/dest.html
- bricolage/comp/help/en_us/admin/manager/element.html
  bricolage/comp/help/en_us/admin/manager/element_type.html
  bricolage/comp/help/en_us/admin/manager/grp.html
  bricolage/comp/help/en_us/admin/manager/job.html
--- 278,283 ----
***************
*** 267,274 ****
  bricolage/comp/help/en_us/admin/profile/contrib/extend.html
  bricolage/comp/help/en_us/admin/profile/desk.html
  bricolage/comp/help/en_us/admin/profile/dest.html
- bricolage/comp/help/en_us/admin/profile/element.html
- bricolage/comp/help/en_us/admin/profile/element_data.html
  bricolage/comp/help/en_us/admin/profile/element_type.html
  bricolage/comp/help/en_us/admin/profile/grp.html
  bricolage/comp/help/en_us/admin/profile/grp/perm.html
--- 298,303 ----
***************
*** 282,299 ****
  bricolage/comp/help/en_us/admin/profile/workflow.html
  bricolage/comp/help/en_us/workflow/active/media.html
  bricolage/comp/help/en_us/workflow/active/story.html
- bricolage/comp/help/en_us/workflow/active/templates.html
  bricolage/comp/help/en_us/workflow/events/dhandler
  bricolage/comp/help/en_us/workflow/manager/media.html
  bricolage/comp/help/en_us/workflow/manager/story.html
- bricolage/comp/help/en_us/workflow/manager/templates.html
  bricolage/comp/help/en_us/workflow/profile/alerts.html
  bricolage/comp/help/en_us/workflow/profile/alias/media.html
  bricolage/comp/help/en_us/workflow/profile/alias/story.html
  bricolage/comp/help/en_us/workflow/profile/desk.html
  bricolage/comp/help/en_us/workflow/profile/media.html
  bricolage/comp/help/en_us/workflow/profile/media/category.html
- bricolage/comp/help/en_us/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/en_us/workflow/profile/media/contributor_role.html
  bricolage/comp/help/en_us/workflow/profile/media/contributors.html
  bricolage/comp/help/en_us/workflow/profile/media/keywords.html
--- 311,325 ----
***************
*** 302,315 ****
  bricolage/comp/help/en_us/workflow/profile/story.html
  bricolage/comp/help/en_us/workflow/profile/story/actions.html
  bricolage/comp/help/en_us/workflow/profile/story/category.html
- bricolage/comp/help/en_us/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/en_us/workflow/profile/story/contributor_role.html
  bricolage/comp/help/en_us/workflow/profile/story/contributors.html
  bricolage/comp/help/en_us/workflow/profile/story/desks.html
  bricolage/comp/help/en_us/workflow/profile/story/keywords.html
  bricolage/comp/help/en_us/workflow/profile/story/new.html
! bricolage/comp/help/en_us/workflow/profile/templates.html
! bricolage/comp/help/en_us/workflow/profile/templates/new.html
  bricolage/comp/help/en_us/workflow/profile/workspace.html
  bricolage/comp/help/en_us/workflow/trail/dhandler
  bricolage/comp/help/it_it/about.html
--- 328,339 ----
  bricolage/comp/help/en_us/workflow/profile/story.html
  bricolage/comp/help/en_us/workflow/profile/story/actions.html
  bricolage/comp/help/en_us/workflow/profile/story/category.html
  bricolage/comp/help/en_us/workflow/profile/story/contributor_role.html
  bricolage/comp/help/en_us/workflow/profile/story/contributors.html
  bricolage/comp/help/en_us/workflow/profile/story/desks.html
  bricolage/comp/help/en_us/workflow/profile/story/keywords.html
  bricolage/comp/help/en_us/workflow/profile/story/new.html
! bricolage/comp/help/en_us/workflow/profile/template.html
  bricolage/comp/help/en_us/workflow/profile/workspace.html
  bricolage/comp/help/en_us/workflow/trail/dhandler
  bricolage/comp/help/it_it/about.html
***************
*** 330,336 ****
  bricolage/comp/help/it_it/admin/profile/contrib.html
  bricolage/comp/help/it_it/admin/profile/desk.html
  bricolage/comp/help/it_it/admin/profile/dest.html
- bricolage/comp/help/it_it/admin/profile/element_data.html
  bricolage/comp/help/it_it/admin/profile/grp.html
  bricolage/comp/help/it_it/admin/profile/output_channel.html
  bricolage/comp/help/it_it/admin/profile/server.html
--- 354,359 ----
***************
*** 339,360 ****
  bricolage/comp/help/it_it/admin/profile/workflow.html
  bricolage/comp/help/it_it/workflow/active/media.html
  bricolage/comp/help/it_it/workflow/active/story.html
- bricolage/comp/help/it_it/workflow/active/templates.html
  bricolage/comp/help/it_it/workflow/events/dhandler
  bricolage/comp/help/it_it/workflow/manager/media.html
  bricolage/comp/help/it_it/workflow/manager/story.html
- bricolage/comp/help/it_it/workflow/manager/templates.html
  bricolage/comp/help/it_it/workflow/profile/desk.html
  bricolage/comp/help/it_it/workflow/profile/media.html
- bricolage/comp/help/it_it/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/it_it/workflow/profile/media/new.html
  bricolage/comp/help/it_it/workflow/profile/story.html
  bricolage/comp/help/it_it/workflow/profile/story/actions.html
- bricolage/comp/help/it_it/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/it_it/workflow/profile/story/desks.html
  bricolage/comp/help/it_it/workflow/profile/story/new.html
- bricolage/comp/help/it_it/workflow/profile/templates.html
- bricolage/comp/help/it_it/workflow/profile/templates/new.html
  bricolage/comp/help/it_it/workflow/profile/workspace.html
  bricolage/comp/help/it_it/workflow/trail/dhandler
  bricolage/comp/help/km/about.html
--- 362,377 ----
***************
*** 386,393 ****
  bricolage/comp/help/km/admin/profile/contrib/extend.html
  bricolage/comp/help/km/admin/profile/desk.html
  bricolage/comp/help/km/admin/profile/dest.html
- bricolage/comp/help/km/admin/profile/element.html
- bricolage/comp/help/km/admin/profile/element_data.html
  bricolage/comp/help/km/admin/profile/element_type.html
  bricolage/comp/help/km/admin/profile/grp.html
  bricolage/comp/help/km/admin/profile/grp/perm.html
--- 403,408 ----
***************
*** 401,418 ****
  bricolage/comp/help/km/admin/profile/workflow.html
  bricolage/comp/help/km/workflow/active/media.html
  bricolage/comp/help/km/workflow/active/story.html
- bricolage/comp/help/km/workflow/active/templates.html
  bricolage/comp/help/km/workflow/events/dhandler
  bricolage/comp/help/km/workflow/manager/media.html
  bricolage/comp/help/km/workflow/manager/story.html
- bricolage/comp/help/km/workflow/manager/templates.html
  bricolage/comp/help/km/workflow/profile/alerts.html
  bricolage/comp/help/km/workflow/profile/alias/media.html
  bricolage/comp/help/km/workflow/profile/alias/story.html
  bricolage/comp/help/km/workflow/profile/desk.html
  bricolage/comp/help/km/workflow/profile/media.html
  bricolage/comp/help/km/workflow/profile/media/category.html
- bricolage/comp/help/km/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/km/workflow/profile/media/contributor_role.html
  bricolage/comp/help/km/workflow/profile/media/contributors.html
  bricolage/comp/help/km/workflow/profile/media/keywords.html
--- 416,430 ----
***************
*** 420,433 ****
  bricolage/comp/help/km/workflow/profile/story.html
  bricolage/comp/help/km/workflow/profile/story/actions.html
  bricolage/comp/help/km/workflow/profile/story/category.html
- bricolage/comp/help/km/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/km/workflow/profile/story/contributor_role.html
  bricolage/comp/help/km/workflow/profile/story/contributors.html
  bricolage/comp/help/km/workflow/profile/story/desks.html
  bricolage/comp/help/km/workflow/profile/story/keywords.html
  bricolage/comp/help/km/workflow/profile/story/new.html
! bricolage/comp/help/km/workflow/profile/templates.html
! bricolage/comp/help/km/workflow/profile/templates/new.html
  bricolage/comp/help/km/workflow/profile/workspace.html
  bricolage/comp/help/km/workflow/trail/dhandler
  bricolage/comp/help/ko_ko/about.html
--- 432,443 ----
  bricolage/comp/help/km/workflow/profile/story.html
  bricolage/comp/help/km/workflow/profile/story/actions.html
  bricolage/comp/help/km/workflow/profile/story/category.html
  bricolage/comp/help/km/workflow/profile/story/contributor_role.html
  bricolage/comp/help/km/workflow/profile/story/contributors.html
  bricolage/comp/help/km/workflow/profile/story/desks.html
  bricolage/comp/help/km/workflow/profile/story/keywords.html
  bricolage/comp/help/km/workflow/profile/story/new.html
! bricolage/comp/help/km/workflow/profile/template.html
  bricolage/comp/help/km/workflow/profile/workspace.html
  bricolage/comp/help/km/workflow/trail/dhandler
  bricolage/comp/help/ko_ko/about.html
***************
*** 459,466 ****
  bricolage/comp/help/ko_ko/admin/profile/contrib/extend.html
  bricolage/comp/help/ko_ko/admin/profile/desk.html
  bricolage/comp/help/ko_ko/admin/profile/dest.html
- bricolage/comp/help/ko_ko/admin/profile/element.html
- bricolage/comp/help/ko_ko/admin/profile/element_data.html
  bricolage/comp/help/ko_ko/admin/profile/element_type.html
  bricolage/comp/help/ko_ko/admin/profile/grp.html
  bricolage/comp/help/ko_ko/admin/profile/grp/perm.html
--- 469,474 ----
***************
*** 474,491 ****
  bricolage/comp/help/ko_ko/admin/profile/workflow.html
  bricolage/comp/help/ko_ko/workflow/active/media.html
  bricolage/comp/help/ko_ko/workflow/active/story.html
- bricolage/comp/help/ko_ko/workflow/active/templates.html
  bricolage/comp/help/ko_ko/workflow/events/dhandler
  bricolage/comp/help/ko_ko/workflow/manager/media.html
  bricolage/comp/help/ko_ko/workflow/manager/story.html
- bricolage/comp/help/ko_ko/workflow/manager/templates.html
  bricolage/comp/help/ko_ko/workflow/profile/alerts.html
  bricolage/comp/help/ko_ko/workflow/profile/alias/media.html
  bricolage/comp/help/ko_ko/workflow/profile/alias/story.html
  bricolage/comp/help/ko_ko/workflow/profile/desk.html
  bricolage/comp/help/ko_ko/workflow/profile/media.html
  bricolage/comp/help/ko_ko/workflow/profile/media/category.html
- bricolage/comp/help/ko_ko/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/ko_ko/workflow/profile/media/contributor_role.html
  bricolage/comp/help/ko_ko/workflow/profile/media/contributors.html
  bricolage/comp/help/ko_ko/workflow/profile/media/keywords.html
--- 482,496 ----
***************
*** 493,506 ****
  bricolage/comp/help/ko_ko/workflow/profile/story.html
  bricolage/comp/help/ko_ko/workflow/profile/story/actions.html
  bricolage/comp/help/ko_ko/workflow/profile/story/category.html
- bricolage/comp/help/ko_ko/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/ko_ko/workflow/profile/story/contributor_role.html
  bricolage/comp/help/ko_ko/workflow/profile/story/contributors.html
  bricolage/comp/help/ko_ko/workflow/profile/story/desks.html
  bricolage/comp/help/ko_ko/workflow/profile/story/keywords.html
  bricolage/comp/help/ko_ko/workflow/profile/story/new.html
! bricolage/comp/help/ko_ko/workflow/profile/templates.html
! bricolage/comp/help/ko_ko/workflow/profile/templates/new.html
  bricolage/comp/help/ko_ko/workflow/profile/workspace.html
  bricolage/comp/help/ko_ko/workflow/trail/dhandler
  bricolage/comp/help/lo/about.html
--- 498,509 ----
  bricolage/comp/help/ko_ko/workflow/profile/story.html
  bricolage/comp/help/ko_ko/workflow/profile/story/actions.html
  bricolage/comp/help/ko_ko/workflow/profile/story/category.html
  bricolage/comp/help/ko_ko/workflow/profile/story/contributor_role.html
  bricolage/comp/help/ko_ko/workflow/profile/story/contributors.html
  bricolage/comp/help/ko_ko/workflow/profile/story/desks.html
  bricolage/comp/help/ko_ko/workflow/profile/story/keywords.html
  bricolage/comp/help/ko_ko/workflow/profile/story/new.html
! bricolage/comp/help/ko_ko/workflow/profile/template.html
  bricolage/comp/help/ko_ko/workflow/profile/workspace.html
  bricolage/comp/help/ko_ko/workflow/trail/dhandler
  bricolage/comp/help/lo/about.html
***************
*** 532,539 ****
  bricolage/comp/help/lo/admin/profile/contrib/extend.html
  bricolage/comp/help/lo/admin/profile/desk.html
  bricolage/comp/help/lo/admin/profile/dest.html
- bricolage/comp/help/lo/admin/profile/element.html
- bricolage/comp/help/lo/admin/profile/element_data.html
  bricolage/comp/help/lo/admin/profile/element_type.html
  bricolage/comp/help/lo/admin/profile/grp.html
  bricolage/comp/help/lo/admin/profile/grp/perm.html
--- 535,540 ----
***************
*** 547,564 ****
  bricolage/comp/help/lo/admin/profile/workflow.html
  bricolage/comp/help/lo/workflow/active/media.html
  bricolage/comp/help/lo/workflow/active/story.html
- bricolage/comp/help/lo/workflow/active/templates.html
  bricolage/comp/help/lo/workflow/events/dhandler
  bricolage/comp/help/lo/workflow/manager/media.html
  bricolage/comp/help/lo/workflow/manager/story.html
- bricolage/comp/help/lo/workflow/manager/templates.html
  bricolage/comp/help/lo/workflow/profile/alerts.html
  bricolage/comp/help/lo/workflow/profile/alias/media.html
  bricolage/comp/help/lo/workflow/profile/alias/story.html
  bricolage/comp/help/lo/workflow/profile/desk.html
  bricolage/comp/help/lo/workflow/profile/media.html
  bricolage/comp/help/lo/workflow/profile/media/category.html
- bricolage/comp/help/lo/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/lo/workflow/profile/media/contributor_role.html
  bricolage/comp/help/lo/workflow/profile/media/contributors.html
  bricolage/comp/help/lo/workflow/profile/media/keywords.html
--- 548,562 ----
***************
*** 566,579 ****
  bricolage/comp/help/lo/workflow/profile/story.html
  bricolage/comp/help/lo/workflow/profile/story/actions.html
  bricolage/comp/help/lo/workflow/profile/story/category.html
- bricolage/comp/help/lo/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/lo/workflow/profile/story/contributor_role.html
  bricolage/comp/help/lo/workflow/profile/story/contributors.html
  bricolage/comp/help/lo/workflow/profile/story/desks.html
  bricolage/comp/help/lo/workflow/profile/story/keywords.html
  bricolage/comp/help/lo/workflow/profile/story/new.html
! bricolage/comp/help/lo/workflow/profile/templates.html
! bricolage/comp/help/lo/workflow/profile/templates/new.html
  bricolage/comp/help/lo/workflow/profile/workspace.html
  bricolage/comp/help/lo/workflow/trail/dhandler
  bricolage/comp/help/my/about.html
--- 564,575 ----
  bricolage/comp/help/lo/workflow/profile/story.html
  bricolage/comp/help/lo/workflow/profile/story/actions.html
  bricolage/comp/help/lo/workflow/profile/story/category.html
  bricolage/comp/help/lo/workflow/profile/story/contributor_role.html
  bricolage/comp/help/lo/workflow/profile/story/contributors.html
  bricolage/comp/help/lo/workflow/profile/story/desks.html
  bricolage/comp/help/lo/workflow/profile/story/keywords.html
  bricolage/comp/help/lo/workflow/profile/story/new.html
! bricolage/comp/help/lo/workflow/profile/template.html
  bricolage/comp/help/lo/workflow/profile/workspace.html
  bricolage/comp/help/lo/workflow/trail/dhandler
  bricolage/comp/help/my/about.html
***************
*** 605,612 ****
  bricolage/comp/help/my/admin/profile/contrib/extend.html
  bricolage/comp/help/my/admin/profile/desk.html
  bricolage/comp/help/my/admin/profile/dest.html
- bricolage/comp/help/my/admin/profile/element.html
- bricolage/comp/help/my/admin/profile/element_data.html
  bricolage/comp/help/my/admin/profile/element_type.html
  bricolage/comp/help/my/admin/profile/grp.html
  bricolage/comp/help/my/admin/profile/grp/perm.html
--- 601,606 ----
***************
*** 620,637 ****
  bricolage/comp/help/my/admin/profile/workflow.html
  bricolage/comp/help/my/workflow/active/media.html
  bricolage/comp/help/my/workflow/active/story.html
- bricolage/comp/help/my/workflow/active/templates.html
  bricolage/comp/help/my/workflow/events/dhandler
  bricolage/comp/help/my/workflow/manager/media.html
  bricolage/comp/help/my/workflow/manager/story.html
- bricolage/comp/help/my/workflow/manager/templates.html
  bricolage/comp/help/my/workflow/profile/alerts.html
  bricolage/comp/help/my/workflow/profile/alias/media.html
  bricolage/comp/help/my/workflow/profile/alias/story.html
  bricolage/comp/help/my/workflow/profile/desk.html
  bricolage/comp/help/my/workflow/profile/media.html
  bricolage/comp/help/my/workflow/profile/media/category.html
- bricolage/comp/help/my/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/my/workflow/profile/media/contributor_role.html
  bricolage/comp/help/my/workflow/profile/media/contributors.html
  bricolage/comp/help/my/workflow/profile/media/keywords.html
--- 614,628 ----
***************
*** 639,652 ****
  bricolage/comp/help/my/workflow/profile/story.html
  bricolage/comp/help/my/workflow/profile/story/actions.html
  bricolage/comp/help/my/workflow/profile/story/category.html
- bricolage/comp/help/my/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/my/workflow/profile/story/contributor_role.html
  bricolage/comp/help/my/workflow/profile/story/contributors.html
  bricolage/comp/help/my/workflow/profile/story/desks.html
  bricolage/comp/help/my/workflow/profile/story/keywords.html
  bricolage/comp/help/my/workflow/profile/story/new.html
! bricolage/comp/help/my/workflow/profile/templates.html
! bricolage/comp/help/my/workflow/profile/templates/new.html
  bricolage/comp/help/my/workflow/profile/workspace.html
  bricolage/comp/help/my/workflow/trail/dhandler
  bricolage/comp/help/pt_pt/about.html
--- 630,641 ----
  bricolage/comp/help/my/workflow/profile/story.html
  bricolage/comp/help/my/workflow/profile/story/actions.html
  bricolage/comp/help/my/workflow/profile/story/category.html
  bricolage/comp/help/my/workflow/profile/story/contributor_role.html
  bricolage/comp/help/my/workflow/profile/story/contributors.html
  bricolage/comp/help/my/workflow/profile/story/desks.html
  bricolage/comp/help/my/workflow/profile/story/keywords.html
  bricolage/comp/help/my/workflow/profile/story/new.html
! bricolage/comp/help/my/workflow/profile/template.html
  bricolage/comp/help/my/workflow/profile/workspace.html
  bricolage/comp/help/my/workflow/trail/dhandler
  bricolage/comp/help/pt_pt/about.html
***************
*** 667,673 ****
  bricolage/comp/help/pt_pt/admin/profile/contrib.html
  bricolage/comp/help/pt_pt/admin/profile/desk.html
  bricolage/comp/help/pt_pt/admin/profile/dest.html
- bricolage/comp/help/pt_pt/admin/profile/element_data.html
  bricolage/comp/help/pt_pt/admin/profile/grp.html
  bricolage/comp/help/pt_pt/admin/profile/output_channel.html
  bricolage/comp/help/pt_pt/admin/profile/server.html
--- 656,661 ----
***************
*** 676,697 ****
  bricolage/comp/help/pt_pt/admin/profile/workflow.html
  bricolage/comp/help/pt_pt/workflow/active/media.html
  bricolage/comp/help/pt_pt/workflow/active/story.html
- bricolage/comp/help/pt_pt/workflow/active/templates.html
  bricolage/comp/help/pt_pt/workflow/events/dhandler
  bricolage/comp/help/pt_pt/workflow/manager/media.html
  bricolage/comp/help/pt_pt/workflow/manager/story.html
- bricolage/comp/help/pt_pt/workflow/manager/templates.html
  bricolage/comp/help/pt_pt/workflow/profile/desk.html
  bricolage/comp/help/pt_pt/workflow/profile/media.html
- bricolage/comp/help/pt_pt/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/pt_pt/workflow/profile/media/new.html
  bricolage/comp/help/pt_pt/workflow/profile/story.html
  bricolage/comp/help/pt_pt/workflow/profile/story/actions.html
- bricolage/comp/help/pt_pt/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/pt_pt/workflow/profile/story/desks.html
  bricolage/comp/help/pt_pt/workflow/profile/story/new.html
- bricolage/comp/help/pt_pt/workflow/profile/templates.html
- bricolage/comp/help/pt_pt/workflow/profile/templates/new.html
  bricolage/comp/help/pt_pt/workflow/profile/workspace.html
  bricolage/comp/help/pt_pt/workflow/trail/dhandler
  bricolage/comp/help/ru_ru/about.html
--- 664,679 ----
***************
*** 720,727 ****
  bricolage/comp/help/ru_ru/admin/profile/contrib.html
  bricolage/comp/help/ru_ru/admin/profile/desk.html
  bricolage/comp/help/ru_ru/admin/profile/dest.html
- bricolage/comp/help/ru_ru/admin/profile/element.html
- bricolage/comp/help/ru_ru/admin/profile/element_data.html
  bricolage/comp/help/ru_ru/admin/profile/element_type.html
  bricolage/comp/help/ru_ru/admin/profile/grp.html
  bricolage/comp/help/ru_ru/admin/profile/keyword.html
--- 702,707 ----
***************
*** 738,754 ****
  bricolage/comp/help/ru_ru/admin/profile/grp/perm.html
  bricolage/comp/help/ru_ru/workflow/active/media.html
  bricolage/comp/help/ru_ru/workflow/active/story.html
- bricolage/comp/help/ru_ru/workflow/active/templates.html
  bricolage/comp/help/ru_ru/workflow/events/dhandler
  bricolage/comp/help/ru_ru/workflow/manager/media.html
  bricolage/comp/help/ru_ru/workflow/manager/story.html
- bricolage/comp/help/ru_ru/workflow/manager/templates.html
  bricolage/comp/help/ru_ru/workflow/profile/alerts.html
  bricolage/comp/help/ru_ru/workflow/profile/desk.html
  bricolage/comp/help/ru_ru/workflow/profile/media.html
  bricolage/comp/help/ru_ru/workflow/profile/publish.html
  bricolage/comp/help/ru_ru/workflow/profile/story.html
- bricolage/comp/help/ru_ru/workflow/profile/templates.html
  bricolage/comp/help/ru_ru/workflow/profile/workspace.html
  bricolage/comp/help/ru_ru/workflow/profile/alias/media.html
  bricolage/comp/help/ru_ru/workflow/profile/alias/story.html
--- 718,731 ----
***************
*** 757,763 ****
  bricolage/comp/help/ru_ru/workflow/profile/media/contributors.html
  bricolage/comp/help/ru_ru/workflow/profile/media/keywords.html
  bricolage/comp/help/ru_ru/workflow/profile/media/new.html
- bricolage/comp/help/ru_ru/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/ru_ru/workflow/profile/story/actions.html
  bricolage/comp/help/ru_ru/workflow/profile/story/category.html
  bricolage/comp/help/ru_ru/workflow/profile/story/contributor_role.html
--- 734,739 ----
***************
*** 765,772 ****
  bricolage/comp/help/ru_ru/workflow/profile/story/desks.html
  bricolage/comp/help/ru_ru/workflow/profile/story/keywords.html
  bricolage/comp/help/ru_ru/workflow/profile/story/new.html
! bricolage/comp/help/ru_ru/workflow/profile/story/container/edit_super_bulk.html
! bricolage/comp/help/ru_ru/workflow/profile/templates/new.html
  bricolage/comp/help/ru_ru/workflow/trail/dhandler
  bricolage/comp/help/ug/about.html
  bricolage/comp/help/ug/admin/control/change_user.html
--- 741,747 ----
  bricolage/comp/help/ru_ru/workflow/profile/story/desks.html
  bricolage/comp/help/ru_ru/workflow/profile/story/keywords.html
  bricolage/comp/help/ru_ru/workflow/profile/story/new.html
! bricolage/comp/help/ru_ru/workflow/profile/template.html
  bricolage/comp/help/ru_ru/workflow/trail/dhandler
  bricolage/comp/help/ug/about.html
  bricolage/comp/help/ug/admin/control/change_user.html
***************
*** 797,804 ****
  bricolage/comp/help/ug/admin/profile/contrib/extend.html
  bricolage/comp/help/ug/admin/profile/desk.html
  bricolage/comp/help/ug/admin/profile/dest.html
- bricolage/comp/help/ug/admin/profile/element.html
- bricolage/comp/help/ug/admin/profile/element_data.html
  bricolage/comp/help/ug/admin/profile/element_type.html
  bricolage/comp/help/ug/admin/profile/grp.html
  bricolage/comp/help/ug/admin/profile/grp/perm.html
--- 772,777 ----
***************
*** 812,829 ****
  bricolage/comp/help/ug/admin/profile/workflow.html
  bricolage/comp/help/ug/workflow/active/media.html
  bricolage/comp/help/ug/workflow/active/story.html
- bricolage/comp/help/ug/workflow/active/templates.html
  bricolage/comp/help/ug/workflow/events/dhandler
  bricolage/comp/help/ug/workflow/manager/media.html
  bricolage/comp/help/ug/workflow/manager/story.html
- bricolage/comp/help/ug/workflow/manager/templates.html
  bricolage/comp/help/ug/workflow/profile/alerts.html
  bricolage/comp/help/ug/workflow/profile/alias/media.html
  bricolage/comp/help/ug/workflow/profile/alias/story.html
  bricolage/comp/help/ug/workflow/profile/desk.html
  bricolage/comp/help/ug/workflow/profile/media.html
  bricolage/comp/help/ug/workflow/profile/media/category.html
- bricolage/comp/help/ug/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/ug/workflow/profile/media/contributor_role.html
  bricolage/comp/help/ug/workflow/profile/media/contributors.html
  bricolage/comp/help/ug/workflow/profile/media/keywords.html
--- 785,799 ----
***************
*** 831,844 ****
  bricolage/comp/help/ug/workflow/profile/story.html
  bricolage/comp/help/ug/workflow/profile/story/actions.html
  bricolage/comp/help/ug/workflow/profile/story/category.html
- bricolage/comp/help/ug/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/ug/workflow/profile/story/contributor_role.html
  bricolage/comp/help/ug/workflow/profile/story/contributors.html
  bricolage/comp/help/ug/workflow/profile/story/desks.html
  bricolage/comp/help/ug/workflow/profile/story/keywords.html
  bricolage/comp/help/ug/workflow/profile/story/new.html
! bricolage/comp/help/ug/workflow/profile/templates.html
! bricolage/comp/help/ug/workflow/profile/templates/new.html
  bricolage/comp/help/ug/workflow/profile/workspace.html
  bricolage/comp/help/ug/workflow/trail/dhandler
  bricolage/comp/help/vi_vn/about.html
--- 801,812 ----
  bricolage/comp/help/ug/workflow/profile/story.html
  bricolage/comp/help/ug/workflow/profile/story/actions.html
  bricolage/comp/help/ug/workflow/profile/story/category.html
  bricolage/comp/help/ug/workflow/profile/story/contributor_role.html
  bricolage/comp/help/ug/workflow/profile/story/contributors.html
  bricolage/comp/help/ug/workflow/profile/story/desks.html
  bricolage/comp/help/ug/workflow/profile/story/keywords.html
  bricolage/comp/help/ug/workflow/profile/story/new.html
! bricolage/comp/help/ug/workflow/profile/template.html
  bricolage/comp/help/ug/workflow/profile/workspace.html
  bricolage/comp/help/ug/workflow/trail/dhandler
  bricolage/comp/help/vi_vn/about.html
***************
*** 870,877 ****
  bricolage/comp/help/vi_vn/admin/profile/contrib/extend.html
  bricolage/comp/help/vi_vn/admin/profile/desk.html
  bricolage/comp/help/vi_vn/admin/profile/dest.html
- bricolage/comp/help/vi_vn/admin/profile/element.html
- bricolage/comp/help/vi_vn/admin/profile/element_data.html
  bricolage/comp/help/vi_vn/admin/profile/element_type.html
  bricolage/comp/help/vi_vn/admin/profile/grp.html
  bricolage/comp/help/vi_vn/admin/profile/grp/perm.html
--- 838,843 ----
***************
*** 885,902 ****
  bricolage/comp/help/vi_vn/admin/profile/workflow.html
  bricolage/comp/help/vi_vn/workflow/active/media.html
  bricolage/comp/help/vi_vn/workflow/active/story.html
- bricolage/comp/help/vi_vn/workflow/active/templates.html
  bricolage/comp/help/vi_vn/workflow/events/dhandler
  bricolage/comp/help/vi_vn/workflow/manager/media.html
  bricolage/comp/help/vi_vn/workflow/manager/story.html
- bricolage/comp/help/vi_vn/workflow/manager/templates.html
  bricolage/comp/help/vi_vn/workflow/profile/alerts.html
  bricolage/comp/help/vi_vn/workflow/profile/alias/media.html
  bricolage/comp/help/vi_vn/workflow/profile/alias/story.html
  bricolage/comp/help/vi_vn/workflow/profile/desk.html
  bricolage/comp/help/vi_vn/workflow/profile/media.html
  bricolage/comp/help/vi_vn/workflow/profile/media/category.html
- bricolage/comp/help/vi_vn/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/vi_vn/workflow/profile/media/contributor_role.html
  bricolage/comp/help/vi_vn/workflow/profile/media/contributors.html
  bricolage/comp/help/vi_vn/workflow/profile/media/keywords.html
--- 851,865 ----
***************
*** 904,917 ****
  bricolage/comp/help/vi_vn/workflow/profile/story.html
  bricolage/comp/help/vi_vn/workflow/profile/story/actions.html
  bricolage/comp/help/vi_vn/workflow/profile/story/category.html
- bricolage/comp/help/vi_vn/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/vi_vn/workflow/profile/story/contributor_role.html
  bricolage/comp/help/vi_vn/workflow/profile/story/contributors.html
  bricolage/comp/help/vi_vn/workflow/profile/story/desks.html
  bricolage/comp/help/vi_vn/workflow/profile/story/keywords.html
  bricolage/comp/help/vi_vn/workflow/profile/story/new.html
! bricolage/comp/help/vi_vn/workflow/profile/templates.html
! bricolage/comp/help/vi_vn/workflow/profile/templates/new.html
  bricolage/comp/help/vi_vn/workflow/profile/workspace.html
  bricolage/comp/help/vi_vn/workflow/trail/dhandler
  bricolage/comp/help/zh_cn/about.html
--- 867,878 ----
  bricolage/comp/help/vi_vn/workflow/profile/story.html
  bricolage/comp/help/vi_vn/workflow/profile/story/actions.html
  bricolage/comp/help/vi_vn/workflow/profile/story/category.html
  bricolage/comp/help/vi_vn/workflow/profile/story/contributor_role.html
  bricolage/comp/help/vi_vn/workflow/profile/story/contributors.html
  bricolage/comp/help/vi_vn/workflow/profile/story/desks.html
  bricolage/comp/help/vi_vn/workflow/profile/story/keywords.html
  bricolage/comp/help/vi_vn/workflow/profile/story/new.html
! bricolage/comp/help/vi_vn/workflow/profile/template.html
  bricolage/comp/help/vi_vn/workflow/profile/workspace.html
  bricolage/comp/help/vi_vn/workflow/trail/dhandler
  bricolage/comp/help/zh_cn/about.html
***************
*** 943,950 ****
  bricolage/comp/help/zh_cn/admin/profile/contrib/extend.html
  bricolage/comp/help/zh_cn/admin/profile/desk.html
  bricolage/comp/help/zh_cn/admin/profile/dest.html
- bricolage/comp/help/zh_cn/admin/profile/element.html
- bricolage/comp/help/zh_cn/admin/profile/element_data.html
  bricolage/comp/help/zh_cn/admin/profile/element_type.html
  bricolage/comp/help/zh_cn/admin/profile/grp.html
  bricolage/comp/help/zh_cn/admin/profile/grp/perm.html
--- 904,909 ----
***************
*** 958,975 ****
  bricolage/comp/help/zh_cn/admin/profile/workflow.html
  bricolage/comp/help/zh_cn/workflow/active/media.html
  bricolage/comp/help/zh_cn/workflow/active/story.html
- bricolage/comp/help/zh_cn/workflow/active/templates.html
  bricolage/comp/help/zh_cn/workflow/events/dhandler
  bricolage/comp/help/zh_cn/workflow/manager/media.html
  bricolage/comp/help/zh_cn/workflow/manager/story.html
- bricolage/comp/help/zh_cn/workflow/manager/templates.html
  bricolage/comp/help/zh_cn/workflow/profile/alerts.html
  bricolage/comp/help/zh_cn/workflow/profile/alias/media.html
  bricolage/comp/help/zh_cn/workflow/profile/alias/story.html
  bricolage/comp/help/zh_cn/workflow/profile/desk.html
  bricolage/comp/help/zh_cn/workflow/profile/media.html
  bricolage/comp/help/zh_cn/workflow/profile/media/category.html
- bricolage/comp/help/zh_cn/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/zh_cn/workflow/profile/media/contributor_role.html
  bricolage/comp/help/zh_cn/workflow/profile/media/contributors.html
  bricolage/comp/help/zh_cn/workflow/profile/media/keywords.html
--- 917,931 ----
***************
*** 977,991 ****
  bricolage/comp/help/zh_cn/workflow/profile/story.html
  bricolage/comp/help/zh_cn/workflow/profile/story/actions.html
  bricolage/comp/help/zh_cn/workflow/profile/story/category.html
- bricolage/comp/help/zh_cn/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/zh_cn/workflow/profile/story/contributor_role.html
  bricolage/comp/help/zh_cn/workflow/profile/story/contributors.html
  bricolage/comp/help/zh_cn/workflow/profile/story/desks.html
  bricolage/comp/help/zh_cn/workflow/profile/story/keywords.html
  bricolage/comp/help/zh_cn/workflow/profile/story/new.html
! bricolage/comp/help/zh_cn/workflow/profile/templates.html
! bricolage/comp/help/zh_cn/workflow/profile/templates/new.html
! bricolage/comp/help/zh_cn/workflow/profile/workspace.html
  bricolage/comp/help/zh_cn/workflow/trail/dhandler
  bricolage/comp/help/zh_hk/about.html
  bricolage/comp/help/zh_hk/admin/control/change_user.html
--- 933,944 ----
  bricolage/comp/help/zh_cn/workflow/profile/story.html
  bricolage/comp/help/zh_cn/workflow/profile/story/actions.html
  bricolage/comp/help/zh_cn/workflow/profile/story/category.html
  bricolage/comp/help/zh_cn/workflow/profile/story/contributor_role.html
  bricolage/comp/help/zh_cn/workflow/profile/story/contributors.html
  bricolage/comp/help/zh_cn/workflow/profile/story/desks.html
  bricolage/comp/help/zh_cn/workflow/profile/story/keywords.html
  bricolage/comp/help/zh_cn/workflow/profile/story/new.html
! bricolage/comp/help/zh_cn/workflow/profile/template.html
  bricolage/comp/help/zh_cn/workflow/trail/dhandler
  bricolage/comp/help/zh_hk/about.html
  bricolage/comp/help/zh_hk/admin/control/change_user.html
***************
*** 1005,1011 ****
  bricolage/comp/help/zh_hk/admin/profile/contrib.html
  bricolage/comp/help/zh_hk/admin/profile/desk.html
  bricolage/comp/help/zh_hk/admin/profile/dest.html
- bricolage/comp/help/zh_hk/admin/profile/element_data.html
  bricolage/comp/help/zh_hk/admin/profile/grp.html
  bricolage/comp/help/zh_hk/admin/profile/output_channel.html
  bricolage/comp/help/zh_hk/admin/profile/server.html
--- 958,963 ----
***************
*** 1014,1035 ****
  bricolage/comp/help/zh_hk/admin/profile/workflow.html
  bricolage/comp/help/zh_hk/workflow/active/media.html
  bricolage/comp/help/zh_hk/workflow/active/story.html
- bricolage/comp/help/zh_hk/workflow/active/templates.html
  bricolage/comp/help/zh_hk/workflow/events/dhandler
  bricolage/comp/help/zh_hk/workflow/manager/media.html
  bricolage/comp/help/zh_hk/workflow/manager/story.html
- bricolage/comp/help/zh_hk/workflow/manager/templates.html
  bricolage/comp/help/zh_hk/workflow/profile/desk.html
  bricolage/comp/help/zh_hk/workflow/profile/media.html
- bricolage/comp/help/zh_hk/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/zh_hk/workflow/profile/media/new.html
  bricolage/comp/help/zh_hk/workflow/profile/story.html
  bricolage/comp/help/zh_hk/workflow/profile/story/actions.html
- bricolage/comp/help/zh_hk/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/zh_hk/workflow/profile/story/desks.html
  bricolage/comp/help/zh_hk/workflow/profile/story/new.html
- bricolage/comp/help/zh_hk/workflow/profile/templates.html
- bricolage/comp/help/zh_hk/workflow/profile/templates/new.html
  bricolage/comp/help/zh_hk/workflow/profile/workspace.html
  bricolage/comp/help/zh_hk/workflow/trail/dhandler
  bricolage/comp/help/zh_tw/about.html
--- 966,981 ----
***************
*** 1050,1056 ****
  bricolage/comp/help/zh_tw/admin/profile/contrib.html
  bricolage/comp/help/zh_tw/admin/profile/desk.html
  bricolage/comp/help/zh_tw/admin/profile/dest.html
- bricolage/comp/help/zh_tw/admin/profile/element_data.html
  bricolage/comp/help/zh_tw/admin/profile/grp.html
  bricolage/comp/help/zh_tw/admin/profile/output_channel.html
  bricolage/comp/help/zh_tw/admin/profile/server.html
--- 996,1001 ----
***************
*** 1059,1084 ****
  bricolage/comp/help/zh_tw/admin/profile/workflow.html
  bricolage/comp/help/zh_tw/workflow/active/media.html
  bricolage/comp/help/zh_tw/workflow/active/story.html
- bricolage/comp/help/zh_tw/workflow/active/templates.html
  bricolage/comp/help/zh_tw/workflow/events/dhandler
  bricolage/comp/help/zh_tw/workflow/manager/media.html
  bricolage/comp/help/zh_tw/workflow/manager/story.html
- bricolage/comp/help/zh_tw/workflow/manager/templates.html
  bricolage/comp/help/zh_tw/workflow/profile/desk.html
  bricolage/comp/help/zh_tw/workflow/profile/media.html
- bricolage/comp/help/zh_tw/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/help/zh_tw/workflow/profile/media/new.html
  bricolage/comp/help/zh_tw/workflow/profile/story.html
  bricolage/comp/help/zh_tw/workflow/profile/story/actions.html
- bricolage/comp/help/zh_tw/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/help/zh_tw/workflow/profile/story/desks.html
  bricolage/comp/help/zh_tw/workflow/profile/story/new.html
- bricolage/comp/help/zh_tw/workflow/profile/templates.html
- bricolage/comp/help/zh_tw/workflow/profile/templates/new.html
  bricolage/comp/help/zh_tw/workflow/profile/workspace.html
  bricolage/comp/help/zh_tw/workflow/trail/dhandler
- bricolage/comp/lib/process/handleDelete.mc
- bricolage/comp/lib/process/updateForm.mc
  bricolage/comp/lib/util/back_button.mc
  bricolage/comp/lib/util/clear.mc
  bricolage/comp/lib/util/dumpArray.mc
--- 1004,1021 ----
***************
*** 1090,1096 ****
  bricolage/comp/lib/util/status_msg.mc
  bricolage/comp/login/dhandler
  bricolage/comp/login/welcome.html
- bricolage/comp/media/css/style.css
  bricolage/comp/media/css/bo.css
  bricolage/comp/media/css/de_de.css
  bricolage/comp/media/css/en_us.css
--- 1027,1032 ----
***************
*** 1100,1141 ****
  bricolage/comp/media/css/lo.css
  bricolage/comp/media/css/my.css
  bricolage/comp/media/css/pt_pt.css
  bricolage/comp/media/css/ug.css
  bricolage/comp/media/css/vi_vn.css
  bricolage/comp/media/css/zh_cn.css
  bricolage/comp/media/css/zh_hk.css
  bricolage/comp/media/css/zh_tw.css
- bricolage/comp/media/images/006666_curve_left.gif
- bricolage/comp/media/images/006666_curve_right.gif
- bricolage/comp/media/images/646430_arrow_open.gif
- bricolage/comp/media/images/646430_curve_left.gif
- bricolage/comp/media/images/646430_curve_right.gif
- bricolage/comp/media/images/663366_curve_left.gif
- bricolage/comp/media/images/663366_curve_right.gif
- bricolage/comp/media/images/666633_arrow_open.gif
- bricolage/comp/media/images/666633_curve_left.gif
- bricolage/comp/media/images/666633_curve_right.gif
- bricolage/comp/media/images/669999_curve_left.gif
- bricolage/comp/media/images/669999_curve_right.gif
- bricolage/comp/media/images/999966_arrow_closed.gif
- bricolage/comp/media/images/999966_arrow_open.gif
- bricolage/comp/media/images/999966_curve_left.gif
- bricolage/comp/media/images/999966_curve_right.gif
- bricolage/comp/media/images/CC6633_arrow_open.gif
- bricolage/comp/media/images/CC6633_curve_left.gif
- bricolage/comp/media/images/CC6633_curve_right.gif
- bricolage/comp/media/images/CC9900_curve_left.gif
- bricolage/comp/media/images/CC9900_curve_right.gif
- bricolage/comp/media/images/CCCC99_curve_left.gif
- bricolage/comp/media/images/CCCC99_curve_right.gif
- bricolage/comp/media/images/ID_bottom.gif
- bricolage/comp/media/images/ID_bottom2.gif
- bricolage/comp/media/images/ID_right.gif
  bricolage/comp/media/images/bang_red.gif
- bricolage/comp/media/images/bo/D_green.gif
- bricolage/comp/media/images/bo/D_red.gif
- bricolage/comp/media/images/bo/P_green.gif
- bricolage/comp/media/images/bo/P_red.gif
  bricolage/comp/media/images/bo/acknowledge_all_red.gif
  bricolage/comp/media/images/bo/acknowledge_checked_red.gif
  bricolage/comp/media/images/bo/add_category_lgreen.gif
--- 1036,1049 ----
  bricolage/comp/media/css/lo.css
  bricolage/comp/media/css/my.css
  bricolage/comp/media/css/pt_pt.css
+ bricolage/comp/media/css/style.css
+ bricolage/comp/media/css/style-nav.css
  bricolage/comp/media/css/ug.css
  bricolage/comp/media/css/vi_vn.css
  bricolage/comp/media/css/zh_cn.css
  bricolage/comp/media/css/zh_hk.css
  bricolage/comp/media/css/zh_tw.css
  bricolage/comp/media/images/bang_red.gif
  bricolage/comp/media/images/bo/acknowledge_all_red.gif
  bricolage/comp/media/images/bo/acknowledge_checked_red.gif
  bricolage/comp/media/images/bo/add_category_lgreen.gif
***************
*** 1149,1155 ****
  bricolage/comp/media/images/bo/add_template_code_lgreen.gif
  bricolage/comp/media/images/bo/add_to_form_lgreen.gif
  bricolage/comp/media/images/bo/add_to_list_lgreen.gif
- bricolage/comp/media/images/bo/bricolage.gif
  bricolage/comp/media/images/bo/bulk_edit_lgreen.gif
  bricolage/comp/media/images/bo/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/bo/cancel_checked_red.gif
--- 1057,1062 ----
***************
*** 1187,1193 ****
  bricolage/comp/media/images/bo/preview_lgreen.gif
  bricolage/comp/media/images/bo/publish_assets_red.gif
  bricolage/comp/media/images/bo/publish_checked_red.gif
- bricolage/comp/media/images/bo/recount_lgreen.gif
  bricolage/comp/media/images/bo/related_stories_dgreen.gif
  bricolage/comp/media/images/bo/remove_from_list_red.gif
  bricolage/comp/media/images/bo/reorder_lgreen.gif
--- 1094,1099 ----
***************
*** 1205,1226 ****
  bricolage/comp/media/images/bo/templates_dgreen.gif
  bricolage/comp/media/images/bo/upload_red.gif
  bricolage/comp/media/images/bo/use_this_role_lgreen.gif
  bricolage/comp/media/images/bo/view_dgreen.gif
- bricolage/comp/media/images/bo/view_log_teal.gif
- bricolage/comp/media/images/bo/view_notes_dgreen.gif
- bricolage/comp/media/images/bo/view_notes_teal.gif
- bricolage/comp/media/images/bo/view_text_dgreen.gif
  bricolage/comp/media/images/bo/view_trail_dgreen.gif
  bricolage/comp/media/images/bo/view_trail_teal.gif
  bricolage/comp/media/images/bo/workflow_admin.gif
  bricolage/comp/media/images/bo/workflow_workflow.gif
- bricolage/comp/media/images/box_edge_bottom.gif
- bricolage/comp/media/images/box_edge_right.gif
  bricolage/comp/media/images/bricicon.ico
- bricolage/comp/media/images/de_de/D_green.gif
- bricolage/comp/media/images/de_de/D_red.gif
- bricolage/comp/media/images/de_de/P_green.gif
- bricolage/comp/media/images/de_de/P_red.gif
  bricolage/comp/media/images/de_de/acknowledge_all_red.gif
  bricolage/comp/media/images/de_de/acknowledge_checked_red.gif
  bricolage/comp/media/images/de_de/add_category_lgreen.gif
--- 1111,1123 ----
  bricolage/comp/media/images/bo/templates_dgreen.gif
  bricolage/comp/media/images/bo/upload_red.gif
  bricolage/comp/media/images/bo/use_this_role_lgreen.gif
+ bricolage/comp/media/images/bo/view_diff.gif
  bricolage/comp/media/images/bo/view_dgreen.gif
  bricolage/comp/media/images/bo/view_trail_dgreen.gif
  bricolage/comp/media/images/bo/view_trail_teal.gif
  bricolage/comp/media/images/bo/workflow_admin.gif
  bricolage/comp/media/images/bo/workflow_workflow.gif
  bricolage/comp/media/images/bricicon.ico
  bricolage/comp/media/images/de_de/acknowledge_all_red.gif
  bricolage/comp/media/images/de_de/acknowledge_checked_red.gif
  bricolage/comp/media/images/de_de/add_category_lgreen.gif
***************
*** 1234,1240 ****
  bricolage/comp/media/images/de_de/add_template_code_lgreen.gif
  bricolage/comp/media/images/de_de/add_to_form_lgreen.gif
  bricolage/comp/media/images/de_de/add_to_list_lgreen.gif
- bricolage/comp/media/images/de_de/bricolage.gif
  bricolage/comp/media/images/de_de/bulk_edit_lgreen.gif
  bricolage/comp/media/images/de_de/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/de_de/cancel_checked_red.gif
--- 1131,1136 ----
***************
*** 1273,1279 ****
  bricolage/comp/media/images/de_de/preview_lgreen.gif
  bricolage/comp/media/images/de_de/publish_assets_red.gif
  bricolage/comp/media/images/de_de/publish_checked_red.gif
- bricolage/comp/media/images/de_de/recount_lgreen.gif
  bricolage/comp/media/images/de_de/related_stories_dgreen.gif
  bricolage/comp/media/images/de_de/remove_from_list_red.gif
  bricolage/comp/media/images/de_de/reorder_lgreen.gif
--- 1169,1174 ----
***************
*** 1293,1313 ****
  bricolage/comp/media/images/de_de/upload_red.gif
  bricolage/comp/media/images/de_de/use_this_role_lgreen.gif
  bricolage/comp/media/images/de_de/view_dgreen.gif
! bricolage/comp/media/images/de_de/view_log_teal.gif
! bricolage/comp/media/images/de_de/view_notes_dgreen.gif
! bricolage/comp/media/images/de_de/view_notes_teal.gif
! bricolage/comp/media/images/de_de/view_text_dgreen.gif
  bricolage/comp/media/images/de_de/view_trail_dgreen.gif
  bricolage/comp/media/images/de_de/view_trail_teal.gif
  bricolage/comp/media/images/de_de/workflow_admin.gif
  bricolage/comp/media/images/de_de/workflow_workflow.gif
  bricolage/comp/media/images/dkgreen_arrow_open.gif
- bricolage/comp/media/images/dkgreen_curve_left.gif
- bricolage/comp/media/images/dkgreen_curve_right.gif
- bricolage/comp/media/images/en_us/D_green.gif
- bricolage/comp/media/images/en_us/D_red.gif
- bricolage/comp/media/images/en_us/P_green.gif
- bricolage/comp/media/images/en_us/P_red.gif
  bricolage/comp/media/images/en_us/acknowledge_all_red.gif
  bricolage/comp/media/images/en_us/acknowledge_checked_red.gif
  bricolage/comp/media/images/en_us/add_category_lgreen.gif
--- 1188,1199 ----
  bricolage/comp/media/images/de_de/upload_red.gif
  bricolage/comp/media/images/de_de/use_this_role_lgreen.gif
  bricolage/comp/media/images/de_de/view_dgreen.gif
! bricolage/comp/media/images/de_de/view_diff.gif
  bricolage/comp/media/images/de_de/view_trail_dgreen.gif
  bricolage/comp/media/images/de_de/view_trail_teal.gif
  bricolage/comp/media/images/de_de/workflow_admin.gif
  bricolage/comp/media/images/de_de/workflow_workflow.gif
  bricolage/comp/media/images/dkgreen_arrow_open.gif
  bricolage/comp/media/images/en_us/acknowledge_all_red.gif
  bricolage/comp/media/images/en_us/acknowledge_checked_red.gif
  bricolage/comp/media/images/en_us/add_category_lgreen.gif
***************
*** 1321,1327 ****
  bricolage/comp/media/images/en_us/add_template_code_lgreen.gif
  bricolage/comp/media/images/en_us/add_to_form_lgreen.gif
  bricolage/comp/media/images/en_us/add_to_list_lgreen.gif
- bricolage/comp/media/images/en_us/bricolage.gif
  bricolage/comp/media/images/en_us/bulk_edit_lgreen.gif
  bricolage/comp/media/images/en_us/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/en_us/cancel_checked_red.gif
--- 1207,1212 ----
***************
*** 1359,1365 ****
  bricolage/comp/media/images/en_us/preview_lgreen.gif
  bricolage/comp/media/images/en_us/publish_assets_red.gif
  bricolage/comp/media/images/en_us/publish_checked_red.gif
- bricolage/comp/media/images/en_us/recount_lgreen.gif
  bricolage/comp/media/images/en_us/related_stories_dgreen.gif
  bricolage/comp/media/images/en_us/remove_from_list_red.gif
  bricolage/comp/media/images/en_us/reorder_lgreen.gif
--- 1244,1249 ----
***************
*** 1378,1396 ****
  bricolage/comp/media/images/en_us/upload_red.gif
  bricolage/comp/media/images/en_us/use_this_role_lgreen.gif
  bricolage/comp/media/images/en_us/view_dgreen.gif
! bricolage/comp/media/images/en_us/view_log_teal.gif
! bricolage/comp/media/images/en_us/view_notes_dgreen.gif
! bricolage/comp/media/images/en_us/view_notes_teal.gif
! bricolage/comp/media/images/en_us/view_text_dgreen.gif
  bricolage/comp/media/images/en_us/view_trail_dgreen.gif
  bricolage/comp/media/images/en_us/view_trail_teal.gif
  bricolage/comp/media/images/en_us/workflow_admin.gif
  bricolage/comp/media/images/en_us/workflow_workflow.gif
- bricolage/comp/media/images/first_bottom.gif
- bricolage/comp/media/images/it_it/D_green.gif
- bricolage/comp/media/images/it_it/D_red.gif
- bricolage/comp/media/images/it_it/P_green.gif
- bricolage/comp/media/images/it_it/P_red.gif
  bricolage/comp/media/images/it_it/acknowledge_all_red.gif
  bricolage/comp/media/images/it_it/acknowledge_checked_red.gif
  bricolage/comp/media/images/it_it/add_category_lgreen.gif
--- 1262,1272 ----
  bricolage/comp/media/images/en_us/upload_red.gif
  bricolage/comp/media/images/en_us/use_this_role_lgreen.gif
  bricolage/comp/media/images/en_us/view_dgreen.gif
! bricolage/comp/media/images/en_us/view_diff.gif
  bricolage/comp/media/images/en_us/view_trail_dgreen.gif
  bricolage/comp/media/images/en_us/view_trail_teal.gif
  bricolage/comp/media/images/en_us/workflow_admin.gif
  bricolage/comp/media/images/en_us/workflow_workflow.gif
  bricolage/comp/media/images/it_it/acknowledge_all_red.gif
  bricolage/comp/media/images/it_it/acknowledge_checked_red.gif
  bricolage/comp/media/images/it_it/add_category_lgreen.gif
***************
*** 1404,1410 ****
  bricolage/comp/media/images/it_it/add_template_code_lgreen.gif
  bricolage/comp/media/images/it_it/add_to_form_lgreen.gif
  bricolage/comp/media/images/it_it/add_to_list_lgreen.gif
- bricolage/comp/media/images/it_it/bricolage.gif
  bricolage/comp/media/images/it_it/bulk_edit_lgreen.gif
  bricolage/comp/media/images/it_it/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/it_it/cancel_checked_red.gif
--- 1280,1285 ----
***************
*** 1442,1448 ****
  bricolage/comp/media/images/it_it/preview_lgreen.gif
  bricolage/comp/media/images/it_it/publish_assets_red.gif
  bricolage/comp/media/images/it_it/publish_checked_red.gif
- bricolage/comp/media/images/it_it/recount_lgreen.gif
  bricolage/comp/media/images/it_it/related_stories_dgreen.gif
  bricolage/comp/media/images/it_it/remove_from_list_red.gif
  bricolage/comp/media/images/it_it/reorder_lgreen.gif
--- 1317,1322 ----
***************
*** 1461,1478 ****
  bricolage/comp/media/images/it_it/upload_red.gif
  bricolage/comp/media/images/it_it/use_this_role_lgreen.gif
  bricolage/comp/media/images/it_it/view_dgreen.gif
! bricolage/comp/media/images/it_it/view_log_teal.gif
! bricolage/comp/media/images/it_it/view_notes_dgreen.gif
! bricolage/comp/media/images/it_it/view_notes_teal.gif
! bricolage/comp/media/images/it_it/view_text_dgreen.gif
  bricolage/comp/media/images/it_it/view_trail_dgreen.gif
  bricolage/comp/media/images/it_it/view_trail_teal.gif
  bricolage/comp/media/images/it_it/workflow_admin.gif
  bricolage/comp/media/images/it_it/workflow_workflow.gif
- bricolage/comp/media/images/km/D_green.gif
- bricolage/comp/media/images/km/D_red.gif
- bricolage/comp/media/images/km/P_green.gif
- bricolage/comp/media/images/km/P_red.gif
  bricolage/comp/media/images/km/acknowledge_all_red.gif
  bricolage/comp/media/images/km/acknowledge_checked_red.gif
  bricolage/comp/media/images/km/add_category_lgreen.gif
--- 1335,1345 ----
  bricolage/comp/media/images/it_it/upload_red.gif
  bricolage/comp/media/images/it_it/use_this_role_lgreen.gif
  bricolage/comp/media/images/it_it/view_dgreen.gif
! bricolage/comp/media/images/it_it/view_diff.gif
  bricolage/comp/media/images/it_it/view_trail_dgreen.gif
  bricolage/comp/media/images/it_it/view_trail_teal.gif
  bricolage/comp/media/images/it_it/workflow_admin.gif
  bricolage/comp/media/images/it_it/workflow_workflow.gif
  bricolage/comp/media/images/km/acknowledge_all_red.gif
  bricolage/comp/media/images/km/acknowledge_checked_red.gif
  bricolage/comp/media/images/km/add_category_lgreen.gif
***************
*** 1486,1492 ****
  bricolage/comp/media/images/km/add_template_code_lgreen.gif
  bricolage/comp/media/images/km/add_to_form_lgreen.gif
  bricolage/comp/media/images/km/add_to_list_lgreen.gif
- bricolage/comp/media/images/km/bricolage.gif
  bricolage/comp/media/images/km/bulk_edit_lgreen.gif
  bricolage/comp/media/images/km/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/km/cancel_checked_red.gif
--- 1353,1358 ----
***************
*** 1524,1530 ****
  bricolage/comp/media/images/km/preview_lgreen.gif
  bricolage/comp/media/images/km/publish_assets_red.gif
  bricolage/comp/media/images/km/publish_checked_red.gif
- bricolage/comp/media/images/km/recount_lgreen.gif
  bricolage/comp/media/images/km/related_stories_dgreen.gif
  bricolage/comp/media/images/km/remove_from_list_red.gif
  bricolage/comp/media/images/km/reorder_lgreen.gif
--- 1390,1395 ----
***************
*** 1543,1560 ****
  bricolage/comp/media/images/km/upload_red.gif
  bricolage/comp/media/images/km/use_this_role_lgreen.gif
  bricolage/comp/media/images/km/view_dgreen.gif
! bricolage/comp/media/images/km/view_log_teal.gif
! bricolage/comp/media/images/km/view_notes_dgreen.gif
! bricolage/comp/media/images/km/view_notes_teal.gif
! bricolage/comp/media/images/km/view_text_dgreen.gif
  bricolage/comp/media/images/km/view_trail_dgreen.gif
  bricolage/comp/media/images/km/view_trail_teal.gif
  bricolage/comp/media/images/km/workflow_admin.gif
  bricolage/comp/media/images/km/workflow_workflow.gif
- bricolage/comp/media/images/ko_ko/D_green.gif
- bricolage/comp/media/images/ko_ko/D_red.gif
- bricolage/comp/media/images/ko_ko/P_green.gif
- bricolage/comp/media/images/ko_ko/P_red.gif
  bricolage/comp/media/images/ko_ko/acknowledge_all_red.gif
  bricolage/comp/media/images/ko_ko/acknowledge_checked_red.gif
  bricolage/comp/media/images/ko_ko/add_category_lgreen.gif
--- 1408,1418 ----
  bricolage/comp/media/images/km/upload_red.gif
  bricolage/comp/media/images/km/use_this_role_lgreen.gif
  bricolage/comp/media/images/km/view_dgreen.gif
! bricolage/comp/media/images/km/view_diff.gif
  bricolage/comp/media/images/km/view_trail_dgreen.gif
  bricolage/comp/media/images/km/view_trail_teal.gif
  bricolage/comp/media/images/km/workflow_admin.gif
  bricolage/comp/media/images/km/workflow_workflow.gif
  bricolage/comp/media/images/ko_ko/acknowledge_all_red.gif
  bricolage/comp/media/images/ko_ko/acknowledge_checked_red.gif
  bricolage/comp/media/images/ko_ko/add_category_lgreen.gif
***************
*** 1568,1574 ****
  bricolage/comp/media/images/ko_ko/add_template_code_lgreen.gif
  bricolage/comp/media/images/ko_ko/add_to_form_lgreen.gif
  bricolage/comp/media/images/ko_ko/add_to_list_lgreen.gif
- bricolage/comp/media/images/ko_ko/bricolage.gif
  bricolage/comp/media/images/ko_ko/bulk_edit_lgreen.gif
  bricolage/comp/media/images/ko_ko/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/ko_ko/cancel_checked_red.gif
--- 1426,1431 ----
***************
*** 1606,1612 ****
  bricolage/comp/media/images/ko_ko/preview_lgreen.gif
  bricolage/comp/media/images/ko_ko/publish_assets_red.gif
  bricolage/comp/media/images/ko_ko/publish_checked_red.gif
- bricolage/comp/media/images/ko_ko/recount_lgreen.gif
  bricolage/comp/media/images/ko_ko/related_stories_dgreen.gif
  bricolage/comp/media/images/ko_ko/remove_from_list_red.gif
  bricolage/comp/media/images/ko_ko/reorder_lgreen.gif
--- 1463,1468 ----
***************
*** 1625,1634 ****
  bricolage/comp/media/images/ko_ko/upload_red.gif
  bricolage/comp/media/images/ko_ko/use_this_role_lgreen.gif
  bricolage/comp/media/images/ko_ko/view_dgreen.gif
! bricolage/comp/media/images/ko_ko/view_log_teal.gif
! bricolage/comp/media/images/ko_ko/view_notes_dgreen.gif
! bricolage/comp/media/images/ko_ko/view_notes_teal.gif
! bricolage/comp/media/images/ko_ko/view_text_dgreen.gif
  bricolage/comp/media/images/ko_ko/view_trail_dgreen.gif
  bricolage/comp/media/images/ko_ko/view_trail_teal.gif
  bricolage/comp/media/images/ko_ko/workflow_admin.gif
--- 1481,1487 ----
  bricolage/comp/media/images/ko_ko/upload_red.gif
  bricolage/comp/media/images/ko_ko/use_this_role_lgreen.gif
  bricolage/comp/media/images/ko_ko/view_dgreen.gif
! bricolage/comp/media/images/ko_ko/view_diff.gif
  bricolage/comp/media/images/ko_ko/view_trail_dgreen.gif
  bricolage/comp/media/images/ko_ko/view_trail_teal.gif
  bricolage/comp/media/images/ko_ko/workflow_admin.gif
***************
*** 1637,1646 ****
  bricolage/comp/media/images/listsort_down_teal.gif
  bricolage/comp/media/images/listsort_up_red.gif
  bricolage/comp/media/images/listsort_up_teal.gif
- bricolage/comp/media/images/lo/D_green.gif
- bricolage/comp/media/images/lo/D_red.gif
- bricolage/comp/media/images/lo/P_green.gif
- bricolage/comp/media/images/lo/P_red.gif
  bricolage/comp/media/images/lo/acknowledge_all_red.gif
  bricolage/comp/media/images/lo/acknowledge_checked_red.gif
  bricolage/comp/media/images/lo/add_category_lgreen.gif
--- 1490,1495 ----
***************
*** 1654,1660 ****
  bricolage/comp/media/images/lo/add_template_code_lgreen.gif
  bricolage/comp/media/images/lo/add_to_form_lgreen.gif
  bricolage/comp/media/images/lo/add_to_list_lgreen.gif
- bricolage/comp/media/images/lo/bricolage.gif
  bricolage/comp/media/images/lo/bulk_edit_lgreen.gif
  bricolage/comp/media/images/lo/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/lo/cancel_checked_red.gif
--- 1503,1508 ----
***************
*** 1692,1698 ****
  bricolage/comp/media/images/lo/preview_lgreen.gif
  bricolage/comp/media/images/lo/publish_assets_red.gif
  bricolage/comp/media/images/lo/publish_checked_red.gif
- bricolage/comp/media/images/lo/recount_lgreen.gif
  bricolage/comp/media/images/lo/related_stories_dgreen.gif
  bricolage/comp/media/images/lo/remove_from_list_red.gif
  bricolage/comp/media/images/lo/reorder_lgreen.gif
--- 1540,1545 ----
***************
*** 1711,1732 ****
  bricolage/comp/media/images/lo/upload_red.gif
  bricolage/comp/media/images/lo/use_this_role_lgreen.gif
  bricolage/comp/media/images/lo/view_dgreen.gif
! bricolage/comp/media/images/lo/view_log_teal.gif
! bricolage/comp/media/images/lo/view_notes_dgreen.gif
! bricolage/comp/media/images/lo/view_notes_teal.gif
! bricolage/comp/media/images/lo/view_text_dgreen.gif
  bricolage/comp/media/images/lo/view_trail_dgreen.gif
  bricolage/comp/media/images/lo/view_trail_teal.gif
  bricolage/comp/media/images/lo/workflow_admin.gif
  bricolage/comp/media/images/lo/workflow_workflow.gif
- bricolage/comp/media/images/lt_green_curve_right.gif
  bricolage/comp/media/images/mdgreen_arrow_closed.gif
- bricolage/comp/media/images/mdgreen_curve_left.gif
- bricolage/comp/media/images/mdgreen_curve_right.gif
- bricolage/comp/media/images/my/D_green.gif
- bricolage/comp/media/images/my/D_red.gif
- bricolage/comp/media/images/my/P_green.gif
- bricolage/comp/media/images/my/P_red.gif
  bricolage/comp/media/images/my/acknowledge_all_red.gif
  bricolage/comp/media/images/my/acknowledge_checked_red.gif
  bricolage/comp/media/images/my/add_category_lgreen.gif
--- 1558,1569 ----
  bricolage/comp/media/images/lo/upload_red.gif
  bricolage/comp/media/images/lo/use_this_role_lgreen.gif
  bricolage/comp/media/images/lo/view_dgreen.gif
! bricolage/comp/media/images/lo/view_diff.gif
  bricolage/comp/media/images/lo/view_trail_dgreen.gif
  bricolage/comp/media/images/lo/view_trail_teal.gif
  bricolage/comp/media/images/lo/workflow_admin.gif
  bricolage/comp/media/images/lo/workflow_workflow.gif
  bricolage/comp/media/images/mdgreen_arrow_closed.gif
  bricolage/comp/media/images/my/acknowledge_all_red.gif
  bricolage/comp/media/images/my/acknowledge_checked_red.gif
  bricolage/comp/media/images/my/add_category_lgreen.gif
***************
*** 1740,1746 ****
  bricolage/comp/media/images/my/add_template_code_lgreen.gif
  bricolage/comp/media/images/my/add_to_form_lgreen.gif
  bricolage/comp/media/images/my/add_to_list_lgreen.gif
- bricolage/comp/media/images/my/bricolage.gif
  bricolage/comp/media/images/my/bulk_edit_lgreen.gif
  bricolage/comp/media/images/my/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/my/cancel_checked_red.gif
--- 1577,1582 ----
***************
*** 1778,1784 ****
  bricolage/comp/media/images/my/preview_lgreen.gif
  bricolage/comp/media/images/my/publish_assets_red.gif
  bricolage/comp/media/images/my/publish_checked_red.gif
- bricolage/comp/media/images/my/recount_lgreen.gif
  bricolage/comp/media/images/my/related_stories_dgreen.gif
  bricolage/comp/media/images/my/remove_from_list_red.gif
  bricolage/comp/media/images/my/reorder_lgreen.gif
--- 1614,1619 ----
***************
*** 1797,1806 ****
  bricolage/comp/media/images/my/upload_red.gif
  bricolage/comp/media/images/my/use_this_role_lgreen.gif
  bricolage/comp/media/images/my/view_dgreen.gif
! bricolage/comp/media/images/my/view_log_teal.gif
! bricolage/comp/media/images/my/view_notes_dgreen.gif
! bricolage/comp/media/images/my/view_notes_teal.gif
! bricolage/comp/media/images/my/view_text_dgreen.gif
  bricolage/comp/media/images/my/view_trail_dgreen.gif
  bricolage/comp/media/images/my/view_trail_teal.gif
  bricolage/comp/media/images/my/workflow_admin.gif
--- 1632,1638 ----
  bricolage/comp/media/images/my/upload_red.gif
  bricolage/comp/media/images/my/use_this_role_lgreen.gif
  bricolage/comp/media/images/my/view_dgreen.gif
! bricolage/comp/media/images/my/view_diff.gif
  bricolage/comp/media/images/my/view_trail_dgreen.gif
  bricolage/comp/media/images/my/view_trail_teal.gif
  bricolage/comp/media/images/my/workflow_admin.gif
***************
*** 1808,1866 ****
  bricolage/comp/media/images/nav_background.gif
  bricolage/comp/media/images/note.gif
  bricolage/comp/media/images/note_fill.gif
- bricolage/comp/media/images/numbers/663366_curve_1.gif
- bricolage/comp/media/images/numbers/663366_curve_2.gif
- bricolage/comp/media/images/numbers/663366_curve_3.gif
- bricolage/comp/media/images/numbers/663366_curve_4.gif
- bricolage/comp/media/images/numbers/663366_curve_5.gif
- bricolage/comp/media/images/numbers/663366_curve_6.gif
- bricolage/comp/media/images/numbers/663366_curve_7.gif
- bricolage/comp/media/images/numbers/663366_curve_8.gif
- bricolage/comp/media/images/numbers/663366_curve_9.gif
- bricolage/comp/media/images/numbers/663366_curve_blank.gif
- bricolage/comp/media/images/numbers/669999_0.gif
- bricolage/comp/media/images/numbers/669999_1.gif
- bricolage/comp/media/images/numbers/669999_2.gif
- bricolage/comp/media/images/numbers/669999_3.gif
- bricolage/comp/media/images/numbers/669999_4.gif
- bricolage/comp/media/images/numbers/669999_5.gif
- bricolage/comp/media/images/numbers/669999_6.gif
- bricolage/comp/media/images/numbers/669999_7.gif
- bricolage/comp/media/images/numbers/669999_8.gif
- bricolage/comp/media/images/numbers/669999_curve_1.gif
- bricolage/comp/media/images/numbers/669999_curve_2.gif
- bricolage/comp/media/images/numbers/669999_curve_3.gif
- bricolage/comp/media/images/numbers/669999_curve_4.gif
- bricolage/comp/media/images/numbers/669999_curve_5.gif
- bricolage/comp/media/images/numbers/669999_curve_6.gif
- bricolage/comp/media/images/numbers/669999_curve_7.gif
- bricolage/comp/media/images/numbers/669999_curve_8.gif
- bricolage/comp/media/images/numbers/669999_curve_9.gif
- bricolage/comp/media/images/numbers/669999_curve_blank.gif
- bricolage/comp/media/images/numbers/CC6633_0.gif
- bricolage/comp/media/images/numbers/CC6633_1.gif
- bricolage/comp/media/images/numbers/CC6633_2.gif
- bricolage/comp/media/images/numbers/CC6633_3.gif
- bricolage/comp/media/images/numbers/CC6633_4.gif
- bricolage/comp/media/images/numbers/CC6633_5.gif
- bricolage/comp/media/images/numbers/CC6633_6.gif
- bricolage/comp/media/images/numbers/CC6633_7.gif
- bricolage/comp/media/images/numbers/CC6633_8.gif
- bricolage/comp/media/images/numbers/CC6633_9.gif
- bricolage/comp/media/images/numbers/CC6633_curve_1.gif
- bricolage/comp/media/images/numbers/CC6633_curve_2.gif
- bricolage/comp/media/images/numbers/CC6633_curve_3.gif
- bricolage/comp/media/images/numbers/CC6633_curve_4.gif
- bricolage/comp/media/images/numbers/CC6633_curve_5.gif
- bricolage/comp/media/images/numbers/CC6633_curve_6.gif
- bricolage/comp/media/images/numbers/CC6633_curve_7.gif
- bricolage/comp/media/images/numbers/CC6633_curve_8.gif
- bricolage/comp/media/images/numbers/CC6633_curve_9.gif
- bricolage/comp/media/images/numbers/CC6633_curve_blank.gif
- bricolage/comp/media/images/pt_pt/D_green.gif
- bricolage/comp/media/images/pt_pt/D_red.gif
- bricolage/comp/media/images/pt_pt/P_green.gif
- bricolage/comp/media/images/pt_pt/P_red.gif
  bricolage/comp/media/images/pt_pt/acknowledge_all_red.gif
  bricolage/comp/media/images/pt_pt/acknowledge_checked_red.gif
  bricolage/comp/media/images/pt_pt/add_category_lgreen.gif
--- 1640,1645 ----
***************
*** 1874,1880 ****
  bricolage/comp/media/images/pt_pt/add_template_code_lgreen.gif
  bricolage/comp/media/images/pt_pt/add_to_form_lgreen.gif
  bricolage/comp/media/images/pt_pt/add_to_list_lgreen.gif
- bricolage/comp/media/images/pt_pt/bricolage.gif
  bricolage/comp/media/images/pt_pt/bulk_edit_lgreen.gif
  bricolage/comp/media/images/pt_pt/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/pt_pt/cancel_checked_red.gif
--- 1653,1658 ----
***************
*** 1912,1918 ****
  bricolage/comp/media/images/pt_pt/preview_lgreen.gif
  bricolage/comp/media/images/pt_pt/publish_assets_red.gif
  bricolage/comp/media/images/pt_pt/publish_checked_red.gif
- bricolage/comp/media/images/pt_pt/recount_lgreen.gif
  bricolage/comp/media/images/pt_pt/related_stories_dgreen.gif
  bricolage/comp/media/images/pt_pt/remove_from_list_red.gif
  bricolage/comp/media/images/pt_pt/reorder_lgreen.gif
--- 1690,1695 ----
***************
*** 1931,1948 ****
  bricolage/comp/media/images/pt_pt/upload_red.gif
  bricolage/comp/media/images/pt_pt/use_this_role_lgreen.gif
  bricolage/comp/media/images/pt_pt/view_dgreen.gif
! bricolage/comp/media/images/pt_pt/view_log_teal.gif
! bricolage/comp/media/images/pt_pt/view_notes_dgreen.gif
! bricolage/comp/media/images/pt_pt/view_notes_teal.gif
! bricolage/comp/media/images/pt_pt/view_text_dgreen.gif
  bricolage/comp/media/images/pt_pt/view_trail_dgreen.gif
  bricolage/comp/media/images/pt_pt/view_trail_teal.gif
  bricolage/comp/media/images/pt_pt/workflow_admin.gif
  bricolage/comp/media/images/pt_pt/workflow_workflow.gif
- bricolage/comp/media/images/ru_ru/D_green.gif
- bricolage/comp/media/images/ru_ru/D_red.gif
- bricolage/comp/media/images/ru_ru/P_green.gif
- bricolage/comp/media/images/ru_ru/P_red.gif
  bricolage/comp/media/images/ru_ru/Thumbs.db
  bricolage/comp/media/images/ru_ru/acknowledge_all_red.gif
  bricolage/comp/media/images/ru_ru/acknowledge_checked_red.gif
--- 1708,1718 ----
  bricolage/comp/media/images/pt_pt/upload_red.gif
  bricolage/comp/media/images/pt_pt/use_this_role_lgreen.gif
  bricolage/comp/media/images/pt_pt/view_dgreen.gif
! bricolage/comp/media/images/pt_pt/view_diff.gif
  bricolage/comp/media/images/pt_pt/view_trail_dgreen.gif
  bricolage/comp/media/images/pt_pt/view_trail_teal.gif
  bricolage/comp/media/images/pt_pt/workflow_admin.gif
  bricolage/comp/media/images/pt_pt/workflow_workflow.gif
  bricolage/comp/media/images/ru_ru/Thumbs.db
  bricolage/comp/media/images/ru_ru/acknowledge_all_red.gif
  bricolage/comp/media/images/ru_ru/acknowledge_checked_red.gif
***************
*** 1957,1963 ****
  bricolage/comp/media/images/ru_ru/add_template_code_lgreen.gif
  bricolage/comp/media/images/ru_ru/add_to_form_lgreen.gif
  bricolage/comp/media/images/ru_ru/add_to_list_lgreen.gif
- bricolage/comp/media/images/ru_ru/bricolage.gif
  bricolage/comp/media/images/ru_ru/bulk_edit_lgreen.gif
  bricolage/comp/media/images/ru_ru/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/ru_ru/cancel_checked_red.gif
--- 1727,1732 ----
***************
*** 1995,2001 ****
  bricolage/comp/media/images/ru_ru/preview_lgreen.gif
  bricolage/comp/media/images/ru_ru/publish_assets_red.gif
  bricolage/comp/media/images/ru_ru/publish_checked_red.gif
- bricolage/comp/media/images/ru_ru/recount_lgreen.gif
  bricolage/comp/media/images/ru_ru/related_stories_dgreen.gif
  bricolage/comp/media/images/ru_ru/remove_from_list_red.gif
  bricolage/comp/media/images/ru_ru/reorder_lgreen.gif
--- 1764,1769 ----
***************
*** 2014,2035 ****
  bricolage/comp/media/images/ru_ru/upload_red.gif
  bricolage/comp/media/images/ru_ru/use_this_role_lgreen.gif
  bricolage/comp/media/images/ru_ru/view_dgreen.gif
! bricolage/comp/media/images/ru_ru/view_log_teal.gif
! bricolage/comp/media/images/ru_ru/view_notes_dgreen.gif
! bricolage/comp/media/images/ru_ru/view_notes_teal.gif
! bricolage/comp/media/images/ru_ru/view_text_dgreen.gif
  bricolage/comp/media/images/ru_ru/view_trail_dgreen.gif
  bricolage/comp/media/images/ru_ru/view_trail_teal.gif
  bricolage/comp/media/images/ru_ru/workflow_admin.gif
  bricolage/comp/media/images/ru_ru/workflow_workflow.gif
- bricolage/comp/media/images/red_arrow_open.gif
- bricolage/comp/media/images/red_curve_left.gif
- bricolage/comp/media/images/red_curve_right.gif
  bricolage/comp/media/images/spacer.gif
- bricolage/comp/media/images/ug/D_green.gif
- bricolage/comp/media/images/ug/D_red.gif
- bricolage/comp/media/images/ug/P_green.gif
- bricolage/comp/media/images/ug/P_red.gif
  bricolage/comp/media/images/ug/acknowledge_all_red.gif
  bricolage/comp/media/images/ug/acknowledge_checked_red.gif
  bricolage/comp/media/images/ug/add_category_lgreen.gif
--- 1782,1793 ----
  bricolage/comp/media/images/ru_ru/upload_red.gif
  bricolage/comp/media/images/ru_ru/use_this_role_lgreen.gif
  bricolage/comp/media/images/ru_ru/view_dgreen.gif
! bricolage/comp/media/images/ru_ru/view_diff.gif
  bricolage/comp/media/images/ru_ru/view_trail_dgreen.gif
  bricolage/comp/media/images/ru_ru/view_trail_teal.gif
  bricolage/comp/media/images/ru_ru/workflow_admin.gif
  bricolage/comp/media/images/ru_ru/workflow_workflow.gif
  bricolage/comp/media/images/spacer.gif
  bricolage/comp/media/images/ug/acknowledge_all_red.gif
  bricolage/comp/media/images/ug/acknowledge_checked_red.gif
  bricolage/comp/media/images/ug/add_category_lgreen.gif
***************
*** 2043,2049 ****
  bricolage/comp/media/images/ug/add_template_code_lgreen.gif
  bricolage/comp/media/images/ug/add_to_form_lgreen.gif
  bricolage/comp/media/images/ug/add_to_list_lgreen.gif
- bricolage/comp/media/images/ug/bricolage.gif
  bricolage/comp/media/images/ug/bulk_edit_lgreen.gif
  bricolage/comp/media/images/ug/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/ug/cancel_checked_red.gif
--- 1801,1806 ----
***************
*** 2081,2087 ****
  bricolage/comp/media/images/ug/preview_lgreen.gif
  bricolage/comp/media/images/ug/publish_assets_red.gif
  bricolage/comp/media/images/ug/publish_checked_red.gif
- bricolage/comp/media/images/ug/recount_lgreen.gif
  bricolage/comp/media/images/ug/related_stories_dgreen.gif
  bricolage/comp/media/images/ug/remove_from_list_red.gif
  bricolage/comp/media/images/ug/reorder_lgreen.gif
--- 1838,1843 ----
***************
*** 2100,2117 ****
  bricolage/comp/media/images/ug/upload_red.gif
  bricolage/comp/media/images/ug/use_this_role_lgreen.gif
  bricolage/comp/media/images/ug/view_dgreen.gif
! bricolage/comp/media/images/ug/view_log_teal.gif
! bricolage/comp/media/images/ug/view_notes_dgreen.gif
! bricolage/comp/media/images/ug/view_notes_teal.gif
! bricolage/comp/media/images/ug/view_text_dgreen.gif
  bricolage/comp/media/images/ug/view_trail_dgreen.gif
  bricolage/comp/media/images/ug/view_trail_teal.gif
  bricolage/comp/media/images/ug/workflow_admin.gif
  bricolage/comp/media/images/ug/workflow_workflow.gif
- bricolage/comp/media/images/vi_vn/D_green.gif
- bricolage/comp/media/images/vi_vn/D_red.gif
- bricolage/comp/media/images/vi_vn/P_green.gif
- bricolage/comp/media/images/vi_vn/P_red.gif
  bricolage/comp/media/images/vi_vn/acknowledge_all_red.gif
  bricolage/comp/media/images/vi_vn/acknowledge_checked_red.gif
  bricolage/comp/media/images/vi_vn/add_category_lgreen.gif
--- 1856,1866 ----
  bricolage/comp/media/images/ug/upload_red.gif
  bricolage/comp/media/images/ug/use_this_role_lgreen.gif
  bricolage/comp/media/images/ug/view_dgreen.gif
! bricolage/comp/media/images/ug/view_diff.gif
  bricolage/comp/media/images/ug/view_trail_dgreen.gif
  bricolage/comp/media/images/ug/view_trail_teal.gif
  bricolage/comp/media/images/ug/workflow_admin.gif
  bricolage/comp/media/images/ug/workflow_workflow.gif
  bricolage/comp/media/images/vi_vn/acknowledge_all_red.gif
  bricolage/comp/media/images/vi_vn/acknowledge_checked_red.gif
  bricolage/comp/media/images/vi_vn/add_category_lgreen.gif
***************
*** 2125,2131 ****
  bricolage/comp/media/images/vi_vn/add_template_code_lgreen.gif
  bricolage/comp/media/images/vi_vn/add_to_form_lgreen.gif
  bricolage/comp/media/images/vi_vn/add_to_list_lgreen.gif
- bricolage/comp/media/images/vi_vn/bricolage.gif
  bricolage/comp/media/images/vi_vn/bulk_edit_lgreen.gif
  bricolage/comp/media/images/vi_vn/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/vi_vn/cancel_checked_red.gif
--- 1874,1879 ----
***************
*** 2163,2169 ****
  bricolage/comp/media/images/vi_vn/preview_lgreen.gif
  bricolage/comp/media/images/vi_vn/publish_assets_red.gif
  bricolage/comp/media/images/vi_vn/publish_checked_red.gif
- bricolage/comp/media/images/vi_vn/recount_lgreen.gif
  bricolage/comp/media/images/vi_vn/related_stories_dgreen.gif
  bricolage/comp/media/images/vi_vn/remove_from_list_red.gif
  bricolage/comp/media/images/vi_vn/reorder_lgreen.gif
--- 1911,1916 ----
***************
*** 2181,2201 ****
  bricolage/comp/media/images/vi_vn/templates_dgreen.gif
  bricolage/comp/media/images/vi_vn/upload_red.gif
  bricolage/comp/media/images/vi_vn/use_this_role_lgreen.gif
- bricolage/comp/media/images/vi_vn/view_dgreen.gif
- bricolage/comp/media/images/vi_vn/view_log_teal.gif
- bricolage/comp/media/images/vi_vn/view_notes_dgreen.gif
- bricolage/comp/media/images/vi_vn/view_notes_teal.gif
- bricolage/comp/media/images/vi_vn/view_text_dgreen.gif
  bricolage/comp/media/images/vi_vn/view_trail_dgreen.gif
  bricolage/comp/media/images/vi_vn/view_trail_teal.gif
  bricolage/comp/media/images/vi_vn/workflow_admin.gif
  bricolage/comp/media/images/vi_vn/workflow_workflow.gif
  bricolage/comp/media/images/white_arrow_closed.gif
- bricolage/comp/media/images/yellow_star.gif
- bricolage/comp/media/images/zh_cn/D_green.gif
- bricolage/comp/media/images/zh_cn/D_red.gif
- bricolage/comp/media/images/zh_cn/P_green.gif
- bricolage/comp/media/images/zh_cn/P_red.gif
  bricolage/comp/media/images/zh_cn/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_cn/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_cn/add_category_lgreen.gif
--- 1928,1940 ----
  bricolage/comp/media/images/vi_vn/templates_dgreen.gif
  bricolage/comp/media/images/vi_vn/upload_red.gif
  bricolage/comp/media/images/vi_vn/use_this_role_lgreen.gif
  bricolage/comp/media/images/vi_vn/view_trail_dgreen.gif
+ bricolage/comp/media/images/vi_vn/view_dgreen.gif
+ bricolage/comp/media/images/vi_vn/view_diff.gif
  bricolage/comp/media/images/vi_vn/view_trail_teal.gif
  bricolage/comp/media/images/vi_vn/workflow_admin.gif
  bricolage/comp/media/images/vi_vn/workflow_workflow.gif
  bricolage/comp/media/images/white_arrow_closed.gif
  bricolage/comp/media/images/zh_cn/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_cn/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_cn/add_category_lgreen.gif
***************
*** 2209,2215 ****
  bricolage/comp/media/images/zh_cn/add_template_code_lgreen.gif
  bricolage/comp/media/images/zh_cn/add_to_form_lgreen.gif
  bricolage/comp/media/images/zh_cn/add_to_list_lgreen.gif
- bricolage/comp/media/images/zh_cn/bricolage.gif
  bricolage/comp/media/images/zh_cn/bulk_edit_lgreen.gif
  bricolage/comp/media/images/zh_cn/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/zh_cn/cancel_checked_red.gif
--- 1948,1953 ----
***************
*** 2247,2253 ****
  bricolage/comp/media/images/zh_cn/preview_lgreen.gif
  bricolage/comp/media/images/zh_cn/publish_assets_red.gif
  bricolage/comp/media/images/zh_cn/publish_checked_red.gif
- bricolage/comp/media/images/zh_cn/recount_lgreen.gif
  bricolage/comp/media/images/zh_cn/related_stories_dgreen.gif
  bricolage/comp/media/images/zh_cn/remove_from_list_red.gif
  bricolage/comp/media/images/zh_cn/reorder_lgreen.gif
--- 1985,1990 ----
***************
*** 2265,2283 ****
  bricolage/comp/media/images/zh_cn/templates_dgreen.gif
  bricolage/comp/media/images/zh_cn/upload_red.gif
  bricolage/comp/media/images/zh_cn/use_this_role_lgreen.gif
- bricolage/comp/media/images/zh_cn/view_dgreen.gif
- bricolage/comp/media/images/zh_cn/view_log_teal.gif
- bricolage/comp/media/images/zh_cn/view_notes_dgreen.gif
- bricolage/comp/media/images/zh_cn/view_notes_teal.gif
- bricolage/comp/media/images/zh_cn/view_text_dgreen.gif
  bricolage/comp/media/images/zh_cn/view_trail_dgreen.gif
  bricolage/comp/media/images/zh_cn/view_trail_teal.gif
  bricolage/comp/media/images/zh_cn/workflow_admin.gif
  bricolage/comp/media/images/zh_cn/workflow_workflow.gif
- bricolage/comp/media/images/zh_hk/D_green.gif
- bricolage/comp/media/images/zh_hk/D_red.gif
- bricolage/comp/media/images/zh_hk/P_green.gif
- bricolage/comp/media/images/zh_hk/P_red.gif
  bricolage/comp/media/images/zh_hk/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_hk/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_hk/add_category_lgreen.gif
--- 2002,2013 ----
  bricolage/comp/media/images/zh_cn/templates_dgreen.gif
  bricolage/comp/media/images/zh_cn/upload_red.gif
  bricolage/comp/media/images/zh_cn/use_this_role_lgreen.gif
  bricolage/comp/media/images/zh_cn/view_trail_dgreen.gif
+ bricolage/comp/media/images/zh_cn/view_dgreen.gif
+ bricolage/comp/media/images/zh_cn/view_diff.gif
  bricolage/comp/media/images/zh_cn/view_trail_teal.gif
  bricolage/comp/media/images/zh_cn/workflow_admin.gif
  bricolage/comp/media/images/zh_cn/workflow_workflow.gif
  bricolage/comp/media/images/zh_hk/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_hk/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_hk/add_category_lgreen.gif
***************
*** 2291,2297 ****
  bricolage/comp/media/images/zh_hk/add_template_code_lgreen.gif
  bricolage/comp/media/images/zh_hk/add_to_form_lgreen.gif
  bricolage/comp/media/images/zh_hk/add_to_list_lgreen.gif
- bricolage/comp/media/images/zh_hk/bricolage.gif
  bricolage/comp/media/images/zh_hk/bulk_edit_lgreen.gif
  bricolage/comp/media/images/zh_hk/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/zh_hk/cancel_checked_red.gif
--- 2021,2026 ----
***************
*** 2329,2335 ****
  bricolage/comp/media/images/zh_hk/preview_lgreen.gif
  bricolage/comp/media/images/zh_hk/publish_assets_red.gif
  bricolage/comp/media/images/zh_hk/publish_checked_red.gif
- bricolage/comp/media/images/zh_hk/recount_lgreen.gif
  bricolage/comp/media/images/zh_hk/related_stories_dgreen.gif
  bricolage/comp/media/images/zh_hk/remove_from_list_red.gif
  bricolage/comp/media/images/zh_hk/reorder_lgreen.gif
--- 2058,2063 ----
***************
*** 2348,2365 ****
  bricolage/comp/media/images/zh_hk/upload_red.gif
  bricolage/comp/media/images/zh_hk/use_this_role_lgreen.gif
  bricolage/comp/media/images/zh_hk/view_dgreen.gif
! bricolage/comp/media/images/zh_hk/view_log_teal.gif
! bricolage/comp/media/images/zh_hk/view_notes_dgreen.gif
! bricolage/comp/media/images/zh_hk/view_notes_teal.gif
! bricolage/comp/media/images/zh_hk/view_text_dgreen.gif
  bricolage/comp/media/images/zh_hk/view_trail_dgreen.gif
  bricolage/comp/media/images/zh_hk/view_trail_teal.gif
  bricolage/comp/media/images/zh_hk/workflow_admin.gif
  bricolage/comp/media/images/zh_hk/workflow_workflow.gif
- bricolage/comp/media/images/zh_tw/D_green.gif
- bricolage/comp/media/images/zh_tw/D_red.gif
- bricolage/comp/media/images/zh_tw/P_green.gif
- bricolage/comp/media/images/zh_tw/P_red.gif
  bricolage/comp/media/images/zh_tw/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_tw/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_tw/add_category_lgreen.gif
--- 2076,2086 ----
  bricolage/comp/media/images/zh_hk/upload_red.gif
  bricolage/comp/media/images/zh_hk/use_this_role_lgreen.gif
  bricolage/comp/media/images/zh_hk/view_dgreen.gif
! bricolage/comp/media/images/zh_hk/view_diff.gif
  bricolage/comp/media/images/zh_hk/view_trail_dgreen.gif
  bricolage/comp/media/images/zh_hk/view_trail_teal.gif
  bricolage/comp/media/images/zh_hk/workflow_admin.gif
  bricolage/comp/media/images/zh_hk/workflow_workflow.gif
  bricolage/comp/media/images/zh_tw/acknowledge_all_red.gif
  bricolage/comp/media/images/zh_tw/acknowledge_checked_red.gif
  bricolage/comp/media/images/zh_tw/add_category_lgreen.gif
***************
*** 2373,2379 ****
  bricolage/comp/media/images/zh_tw/add_template_code_lgreen.gif
  bricolage/comp/media/images/zh_tw/add_to_form_lgreen.gif
  bricolage/comp/media/images/zh_tw/add_to_list_lgreen.gif
- bricolage/comp/media/images/zh_tw/bricolage.gif
  bricolage/comp/media/images/zh_tw/bulk_edit_lgreen.gif
  bricolage/comp/media/images/zh_tw/cancel_check_out_lgreen.gif
  bricolage/comp/media/images/zh_tw/cancel_checked_red.gif
--- 2094,2099 ----
***************
*** 2411,2417 ****
  bricolage/comp/media/images/zh_tw/preview_lgreen.gif
  bricolage/comp/media/images/zh_tw/publish_assets_red.gif
  bricolage/comp/media/images/zh_tw/publish_checked_red.gif
- bricolage/comp/media/images/zh_tw/recount_lgreen.gif
  bricolage/comp/media/images/zh_tw/related_stories_dgreen.gif
  bricolage/comp/media/images/zh_tw/remove_from_list_red.gif
  bricolage/comp/media/images/zh_tw/reorder_lgreen.gif
--- 2131,2136 ----
***************
*** 2430,2439 ****
  bricolage/comp/media/images/zh_tw/upload_red.gif
  bricolage/comp/media/images/zh_tw/use_this_role_lgreen.gif
  bricolage/comp/media/images/zh_tw/view_dgreen.gif
! bricolage/comp/media/images/zh_tw/view_log_teal.gif
! bricolage/comp/media/images/zh_tw/view_notes_dgreen.gif
! bricolage/comp/media/images/zh_tw/view_notes_teal.gif
! bricolage/comp/media/images/zh_tw/view_text_dgreen.gif
  bricolage/comp/media/images/zh_tw/view_trail_dgreen.gif
  bricolage/comp/media/images/zh_tw/view_trail_teal.gif
  bricolage/comp/media/images/zh_tw/workflow_admin.gif
--- 2149,2155 ----
  bricolage/comp/media/images/zh_tw/upload_red.gif
  bricolage/comp/media/images/zh_tw/use_this_role_lgreen.gif
  bricolage/comp/media/images/zh_tw/view_dgreen.gif
! bricolage/comp/media/images/zh_tw/view_diff.gif
  bricolage/comp/media/images/zh_tw/view_trail_dgreen.gif
  bricolage/comp/media/images/zh_tw/view_trail_teal.gif
  bricolage/comp/media/images/zh_tw/workflow_admin.gif
***************
*** 2470,2478 ****
  bricolage/comp/widgets/container_prof/edit_bulk.html
  bricolage/comp/widgets/container_prof/edit_related_media.html
  bricolage/comp/widgets/container_prof/edit_related_story.html
- bricolage/comp/widgets/container_prof/edit_super_bulk.html
  bricolage/comp/widgets/container_prof/view.html
- bricolage/comp/widgets/debug/agent.mc
  bricolage/comp/widgets/debug/data.mc
  bricolage/comp/widgets/debug/debug.mc
  bricolage/comp/widgets/debug/dump.mc
--- 2186,2192 ----
***************
*** 2480,2492 ****
  bricolage/comp/widgets/desk/desk.mc
  bricolage/comp/widgets/desk/desk_bottom.html
  bricolage/comp/widgets/desk/desk_item.html
- bricolage/comp/widgets/desk/desk_item_old.html
  bricolage/comp/widgets/desk/desk_top.html
  bricolage/comp/widgets/desk/index.html
  bricolage/comp/widgets/desk/publish_status.mc
  bricolage/comp/widgets/desk/publish_status_span.mc
  bricolage/comp/widgets/doubleListManager/doubleListManager.mc
- bricolage/comp/widgets/element_data/element_data.mc
  bricolage/comp/widgets/eventList/eventList.mc
  bricolage/comp/widgets/eventList/index.html
  bricolage/comp/widgets/file_upload/file_upload.mc
--- 2194,2204 ----
***************
*** 2497,2512 ****
  bricolage/comp/widgets/help/debuggers.html
  bricolage/comp/widgets/help/developers.html
  bricolage/comp/widgets/help/emeriti.html
- bricolage/comp/widgets/help/help.mc
  bricolage/comp/widgets/help/help_writers.html
  bricolage/comp/widgets/help/maintainers.html
  bricolage/comp/widgets/help/others.html
  bricolage/comp/widgets/help/patchers.html
  bricolage/comp/widgets/help/translators.html
- bricolage/comp/widgets/htmlarea/load.mc
- bricolage/comp/widgets/htmlarea/timeout.mc
  bricolage/comp/widgets/listManager/full_list.mc
- bricolage/comp/widgets/listManager/index.html
  bricolage/comp/widgets/listManager/listManager.mc
  bricolage/comp/widgets/login/index.html
  bricolage/comp/widgets/login/loggedout.html
--- 2209,2220 ----
***************
*** 2523,2531 ****
  bricolage/comp/widgets/perm/display.html
  bricolage/comp/widgets/perm/perm.mc
  bricolage/comp/widgets/profile/asset_ocs.mc
  bricolage/comp/widgets/profile/buttonBar.mc
  bricolage/comp/widgets/profile/checkbox.mc
- bricolage/comp/widgets/profile/create_button.html
  bricolage/comp/widgets/profile/date.mc
  bricolage/comp/widgets/profile/displayAttrs.mc
  bricolage/comp/widgets/profile/displayFormElement.mc
--- 2231,2239 ----
  bricolage/comp/widgets/perm/display.html
  bricolage/comp/widgets/perm/perm.mc
  bricolage/comp/widgets/profile/asset_ocs.mc
+ bricolage/comp/widgets/profile/button.mc
  bricolage/comp/widgets/profile/buttonBar.mc
  bricolage/comp/widgets/profile/checkbox.mc
  bricolage/comp/widgets/profile/date.mc
  bricolage/comp/widgets/profile/displayAttrs.mc
  bricolage/comp/widgets/profile/displayFormElement.mc
***************
*** 2534,2564 ****
  bricolage/comp/widgets/profile/hidden.mc
  bricolage/comp/widgets/profile/imageSubmit.mc
  bricolage/comp/widgets/profile/index.html
  bricolage/comp/widgets/profile/password.mc
  bricolage/comp/widgets/profile/preview_link.mc
  bricolage/comp/widgets/profile/radio.mc
  bricolage/comp/widgets/profile/select.mc
  bricolage/comp/widgets/profile/text.mc
  bricolage/comp/widgets/profile/textarea.mc
- bricolage/comp/widgets/publish/index.html
  bricolage/comp/widgets/publish/publish.mc
- bricolage/comp/widgets/qa/button.html
- bricolage/comp/widgets/qa/index.html
- bricolage/comp/widgets/qa/qa.mc
  bricolage/comp/widgets/search/alpha.html
  bricolage/comp/widgets/search/dual.html
- bricolage/comp/widgets/search/formatting.html
  bricolage/comp/widgets/search/index.html
  bricolage/comp/widgets/search/media.html
  bricolage/comp/widgets/search/search.mc
  bricolage/comp/widgets/search/singular.html
  bricolage/comp/widgets/search/story.html
  bricolage/comp/widgets/search/substr.html
  bricolage/comp/widgets/search/triple.html
  bricolage/comp/widgets/select_object/dropdown.html
- bricolage/comp/widgets/select_object/index.html
  bricolage/comp/widgets/select_object/select_object.mc
- bricolage/comp/widgets/select_time/index.html
  bricolage/comp/widgets/select_time/inline.html
  bricolage/comp/widgets/select_time/inline_ro.html
  bricolage/comp/widgets/select_time/select_time.mc
--- 2242,2267 ----
  bricolage/comp/widgets/profile/hidden.mc
  bricolage/comp/widgets/profile/imageSubmit.mc
  bricolage/comp/widgets/profile/index.html
+ bricolage/comp/widgets/profile/media_upload.mc
  bricolage/comp/widgets/profile/password.mc
  bricolage/comp/widgets/profile/preview_link.mc
  bricolage/comp/widgets/profile/radio.mc
  bricolage/comp/widgets/profile/select.mc
  bricolage/comp/widgets/profile/text.mc
  bricolage/comp/widgets/profile/textarea.mc
  bricolage/comp/widgets/publish/publish.mc
  bricolage/comp/widgets/search/alpha.html
  bricolage/comp/widgets/search/dual.html
  bricolage/comp/widgets/search/index.html
  bricolage/comp/widgets/search/media.html
  bricolage/comp/widgets/search/search.mc
  bricolage/comp/widgets/search/singular.html
  bricolage/comp/widgets/search/story.html
  bricolage/comp/widgets/search/substr.html
+ bricolage/comp/widgets/search/template.html
  bricolage/comp/widgets/search/triple.html
  bricolage/comp/widgets/select_object/dropdown.html
  bricolage/comp/widgets/select_object/select_object.mc
  bricolage/comp/widgets/select_time/inline.html
  bricolage/comp/widgets/select_time/inline_ro.html
  bricolage/comp/widgets/select_time/select_time.mc
***************
*** 2573,2579 ****
  bricolage/comp/widgets/story_prof/index.html
  bricolage/comp/widgets/story_prof/story_prof.mc
  bricolage/comp/widgets/story_prof/view_meta.html
- bricolage/comp/widgets/summary/formatting_meta.html
  bricolage/comp/widgets/summary/index.html
  bricolage/comp/widgets/summary/media_meta.html
  bricolage/comp/widgets/summary/story_meta.html
--- 2276,2281 ----
***************
*** 2605,2611 ****
  bricolage/comp/workflow/profile/media/container/edit_bulk.html
  bricolage/comp/workflow/profile/media/container/edit_related_media.html
  bricolage/comp/workflow/profile/media/container/edit_related_story.html
- bricolage/comp/workflow/profile/media/container/edit_super_bulk.html
  bricolage/comp/workflow/profile/media/contributor_role.html
  bricolage/comp/workflow/profile/media/contributors.html
  bricolage/comp/workflow/profile/media/dhandler
--- 2307,2312 ----
***************
*** 2614,2619 ****
--- 2315,2322 ----
  bricolage/comp/workflow/profile/media/new/dhandler
  bricolage/comp/workflow/profile/media/view_notes.html
  bricolage/comp/workflow/profile/preview/dhandler
+ bricolage/comp/workflow/profile/preview/control/control.html
+ bricolage/comp/workflow/profile/preview/control/dhandler
  bricolage/comp/workflow/profile/publish/dhandler
  bricolage/comp/workflow/profile/story/categories.html
  bricolage/comp/workflow/profile/story/container/dhandler
***************
*** 2621,2627 ****
  bricolage/comp/workflow/profile/story/container/edit_bulk.html
  bricolage/comp/workflow/profile/story/container/edit_related_media.html
  bricolage/comp/workflow/profile/story/container/edit_related_story.html
- bricolage/comp/workflow/profile/story/container/edit_super_bulk.html
  bricolage/comp/workflow/profile/story/contributor_role.html
  bricolage/comp/workflow/profile/story/contributors.html
  bricolage/comp/workflow/profile/story/dhandler
--- 2324,2329 ----
***************
*** 2629,2644 ****
  bricolage/comp/workflow/profile/story/keywords.html
  bricolage/comp/workflow/profile/story/new/dhandler
  bricolage/comp/workflow/profile/story/view_notes.html
- bricolage/comp/workflow/profile/templates/comments.html
- bricolage/comp/workflow/profile/templates/dhandler
- bricolage/comp/workflow/profile/templates/edit_comments.html
- bricolage/comp/workflow/profile/templates/edit_notes.html
- bricolage/comp/workflow/profile/templates/new/dhandler
- bricolage/comp/workflow/profile/templates/trail.html
- bricolage/comp/workflow/profile/templates/view_notes.html
  bricolage/comp/workflow/profile/workspace/clone/dhandler
  bricolage/comp/workflow/profile/workspace/dhandler
  bricolage/comp/workflow/trail/dhandler
  bricolage/conf/bricolage.conf
  bricolage/conf/bricolage.conf.def
  bricolage/conf/httpd.conf
--- 2331,2474 ----
  bricolage/comp/workflow/profile/story/keywords.html
  bricolage/comp/workflow/profile/story/new/dhandler
  bricolage/comp/workflow/profile/story/view_notes.html
  bricolage/comp/workflow/profile/workspace/clone/dhandler
  bricolage/comp/workflow/profile/workspace/dhandler
  bricolage/comp/workflow/trail/dhandler
+ bricolage/comp/help/bo/workflow/active/template.html
+ bricolage/comp/help/bo/workflow/manager/template.html
+ bricolage/comp/help/bo/workflow/profile/container/edit.html
+ bricolage/comp/help/bo/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/bo/workflow/profile/template/new.html
+ bricolage/comp/help/de_de/admin/profile/field_type.html
+ bricolage/comp/help/de_de/admin/profile/pref.html
+ bricolage/comp/help/de_de/workflow/active/template.html
+ bricolage/comp/help/de_de/workflow/manager/template.html
+ bricolage/comp/help/de_de/workflow/profile/container/edit.html
+ bricolage/comp/help/de_de/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/de_de/workflow/profile/template/new.html
+ bricolage/comp/help/en_us/admin/profile/field_type.html
+ bricolage/comp/help/en_us/admin/profile/pref.html
+ bricolage/comp/help/en_us/workflow/active/template.html
+ bricolage/comp/help/en_us/workflow/manager/template.html
+ bricolage/comp/help/en_us/workflow/profile/container/edit.html
+ bricolage/comp/help/en_us/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/en_us/workflow/profile/template/new.html
+ bricolage/comp/help/it_it/admin/profile/element_type.html
+ bricolage/comp/help/it_it/admin/profile/field_type.html
+ bricolage/comp/help/it_it/admin/profile/pref.html
+ bricolage/comp/help/it_it/workflow/active/template.html
+ bricolage/comp/help/it_it/workflow/manager/template.html
+ bricolage/comp/help/it_it/workflow/profile/template.html
+ bricolage/comp/help/it_it/workflow/profile/container/edit.html
+ bricolage/comp/help/it_it/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/it_it/workflow/profile/template/new.html
+ bricolage/comp/help/km/admin/profile/field_type.html
+ bricolage/comp/help/km/admin/profile/pref.html
+ bricolage/comp/help/km/workflow/active/template.html
+ bricolage/comp/help/km/workflow/manager/template.html
+ bricolage/comp/help/km/workflow/profile/container/edit.html
+ bricolage/comp/help/km/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/km/workflow/profile/template/new.html
+ bricolage/comp/help/ko_ko/admin/profile/field_type.html
+ bricolage/comp/help/ko_ko/admin/profile/pref.html
+ bricolage/comp/help/ko_ko/workflow/active/template.html
+ bricolage/comp/help/ko_ko/workflow/manager/template.html
+ bricolage/comp/help/ko_ko/workflow/profile/container/edit.html
+ bricolage/comp/help/ko_ko/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/ko_ko/workflow/profile/template/new.html
+ bricolage/comp/help/lo/admin/profile/field_type.html
+ bricolage/comp/help/lo/admin/profile/pref.html
+ bricolage/comp/help/lo/workflow/active/template.html
+ bricolage/comp/help/lo/workflow/manager/template.html
+ bricolage/comp/help/lo/workflow/profile/container/edit.html
+ bricolage/comp/help/lo/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/lo/workflow/profile/template/new.html
+ bricolage/comp/help/my/admin/profile/field_type.html
+ bricolage/comp/help/my/admin/profile/pref.html
+ bricolage/comp/help/my/workflow/active/template.html
+ bricolage/comp/help/my/workflow/manager/template.html
+ bricolage/comp/help/my/workflow/profile/container/edit.html
+ bricolage/comp/help/my/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/my/workflow/profile/template/new.html
+ bricolage/comp/help/pt_pt/admin/profile/element_type.html
+ bricolage/comp/help/pt_pt/admin/profile/field_type.html
+ bricolage/comp/help/pt_pt/admin/profile/pref.html
+ bricolage/comp/help/pt_pt/workflow/active/template.html
+ bricolage/comp/help/pt_pt/workflow/manager/template.html
+ bricolage/comp/help/pt_pt/workflow/profile/template.html
+ bricolage/comp/help/pt_pt/workflow/profile/container/edit.html
+ bricolage/comp/help/pt_pt/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/pt_pt/workflow/profile/template/new.html
+ bricolage/comp/help/ru_ru/admin/profile/field_type.html
+ bricolage/comp/help/ru_ru/admin/profile/pref.html
+ bricolage/comp/help/ru_ru/workflow/active/template.html
+ bricolage/comp/help/ru_ru/workflow/manager/template.html
+ bricolage/comp/help/ru_ru/workflow/profile/container/edit.html
+ bricolage/comp/help/ru_ru/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/ru_ru/workflow/profile/template/new.html
+ bricolage/comp/help/ug/admin/profile/field_type.html
+ bricolage/comp/help/ug/admin/profile/pref.html
+ bricolage/comp/help/ug/workflow/active/template.html
+ bricolage/comp/help/ug/workflow/manager/template.html
+ bricolage/comp/help/ug/workflow/profile/container/edit.html
+ bricolage/comp/help/ug/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/ug/workflow/profile/template/new.html
+ bricolage/comp/help/vi_vn/admin/profile/field_type.html
+ bricolage/comp/help/vi_vn/admin/profile/pref.html
+ bricolage/comp/help/vi_vn/workflow/active/template.html
+ bricolage/comp/help/vi_vn/workflow/manager/template.html
+ bricolage/comp/help/vi_vn/workflow/profile/container/edit.html
+ bricolage/comp/help/vi_vn/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/vi_vn/workflow/profile/template/new.html
+ bricolage/comp/help/zh_cn/admin/profile/field_type.html
+ bricolage/comp/help/zh_cn/admin/profile/pref.html
+ bricolage/comp/help/zh_cn/workflow/active/template.html
+ bricolage/comp/help/zh_cn/workflow/manager/template.html
+ bricolage/comp/help/zh_cn/workflow/profile/container/edit.html
+ bricolage/comp/help/zh_cn/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/zh_cn/workflow/profile/template/new.html
+ bricolage/comp/help/zh_cn/workflow/profile/workspace.html
+ bricolage/comp/help/zh_hk/admin/profile/element_type.html
+ bricolage/comp/help/zh_hk/admin/profile/field_type.html
+ bricolage/comp/help/zh_hk/admin/profile/pref.html
+ bricolage/comp/help/zh_hk/workflow/active/template.html
+ bricolage/comp/help/zh_hk/workflow/manager/template.html
+ bricolage/comp/help/zh_hk/workflow/profile/template.html
+ bricolage/comp/help/zh_hk/workflow/profile/container/edit.html
+ bricolage/comp/help/zh_hk/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/zh_hk/workflow/profile/template/new.html
+ bricolage/comp/help/zh_tw/admin/profile/element_type.html
+ bricolage/comp/help/zh_tw/admin/profile/field_type.html
+ bricolage/comp/help/zh_tw/admin/profile/pref.html
+ bricolage/comp/help/zh_tw/workflow/active/template.html
+ bricolage/comp/help/zh_tw/workflow/manager/template.html
+ bricolage/comp/help/zh_tw/workflow/profile/template.html
+ bricolage/comp/help/zh_tw/workflow/profile/container/edit.html
+ bricolage/comp/help/zh_tw/workflow/profile/container/edit_bulk.html
+ bricolage/comp/help/zh_tw/workflow/profile/template/new.html
+ bricolage/comp/media/images/bricolage.gif
+ bricolage/comp/media/images/curve_left.gif
+ bricolage/comp/media/images/curve_right.gif
+ bricolage/comp/media/images/my_workspace.gif
+ bricolage/comp/media/images/pencil.gif
+ bricolage/comp/media/images/white_arrow_open.gif
+ bricolage/comp/widgets/buttons/back.mc
+ bricolage/comp/widgets/buttons/help.mc
+ bricolage/comp/widgets/buttons/submit.mc
+ bricolage/comp/widgets/dialog_box/dialog_box.mc
+ bricolage/comp/widgets/dialog_box/find.mc
+ bricolage/comp/widgets/field_type/field_type.mc
+ bricolage/comp/widgets/summary/template_meta.html
+ bricolage/comp/widgets/wysiwyg/htmlarea.html
+ bricolage/comp/widgets/wysiwyg/load.mc
+ bricolage/comp/widgets/wysiwyg/xinha.html
+ bricolage/comp/workflow/profile/template/comments.html
+ bricolage/comp/workflow/profile/template/dhandler
+ bricolage/comp/workflow/profile/template/edit_comments.html
+ bricolage/comp/workflow/profile/template/edit_notes.html
+ bricolage/comp/workflow/profile/template/trail.html
+ bricolage/comp/workflow/profile/template/view_notes.html
+ bricolage/comp/workflow/profile/template/new/dhandler
  bricolage/conf/bricolage.conf
  bricolage/conf/bricolage.conf.def
  bricolage/conf/httpd.conf
***************
*** 2656,2917 ****
  bricolage/data/burn/comp/oc_1/related_stories.mc
  bricolage/data/burn/comp/oc_1/related_story.mc
  bricolage/data/burn/comp/oc_1/story.mc
- %%SITE_PERL%%/mach/auto/Bric/.packlist
- %%SITE_PERL%%/mach/auto/bric_bin/.packlist
  %%SITE_PERL%%/Bric.pm
- %%SITE_PERL%%/Bric/DBA.pod
- %%SITE_PERL%%/Bric/License.pod
- %%SITE_PERL%%/Bric/Config.pm
- %%SITE_PERL%%/Bric/Hacker.pod
- %%SITE_PERL%%/Bric/Templates.pod
- %%SITE_PERL%%/Bric/Security.pod
- %%SITE_PERL%%/Bric/Changes.pod
  %%SITE_PERL%%/Bric/Admin.pod
- %%SITE_PERL%%/Bric/ElementAdmin.pod
- %%SITE_PERL%%/Bric/AssetEditing.pod
- %%SITE_PERL%%/Bric/FAQ.pod
- %%SITE_PERL%%/Bric/Alert.pod
- %%SITE_PERL%%/Bric/SOAP.pm
  %%SITE_PERL%%/Bric/AdvTemplates.pod
! %%SITE_PERL%%/Bric/HTMLTemplate.pod
! %%SITE_PERL%%/Bric/ToDo.pod
! %%SITE_PERL%%/Bric/App/Auth.pm
! %%SITE_PERL%%/Bric/App/Session.pm
  %%SITE_PERL%%/Bric/App/ApacheConfig.pm
- %%SITE_PERL%%/Bric/App/PreviewHandler.pm
- %%SITE_PERL%%/Bric/App/Util.pm
- %%SITE_PERL%%/Bric/App/Event.pm
- %%SITE_PERL%%/Bric/App/MediaFunc.pm
- %%SITE_PERL%%/Bric/App/Cache.pm
- %%SITE_PERL%%/Bric/App/CleanupHandler.pm
- %%SITE_PERL%%/Bric/App/Authz.pm
  %%SITE_PERL%%/Bric/App/ApacheHandler.pm
- %%SITE_PERL%%/Bric/App/Handler.pm
- %%SITE_PERL%%/Bric/App/Callback.pm
- %%SITE_PERL%%/Bric/App/AccessHandler.pm
  %%SITE_PERL%%/Bric/App/ApacheStartup.pm
! %%SITE_PERL%%/Bric/App/Callback/Perm.pm
! %%SITE_PERL%%/Bric/App/Callback/SelectTime.pm
! %%SITE_PERL%%/Bric/App/Callback/BulkPublish.pm
  %%SITE_PERL%%/Bric/App/Callback/AddMore.pm
- %%SITE_PERL%%/Bric/App/Callback/Element.pm
- %%SITE_PERL%%/Bric/App/Callback/Alias.pm
- %%SITE_PERL%%/Bric/App/Callback/Login.pm
- %%SITE_PERL%%/Bric/App/Callback/Search.pm
- %%SITE_PERL%%/Bric/App/Callback/Workspace.pm
  %%SITE_PERL%%/Bric/App/Callback/Alert.pm
! %%SITE_PERL%%/Bric/App/Callback/SiteContext.pm
  %%SITE_PERL%%/Bric/App/Callback/CharTrans.pm
- %%SITE_PERL%%/Bric/App/Callback/Nav.pm
- %%SITE_PERL%%/Bric/App/Callback/SelectObject.pm
- %%SITE_PERL%%/Bric/App/Callback/Request.pm
  %%SITE_PERL%%/Bric/App/Callback/ContainerProf.pm
- %%SITE_PERL%%/Bric/App/Callback/Publish.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile.pm
- %%SITE_PERL%%/Bric/App/Callback/AssetMeta.pm
- %%SITE_PERL%%/Bric/App/Callback/ListManager.pm
  %%SITE_PERL%%/Bric/App/Callback/Desk.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Media.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/MediaType.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Desk.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Action.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/FormBuilder.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Category.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Org.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/OutputChannel.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Keyword.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Workflow.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Source.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Contrib.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Story.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/AlertType.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Dest.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Grp.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Template.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/Site.pm
- %%SITE_PERL%%/Bric/App/Callback/Profile/UserPref.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Job.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/ElementData.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Server.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/User.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/ElementType.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Pref.pm
  %%SITE_PERL%%/Bric/App/Callback/Util/Contact.pm
! %%SITE_PERL%%/Bric/Util/AlertType.pm
  %%SITE_PERL%%/Bric/Util/Alert.pm
! %%SITE_PERL%%/Bric/Util/Priv.pm
  %%SITE_PERL%%/Bric/Util/Alerted.pm
  %%SITE_PERL%%/Bric/Util/CharTrans.pm
! %%SITE_PERL%%/Bric/Util/Language.pm
  %%SITE_PERL%%/Bric/Util/Event.pm
- %%SITE_PERL%%/Bric/Util/Pref.pm
- %%SITE_PERL%%/Bric/Util/UserPref.pm
- %%SITE_PERL%%/Bric/Util/Burner.pm
  %%SITE_PERL%%/Bric/Util/EventType.pm
! %%SITE_PERL%%/Bric/Util/Time.pm
! %%SITE_PERL%%/Bric/Util/Grp.pm
! %%SITE_PERL%%/Bric/Util/MediaType.pm
! %%SITE_PERL%%/Bric/Util/Class.pm
! %%SITE_PERL%%/Bric/Util/WebDav.pm
! %%SITE_PERL%%/Bric/Util/Attribute.pm
  %%SITE_PERL%%/Bric/Util/Fault.pm
! %%SITE_PERL%%/Bric/Util/Job.pm
! %%SITE_PERL%%/Bric/Util/Async.pm
! %%SITE_PERL%%/Bric/Util/DBI.pm
! %%SITE_PERL%%/Bric/Util/Coll.pm
! %%SITE_PERL%%/Bric/Util/Grp/OutputChannel.pm
! %%SITE_PERL%%/Bric/Util/Grp/Dest.pm
! %%SITE_PERL%%/Bric/Util/Grp/Keyword.pm
! %%SITE_PERL%%/Bric/Util/Grp/Pref.pm
  %%SITE_PERL%%/Bric/Util/Grp/AssetLanguage.pm
! %%SITE_PERL%%/Bric/Util/Grp/Grp.pm
! %%SITE_PERL%%/Bric/Util/Grp/Event.pm
  %%SITE_PERL%%/Bric/Util/Grp/ElementType.pm
  %%SITE_PERL%%/Bric/Util/Grp/Media.pm
! %%SITE_PERL%%/Bric/Util/Grp/Workflow.pm
! %%SITE_PERL%%/Bric/Util/Grp/Desk.pm
! %%SITE_PERL%%/Bric/Util/Grp/Element.pm
! %%SITE_PERL%%/Bric/Util/Grp/AssetType.pm
  %%SITE_PERL%%/Bric/Util/Grp/Org.pm
! %%SITE_PERL%%/Bric/Util/Grp/AssetVersion.pm
  %%SITE_PERL%%/Bric/Util/Grp/Source.pm
- %%SITE_PERL%%/Bric/Util/Grp/Asset.pm
- %%SITE_PERL%%/Bric/Util/Grp/MediaType.pm
- %%SITE_PERL%%/Bric/Util/Grp/Job.pm
- %%SITE_PERL%%/Bric/Util/Grp/ContribType.pm
  %%SITE_PERL%%/Bric/Util/Grp/Story.pm
! %%SITE_PERL%%/Bric/Util/Grp/Formatting.pm
  %%SITE_PERL%%/Bric/Util/Grp/User.pm
! %%SITE_PERL%%/Bric/Util/Grp/Site.pm
! %%SITE_PERL%%/Bric/Util/Grp/Person.pm
! %%SITE_PERL%%/Bric/Util/Grp/CategorySet.pm
! %%SITE_PERL%%/Bric/Util/Grp/AlertType.pm
! %%SITE_PERL%%/Bric/Util/Grp/Parts/Member.pm
! %%SITE_PERL%%/Bric/Util/Grp/Parts/Member/Contrib.pm
! %%SITE_PERL%%/Bric/Util/Language/zh_cn.pm
! %%SITE_PERL%%/Bric/Util/Language/km.pm
! %%SITE_PERL%%/Bric/Util/Language/en_us.pm
! %%SITE_PERL%%/Bric/Util/Language/vi_vn.pm
  %%SITE_PERL%%/Bric/Util/Language/bo.pm
! %%SITE_PERL%%/Bric/Util/Language/pt_pt.pm
! %%SITE_PERL%%/Bric/Util/Language/lo.pm
! %%SITE_PERL%%/Bric/Util/Language/my.pm
  %%SITE_PERL%%/Bric/Util/Language/it_it.pm
  %%SITE_PERL%%/Bric/Util/Language/ko_ko.pm
! %%SITE_PERL%%/Bric/Util/Language/ug.pm
! %%SITE_PERL%%/Bric/Util/Language/de_de.pm
  %%SITE_PERL%%/Bric/Util/Language/ru_ru.pm
  %%SITE_PERL%%/Bric/Util/Language/zh_hk.pm
  %%SITE_PERL%%/Bric/Util/Language/zh_tw.pm
! %%SITE_PERL%%/Bric/Util/Coll/Action.pm
! %%SITE_PERL%%/Bric/Util/Coll/OCInclude.pm
! %%SITE_PERL%%/Bric/Util/Coll/Contact.pm
! %%SITE_PERL%%/Bric/Util/Coll/Site.pm
! %%SITE_PERL%%/Bric/Util/Coll/OCElement.pm
! %%SITE_PERL%%/Bric/Util/Coll/Server.pm
! %%SITE_PERL%%/Bric/Util/Coll/Priv.pm
! %%SITE_PERL%%/Bric/Util/Coll/ServerType.pm
! %%SITE_PERL%%/Bric/Util/Coll/OutputChannel.pm
! %%SITE_PERL%%/Bric/Util/Coll/Member.pm
! %%SITE_PERL%%/Bric/Util/Coll/Addr.pm
! %%SITE_PERL%%/Bric/Util/Coll/Rule.pm
! %%SITE_PERL%%/Bric/Util/Coll/Resource.pm
! %%SITE_PERL%%/Bric/Util/Coll/Keyword.pm
! %%SITE_PERL%%/Bric/Util/Coll/Addr/Person.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/AP.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/MNI.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/DA.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/GEN.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/DP.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Person.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Category.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Member.pm
! %%SITE_PERL%%/Bric/Util/Attribute/MediaDataTile.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Grp.pm
! %%SITE_PERL%%/Bric/Util/Attribute/AssetType.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Workspace.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Action.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Media.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Story.pm
! %%SITE_PERL%%/Bric/Util/Attribute/Formatting.pm
! %%SITE_PERL%%/Bric/Util/Attribute/StoryDataTile.pm
! %%SITE_PERL%%/Bric/Util/Attribute/AssetTypeData.pm
! %%SITE_PERL%%/Bric/Util/FTP/Server.pm
! %%SITE_PERL%%/Bric/Util/FTP/DirHandle.pm
! %%SITE_PERL%%/Bric/Util/FTP/FileHandle.pm
! %%SITE_PERL%%/Bric/Util/Burner/Mason.pm
! %%SITE_PERL%%/Bric/Util/Burner/Template.pm
! %%SITE_PERL%%/Bric/Util/Burner/TemplateToolkit.pm
! %%SITE_PERL%%/Bric/Util/Job/Pub.pm
! %%SITE_PERL%%/Bric/Util/Job/Dist.pm
! %%SITE_PERL%%/Bric/Util/Trans/SFTP.pm
! %%SITE_PERL%%/Bric/Util/Trans/Jabber.pm
! %%SITE_PERL%%/Bric/Util/Trans/Mail.pm
  %%SITE_PERL%%/Bric/Util/Trans/FS.pm
  %%SITE_PERL%%/Bric/Util/Trans/FTP.pm
  %%SITE_PERL%%/Bric/Util/Trans/WebDAV.pm
! %%SITE_PERL%%/Bric/Util/AlertType/Parts/Rule.pm
! %%SITE_PERL%%/Bric/Util/Priv/Parts/Const.pm
! %%SITE_PERL%%/Bric/Util/DBD/Oracle.pm
! %%SITE_PERL%%/Bric/Util/DBD/Pg.pm
! %%SITE_PERL%%/Bric/Util/DBD/mysql.pm
! %%SITE_PERL%%/Bric/Util/Alerted/Parts/Sent.pm
! %%SITE_PERL%%/Bric/Biz/Category.pm
! %%SITE_PERL%%/Bric/Biz/Person.pm
! %%SITE_PERL%%/Bric/Biz/Asset.pm
! %%SITE_PERL%%/Bric/Biz/Site.pm
! %%SITE_PERL%%/Bric/Biz/Keyword.pm
! %%SITE_PERL%%/Bric/Biz/AssetType.pm
! %%SITE_PERL%%/Bric/Biz/Org.pm
! %%SITE_PERL%%/Bric/Biz/ATType.pm
! %%SITE_PERL%%/Bric/Biz/Workflow.pm
! %%SITE_PERL%%/Bric/Biz/OutputChannel.pm
! %%SITE_PERL%%/Bric/Biz/Contact.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Formatting.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Story.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile/Container.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile/Data.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Video.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Image.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Audio.pm
! %%SITE_PERL%%/Bric/Biz/Person/User.pm
! %%SITE_PERL%%/Bric/Biz/Org/Person.pm
! %%SITE_PERL%%/Bric/Biz/Org/Source.pm
! %%SITE_PERL%%/Bric/Biz/Org/Parts/Addr.pm
! %%SITE_PERL%%/Bric/Biz/AssetType/Parts/Data.pm
! %%SITE_PERL%%/Bric/Biz/OutputChannel/Element.pm
! %%SITE_PERL%%/Bric/Biz/Workflow/Parts/Desk.pm
! %%SITE_PERL%%/Bric/SOAP/Site.pm
! %%SITE_PERL%%/Bric/SOAP/Story.pm
! %%SITE_PERL%%/Bric/SOAP/User.pm
! %%SITE_PERL%%/Bric/SOAP/Workflow.pm
! %%SITE_PERL%%/Bric/SOAP/Handler.pm
! %%SITE_PERL%%/Bric/SOAP/Auth.pm
! %%SITE_PERL%%/Bric/SOAP/Category.pm
! %%SITE_PERL%%/Bric/SOAP/MediaType.pm
! %%SITE_PERL%%/Bric/SOAP/Util.pm
! %%SITE_PERL%%/Bric/SOAP/Media.pm
! %%SITE_PERL%%/Bric/SOAP/Asset.pm
! %%SITE_PERL%%/Bric/SOAP/Desk.pm
! %%SITE_PERL%%/Bric/SOAP/Element.pm
! %%SITE_PERL%%/Bric/SOAP/Keyword.pm
! %%SITE_PERL%%/Bric/SOAP/Template.pm
! %%SITE_PERL%%/Bric/Dist/Handler.pm
! %%SITE_PERL%%/Bric/Dist/ActionType.pm
! %%SITE_PERL%%/Bric/Dist/Resource.pm
! %%SITE_PERL%%/Bric/Dist/Client.pm
! %%SITE_PERL%%/Bric/Dist/ServerType.pm
! %%SITE_PERL%%/Bric/Dist/Server.pm
! %%SITE_PERL%%/Bric/Dist/Action.pm
! %%SITE_PERL%%/Bric/Dist/Action/DTDValidate.pm
! %%SITE_PERL%%/Bric/Dist/Action/Email.pm
! %%SITE_PERL%%/Bric/Dist/Action/HTMLClean.pm
! %%SITE_PERL%%/Bric/Dist/Action/Akamaize.pm
! %%SITE_PERL%%/Bric/Dist/Action/Mover.pm
  share/bricolage/Pg.sql
  
  @dirrm share/bricolage
--- 2486,2749 ----
  bricolage/data/burn/comp/oc_1/related_stories.mc
  bricolage/data/burn/comp/oc_1/related_story.mc
  bricolage/data/burn/comp/oc_1/story.mc
  %%SITE_PERL%%/Bric.pm
  %%SITE_PERL%%/Bric/Admin.pod
  %%SITE_PERL%%/Bric/AdvTemplates.pod
! %%SITE_PERL%%/Bric/Alert.pod
! %%SITE_PERL%%/Bric/App/AccessHandler.pm
  %%SITE_PERL%%/Bric/App/ApacheConfig.pm
  %%SITE_PERL%%/Bric/App/ApacheHandler.pm
  %%SITE_PERL%%/Bric/App/ApacheStartup.pm
! %%SITE_PERL%%/Bric/App/Auth.pm
! %%SITE_PERL%%/Bric/App/Authz.pm
! %%SITE_PERL%%/Bric/App/Cache.pm
! %%SITE_PERL%%/Bric/App/Callback.pm
  %%SITE_PERL%%/Bric/App/Callback/AddMore.pm
  %%SITE_PERL%%/Bric/App/Callback/Alert.pm
! %%SITE_PERL%%/Bric/App/Callback/Alias.pm
! %%SITE_PERL%%/Bric/App/Callback/AssetMeta.pm
! %%SITE_PERL%%/Bric/App/Callback/BulkPublish.pm
  %%SITE_PERL%%/Bric/App/Callback/CharTrans.pm
  %%SITE_PERL%%/Bric/App/Callback/ContainerProf.pm
  %%SITE_PERL%%/Bric/App/Callback/Desk.pm
! %%SITE_PERL%%/Bric/App/Callback/Event.pm
! %%SITE_PERL%%/Bric/App/Callback/ListManager.pm
! %%SITE_PERL%%/Bric/App/Callback/Login.pm
! %%SITE_PERL%%/Bric/App/Callback/Nav.pm
! %%SITE_PERL%%/Bric/App/Callback/Perm.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Action.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/AlertType.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Category.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Contrib.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Desk.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Dest.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/ElementType.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/FieldType.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/FormBuilder.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Grp.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Job.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Keyword.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Media.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/MediaType.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Org.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/OutputChannel.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Pref.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/Server.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/Site.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/Source.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/Story.pm
+ %%SITE_PERL%%/Bric/App/Callback/Profile/Template.pm
  %%SITE_PERL%%/Bric/App/Callback/Profile/User.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/UserPref.pm
! %%SITE_PERL%%/Bric/App/Callback/Profile/Workflow.pm
! %%SITE_PERL%%/Bric/App/Callback/Publish.pm
! %%SITE_PERL%%/Bric/App/Callback/Request.pm
! %%SITE_PERL%%/Bric/App/Callback/Search.pm
! %%SITE_PERL%%/Bric/App/Callback/SelectObject.pm
! %%SITE_PERL%%/Bric/App/Callback/SelectTime.pm
! %%SITE_PERL%%/Bric/App/Callback/SiteContext.pm
  %%SITE_PERL%%/Bric/App/Callback/Util/Contact.pm
! %%SITE_PERL%%/Bric/App/Callback/Workspace.pm
! %%SITE_PERL%%/Bric/App/CleanupHandler.pm
! %%SITE_PERL%%/Bric/App/Event.pm
! %%SITE_PERL%%/Bric/App/Handler.pm
! %%SITE_PERL%%/Bric/App/MediaFunc.pm
! %%SITE_PERL%%/Bric/App/PreviewHandler.pm
! %%SITE_PERL%%/Bric/App/Session.pm
! %%SITE_PERL%%/Bric/App/Util.pm
! %%SITE_PERL%%/Bric/AssetEditing.pod
! %%SITE_PERL%%/Bric/Biz/ATType.pm
! %%SITE_PERL%%/Bric/Biz/Asset.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Audio.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Image.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Media/Video.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile/Container.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile/Data.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Business/Story.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Formatting.pm
! %%SITE_PERL%%/Bric/Biz/Asset/Template.pm
! %%SITE_PERL%%/Bric/Biz/AssetType.pm
! %%SITE_PERL%%/Bric/Biz/AssetType/Parts/Data.pm
! %%SITE_PERL%%/Bric/Biz/Category.pm
! %%SITE_PERL%%/Bric/Biz/Contact.pm
! %%SITE_PERL%%/Bric/Biz/Element.pm
! %%SITE_PERL%%/Bric/Biz/Element/Container.pm
! %%SITE_PERL%%/Bric/Biz/Element/Field.pm
! %%SITE_PERL%%/Bric/Biz/ElementType.pm
! %%SITE_PERL%%/Bric/Biz/ElementType/Parts/FieldType.pm
! %%SITE_PERL%%/Bric/Biz/Keyword.pm
! %%SITE_PERL%%/Bric/Biz/Org.pm
! %%SITE_PERL%%/Bric/Biz/Org/Parts/Addr.pm
! %%SITE_PERL%%/Bric/Biz/Org/Person.pm
! %%SITE_PERL%%/Bric/Biz/Org/Source.pm
! %%SITE_PERL%%/Bric/Biz/OutputChannel.pm
! %%SITE_PERL%%/Bric/Biz/OutputChannel/Element.pm
! %%SITE_PERL%%/Bric/Biz/Person.pm
! %%SITE_PERL%%/Bric/Biz/Person/User.pm
! %%SITE_PERL%%/Bric/Biz/Site.pm
! %%SITE_PERL%%/Bric/Biz/Workflow.pm
! %%SITE_PERL%%/Bric/Biz/Workflow/Parts/Desk.pm
! %%SITE_PERL%%/Bric/Changes.pod
! %%SITE_PERL%%/Bric/Config.pm
! %%SITE_PERL%%/Bric/DBA.pod
! %%SITE_PERL%%/Bric/Dist/Action.pm
! %%SITE_PERL%%/Bric/Dist/Action/Akamaize.pm
! %%SITE_PERL%%/Bric/Dist/Action/DTDValidate.pm
! %%SITE_PERL%%/Bric/Dist/Action/Email.pm
! %%SITE_PERL%%/Bric/Dist/Action/HTMLClean.pm
! %%SITE_PERL%%/Bric/Dist/Action/Mover.pm
! %%SITE_PERL%%/Bric/Dist/ActionType.pm
! %%SITE_PERL%%/Bric/Dist/Client.pm
! %%SITE_PERL%%/Bric/Dist/Handler.pm
! %%SITE_PERL%%/Bric/Dist/Resource.pm
! %%SITE_PERL%%/Bric/Dist/Server.pm
! %%SITE_PERL%%/Bric/Dist/ServerType.pm
! %%SITE_PERL%%/Bric/ElementAdmin.pod
! %%SITE_PERL%%/Bric/FAQ.pod
! %%SITE_PERL%%/Bric/HTMLTemplate.pod
! %%SITE_PERL%%/Bric/Hacker.pod
! %%SITE_PERL%%/Bric/License.pod
! %%SITE_PERL%%/Bric/SOAP.pm
! %%SITE_PERL%%/Bric/SOAP/Asset.pm
! %%SITE_PERL%%/Bric/SOAP/ATType.pm
! %%SITE_PERL%%/Bric/SOAP/Auth.pm
! %%SITE_PERL%%/Bric/SOAP/Category.pm
! %%SITE_PERL%%/Bric/SOAP/Desk.pm
! %%SITE_PERL%%/Bric/SOAP/ElementType.pm
! %%SITE_PERL%%/Bric/SOAP/Handler.pm
! %%SITE_PERL%%/Bric/SOAP/Keyword.pm
! %%SITE_PERL%%/Bric/SOAP/Media.pm
! %%SITE_PERL%%/Bric/SOAP/MediaType.pm
! %%SITE_PERL%%/Bric/SOAP/OutputChannel.pm
! %%SITE_PERL%%/Bric/SOAP/Site.pm
! %%SITE_PERL%%/Bric/SOAP/Story.pm
! %%SITE_PERL%%/Bric/SOAP/Template.pm
! %%SITE_PERL%%/Bric/SOAP/User.pm
! %%SITE_PERL%%/Bric/SOAP/Util.pm
! %%SITE_PERL%%/Bric/SOAP/Workflow.pm
! %%SITE_PERL%%/Bric/Security.pod
! %%SITE_PERL%%/Bric/Templates.pod
! %%SITE_PERL%%/Bric/ToDo.pod
  %%SITE_PERL%%/Bric/Util/Alert.pm
! %%SITE_PERL%%/Bric/Util/AlertType.pm
! %%SITE_PERL%%/Bric/Util/AlertType/Parts/Rule.pm
  %%SITE_PERL%%/Bric/Util/Alerted.pm
+ %%SITE_PERL%%/Bric/Util/Alerted/Parts/Sent.pm
+ %%SITE_PERL%%/Bric/Util/Attribute.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/Action.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/Category.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/ElementType.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/FieldType.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/Grp.pm
+ %%SITE_PERL%%/Bric/Util/Attribute/Member.pm
+ %%SITE_PERL%%/Bric/Util/AuthInternal.pm
+ %%SITE_PERL%%/Bric/Util/AuthLDAP.pm
+ %%SITE_PERL%%/Bric/Util/Burner.pm
+ %%SITE_PERL%%/Bric/Util/Burner/Mason.pm
+ %%SITE_PERL%%/Bric/Util/Burner/PHP.pm
+ %%SITE_PERL%%/Bric/Util/Burner/Template.pm
+ %%SITE_PERL%%/Bric/Util/Burner/TemplateToolkit.pm
  %%SITE_PERL%%/Bric/Util/CharTrans.pm
! %%SITE_PERL%%/Bric/Util/Class.pm
! %%SITE_PERL%%/Bric/Util/Coll.pm
! %%SITE_PERL%%/Bric/Util/Coll/Action.pm
! %%SITE_PERL%%/Bric/Util/Coll/Addr.pm
! %%SITE_PERL%%/Bric/Util/Coll/Addr/Person.pm
! %%SITE_PERL%%/Bric/Util/Coll/Contact.pm
! %%SITE_PERL%%/Bric/Util/Coll/Keyword.pm
! %%SITE_PERL%%/Bric/Util/Coll/Member.pm
! %%SITE_PERL%%/Bric/Util/Coll/OCElement.pm
! %%SITE_PERL%%/Bric/Util/Coll/OCInclude.pm
! %%SITE_PERL%%/Bric/Util/Coll/OutputChannel.pm
! %%SITE_PERL%%/Bric/Util/Coll/Priv.pm
! %%SITE_PERL%%/Bric/Util/Coll/Resource.pm
! %%SITE_PERL%%/Bric/Util/Coll/Rule.pm
! %%SITE_PERL%%/Bric/Util/Coll/Server.pm
! %%SITE_PERL%%/Bric/Util/Coll/ServerType.pm
! %%SITE_PERL%%/Bric/Util/Coll/Site.pm
! %%SITE_PERL%%/Bric/Util/DBD/Oracle.pm
! %%SITE_PERL%%/Bric/Util/DBD/Pg.pm
! %%SITE_PERL%%/Bric/Util/DBD/mysql.pm
! %%SITE_PERL%%/Bric/Util/DBI.pm
  %%SITE_PERL%%/Bric/Util/Event.pm
  %%SITE_PERL%%/Bric/Util/EventType.pm
! %%SITE_PERL%%/Bric/Util/FTP/DirHandle.pm
! %%SITE_PERL%%/Bric/Util/FTP/FileHandle.pm
! %%SITE_PERL%%/Bric/Util/FTP/Server.pm
  %%SITE_PERL%%/Bric/Util/Fault.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/AP.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/DA.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/DP.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/GEN.pm
! %%SITE_PERL%%/Bric/Util/Fault/Exception/MNI.pm
! %%SITE_PERL%%/Bric/Util/Grp.pm
! %%SITE_PERL%%/Bric/Util/Grp/AlertType.pm
! %%SITE_PERL%%/Bric/Util/Grp/Asset.pm
  %%SITE_PERL%%/Bric/Util/Grp/AssetLanguage.pm
! %%SITE_PERL%%/Bric/Util/Grp/AssetVersion.pm
! %%SITE_PERL%%/Bric/Util/Grp/ATType.pm
! %%SITE_PERL%%/Bric/Util/Grp/CategorySet.pm
! %%SITE_PERL%%/Bric/Util/Grp/ContribType.pm
! %%SITE_PERL%%/Bric/Util/Grp/Desk.pm
! %%SITE_PERL%%/Bric/Util/Grp/Dest.pm
  %%SITE_PERL%%/Bric/Util/Grp/ElementType.pm
+ %%SITE_PERL%%/Bric/Util/Grp/Event.pm
+ %%SITE_PERL%%/Bric/Util/Grp/Grp.pm
+ %%SITE_PERL%%/Bric/Util/Grp/Job.pm
+ %%SITE_PERL%%/Bric/Util/Grp/Keyword.pm
  %%SITE_PERL%%/Bric/Util/Grp/Media.pm
! %%SITE_PERL%%/Bric/Util/Grp/MediaType.pm
  %%SITE_PERL%%/Bric/Util/Grp/Org.pm
! %%SITE_PERL%%/Bric/Util/Grp/OutputChannel.pm
! %%SITE_PERL%%/Bric/Util/Grp/Parts/Member.pm
! %%SITE_PERL%%/Bric/Util/Grp/Parts/Member/Contrib.pm
! %%SITE_PERL%%/Bric/Util/Grp/Person.pm
! %%SITE_PERL%%/Bric/Util/Grp/Pref.pm
! %%SITE_PERL%%/Bric/Util/Grp/Site.pm
  %%SITE_PERL%%/Bric/Util/Grp/Source.pm
  %%SITE_PERL%%/Bric/Util/Grp/Story.pm
! %%SITE_PERL%%/Bric/Util/Grp/SubelementType.pm
! %%SITE_PERL%%/Bric/Util/Grp/Template.pm
  %%SITE_PERL%%/Bric/Util/Grp/User.pm
! %%SITE_PERL%%/Bric/Util/Grp/Workflow.pm
! %%SITE_PERL%%/Bric/Util/Job.pm
! %%SITE_PERL%%/Bric/Util/Job/Dist.pm
! %%SITE_PERL%%/Bric/Util/Job/Pub.pm
! %%SITE_PERL%%/Bric/Util/Language.pm
  %%SITE_PERL%%/Bric/Util/Language/bo.pm
! %%SITE_PERL%%/Bric/Util/Language/de_de.pm
! %%SITE_PERL%%/Bric/Util/Language/en_us.pm
  %%SITE_PERL%%/Bric/Util/Language/it_it.pm
+ %%SITE_PERL%%/Bric/Util/Language/km.pm
  %%SITE_PERL%%/Bric/Util/Language/ko_ko.pm
! %%SITE_PERL%%/Bric/Util/Language/lo.pm
! %%SITE_PERL%%/Bric/Util/Language/my.pm
! %%SITE_PERL%%/Bric/Util/Language/pt_pt.pm
  %%SITE_PERL%%/Bric/Util/Language/ru_ru.pm
+ %%SITE_PERL%%/Bric/Util/Language/ug.pm
+ %%SITE_PERL%%/Bric/Util/Language/vi_vn.pm
+ %%SITE_PERL%%/Bric/Util/Language/zh_cn.pm
  %%SITE_PERL%%/Bric/Util/Language/zh_hk.pm
  %%SITE_PERL%%/Bric/Util/Language/zh_tw.pm
! %%SITE_PERL%%/Bric/Util/MediaType.pm
! %%SITE_PERL%%/Bric/Util/Pref.pm
! %%SITE_PERL%%/Bric/Util/Priv.pm
! %%SITE_PERL%%/Bric/Util/Priv/Parts/Const.pm
! %%SITE_PERL%%/Bric/Util/Time.pm
  %%SITE_PERL%%/Bric/Util/Trans/FS.pm
  %%SITE_PERL%%/Bric/Util/Trans/FTP.pm
+ %%SITE_PERL%%/Bric/Util/Trans/Jabber.pm
+ %%SITE_PERL%%/Bric/Util/Trans/Mail.pm
+ %%SITE_PERL%%/Bric/Util/Trans/SFTP.pm
  %%SITE_PERL%%/Bric/Util/Trans/WebDAV.pm
! %%SITE_PERL%%/Bric/Util/UserPref.pm
! %%SITE_PERL%%/mach/auto/Bric/.packlist
! %%SITE_PERL%%/mach/auto/bric_bin/.packlist
  share/bricolage/Pg.sql
  
  @dirrm share/bricolage
***************
*** 2945,2950 ****
--- 2777,2785 ----
  @dirrm %%SITE_PERL%%/Bric/Biz/OutputChannel
  @dirrm %%SITE_PERL%%/Bric/Biz/Org/Parts
  @dirrm %%SITE_PERL%%/Bric/Biz/Org
+ @dirrm %%SITE_PERL%%/Bric/Biz/ElementType/Parts
+ @dirrm %%SITE_PERL%%/Bric/Biz/ElementType
+ @dirrm %%SITE_PERL%%/Bric/Biz/Element
  @dirrm %%SITE_PERL%%/Bric/Biz/AssetType/Parts
  @dirrm %%SITE_PERL%%/Bric/Biz/AssetType
  @dirrm %%SITE_PERL%%/Bric/Biz/Asset/Business/Parts/Tile
***************
*** 2960,2965 ****
--- 2795,2804 ----
  @dirrm %%SITE_PERL%%/Bric
  @dirrm %%SITE_PERL%%/mach/auto/Bric
  @dirrm %%SITE_PERL%%/mach/auto/bric_bin
+ @dirrm bricolage/upgrade/1.10.0
+ @dirrm bricolage/upgrade/1.9.1
+ @dirrm bricolage/upgrade/1.9.0
+ @dirrm bricolage/upgrade/1.8.9
  @dirrm bricolage/upgrade/1.8.8
  @dirrm bricolage/upgrade/1.8.7
  @dirrm bricolage/upgrade/1.8.6
***************
*** 2970,2975 ****
--- 2809,2820 ----
  @dirrm bricolage/upgrade/1.8.0
  @dirrm bricolage/upgrade/lib
  @dirrm bricolage/upgrade
+ @exec [ -d %D/bricolage/tmp ] || (mkdir -p %D/bricolage/tmp && chown www:www %D/bricolage/tmp)
+ @exec [ -d %D/bricolage/tmp/bricolage ] || (mkdir -p %D/bricolage/tmp/bricolage && chown www:www %D/bricolage/tmp/bricolage)
+ @dirrm bricolage/tmp/bricolage
+ @dirrm bricolage/tmp
+ @exec [ -d %D/bricolage/log ] || (mkdir -p %D/bricolage/log && chown www:www %D/bricolage/log)
+ @dirrm bricolage/log
  @dirrm bricolage/data/burn/comp/oc_1
  @dirrm bricolage/data/burn/comp
  @dirrm bricolage/data/burn
***************
*** 2978,2989 ****
  @dirrm bricolage/comp/workflow/trail
  @dirrm bricolage/comp/workflow/profile/workspace/clone
  @dirrm bricolage/comp/workflow/profile/workspace
! @dirrm bricolage/comp/workflow/profile/templates/new
! @dirrm bricolage/comp/workflow/profile/templates
  @dirrm bricolage/comp/workflow/profile/story/new
  @dirrm bricolage/comp/workflow/profile/story/container
  @dirrm bricolage/comp/workflow/profile/story
  @dirrm bricolage/comp/workflow/profile/publish
  @dirrm bricolage/comp/workflow/profile/preview
  @dirrm bricolage/comp/workflow/profile/media/new
  @dirrm bricolage/comp/workflow/profile/media/container
--- 2823,2835 ----
  @dirrm bricolage/comp/workflow/trail
  @dirrm bricolage/comp/workflow/profile/workspace/clone
  @dirrm bricolage/comp/workflow/profile/workspace
! @dirrm bricolage/comp/workflow/profile/template/new
! @dirrm bricolage/comp/workflow/profile/template
  @dirrm bricolage/comp/workflow/profile/story/new
  @dirrm bricolage/comp/workflow/profile/story/container
  @dirrm bricolage/comp/workflow/profile/story
  @dirrm bricolage/comp/workflow/profile/publish
+ @dirrm bricolage/comp/workflow/profile/preview/control
  @dirrm bricolage/comp/workflow/profile/preview
  @dirrm bricolage/comp/workflow/profile/media/new
  @dirrm bricolage/comp/workflow/profile/media/container
***************
*** 2997,3002 ****
--- 2843,2852 ----
  @dirrm bricolage/comp/workflow/alerts
  @dirrm bricolage/comp/workflow/active
  @dirrm bricolage/comp/workflow
+ @dirrm bricolage/comp/widgets/buttons
+ @dirrm bricolage/comp/widgets/dialog_box
+ @dirrm bricolage/comp/widgets/field_type
+ @dirrm bricolage/comp/widgets/wysiwyg
  @dirrm bricolage/comp/widgets/wrappers/sharky
  @dirrm bricolage/comp/widgets/wrappers
  @dirrm bricolage/comp/widgets/tmpl_prof
***************
*** 3006,3025 ****
  @dirrm bricolage/comp/widgets/select_time
  @dirrm bricolage/comp/widgets/select_object
  @dirrm bricolage/comp/widgets/search
- @dirrm bricolage/comp/widgets/qa
  @dirrm bricolage/comp/widgets/publish
  @dirrm bricolage/comp/widgets/profile
  @dirrm bricolage/comp/widgets/perm
  @dirrm bricolage/comp/widgets/media_prof
  @dirrm bricolage/comp/widgets/login
  @dirrm bricolage/comp/widgets/listManager
  @dirrm bricolage/comp/widgets/htmlarea
  @dirrm bricolage/comp/widgets/help
  @dirrm bricolage/comp/widgets/grp_membership
  @dirrm bricolage/comp/widgets/formBuilder
  @dirrm bricolage/comp/widgets/file_upload
  @dirrm bricolage/comp/widgets/eventList
- @dirrm bricolage/comp/widgets/element_data
  @dirrm bricolage/comp/widgets/doubleListManager
  @dirrm bricolage/comp/widgets/desk
  @dirrm bricolage/comp/widgets/debug
--- 2856,2874 ----
  @dirrm bricolage/comp/widgets/select_time
  @dirrm bricolage/comp/widgets/select_object
  @dirrm bricolage/comp/widgets/search
  @dirrm bricolage/comp/widgets/publish
  @dirrm bricolage/comp/widgets/profile
  @dirrm bricolage/comp/widgets/perm
  @dirrm bricolage/comp/widgets/media_prof
  @dirrm bricolage/comp/widgets/login
  @dirrm bricolage/comp/widgets/listManager
+ @exec [ -d %D/bricolage/comp/widgets/htmlarea ] || (mkdir -p %D/bricolage/comp/widgets/htmlarea && chown www:www %D/bricolage/comp/widgets/htmlarea)
  @dirrm bricolage/comp/widgets/htmlarea
  @dirrm bricolage/comp/widgets/help
  @dirrm bricolage/comp/widgets/grp_membership
  @dirrm bricolage/comp/widgets/formBuilder
  @dirrm bricolage/comp/widgets/file_upload
  @dirrm bricolage/comp/widgets/eventList
  @dirrm bricolage/comp/widgets/doubleListManager
  @dirrm bricolage/comp/widgets/desk
  @dirrm bricolage/comp/widgets/debug
***************
*** 3029,3034 ****
--- 2878,2885 ----
  @dirrm bricolage/comp/widgets/alertList
  @dirrm bricolage/comp/widgets/add_more
  @dirrm bricolage/comp/widgets
+ @exec [ -d %D/bricolage/comp/media/wysiwyg ] || (mkdir -p %D/bricolage/comp/media/wysiwyg && chown www:www %D/bricolage/comp/media/wysiwyg)
+ @dirrm bricolage/comp/media/wysiwyg
  @dirrm bricolage/comp/media/mime
  @dirrm bricolage/comp/media/js
  @dirrm bricolage/comp/media/images/zh_tw
***************
*** 3038,3044 ****
  @dirrm bricolage/comp/media/images/ug
  @dirrm bricolage/comp/media/images/pt_pt
  @dirrm bricolage/comp/media/images/ru_ru
- @dirrm bricolage/comp/media/images/numbers
  @dirrm bricolage/comp/media/images/my
  @dirrm bricolage/comp/media/images/lo
  @dirrm bricolage/comp/media/images/ko_ko
--- 2889,2894 ----
***************
*** 3052,3065 ****
  @dirrm bricolage/comp/media
  @dirrm bricolage/comp/login
  @dirrm bricolage/comp/lib/util
- @dirrm bricolage/comp/lib/process
  @dirrm bricolage/comp/lib
  @dirrm bricolage/comp/help/zh_tw/workflow/trail
! @dirrm bricolage/comp/help/zh_tw/workflow/profile/templates
! @dirrm bricolage/comp/help/zh_tw/workflow/profile/story/container
  @dirrm bricolage/comp/help/zh_tw/workflow/profile/story
- @dirrm bricolage/comp/help/zh_tw/workflow/profile/media/container
  @dirrm bricolage/comp/help/zh_tw/workflow/profile/media
  @dirrm bricolage/comp/help/zh_tw/workflow/profile
  @dirrm bricolage/comp/help/zh_tw/workflow/manager
  @dirrm bricolage/comp/help/zh_tw/workflow/events
--- 2902,2913 ----
  @dirrm bricolage/comp/media
  @dirrm bricolage/comp/login
  @dirrm bricolage/comp/lib/util
  @dirrm bricolage/comp/lib
  @dirrm bricolage/comp/help/zh_tw/workflow/trail
! @dirrm bricolage/comp/help/zh_tw/workflow/profile/template
  @dirrm bricolage/comp/help/zh_tw/workflow/profile/story
  @dirrm bricolage/comp/help/zh_tw/workflow/profile/media
+ @dirrm bricolage/comp/help/zh_tw/workflow/profile/container
  @dirrm bricolage/comp/help/zh_tw/workflow/profile
  @dirrm bricolage/comp/help/zh_tw/workflow/manager
  @dirrm bricolage/comp/help/zh_tw/workflow/events
***************
*** 3072,3082 ****
  @dirrm bricolage/comp/help/zh_tw/admin
  @dirrm bricolage/comp/help/zh_tw
  @dirrm bricolage/comp/help/zh_hk/workflow/trail
! @dirrm bricolage/comp/help/zh_hk/workflow/profile/templates
! @dirrm bricolage/comp/help/zh_hk/workflow/profile/story/container
  @dirrm bricolage/comp/help/zh_hk/workflow/profile/story
- @dirrm bricolage/comp/help/zh_hk/workflow/profile/media/container
  @dirrm bricolage/comp/help/zh_hk/workflow/profile/media
  @dirrm bricolage/comp/help/zh_hk/workflow/profile
  @dirrm bricolage/comp/help/zh_hk/workflow/manager
  @dirrm bricolage/comp/help/zh_hk/workflow/events
--- 2920,2929 ----
  @dirrm bricolage/comp/help/zh_tw/admin
  @dirrm bricolage/comp/help/zh_tw
  @dirrm bricolage/comp/help/zh_hk/workflow/trail
! @dirrm bricolage/comp/help/zh_hk/workflow/profile/template
  @dirrm bricolage/comp/help/zh_hk/workflow/profile/story
  @dirrm bricolage/comp/help/zh_hk/workflow/profile/media
+ @dirrm bricolage/comp/help/zh_hk/workflow/profile/container
  @dirrm bricolage/comp/help/zh_hk/workflow/profile
  @dirrm bricolage/comp/help/zh_hk/workflow/manager
  @dirrm bricolage/comp/help/zh_hk/workflow/events
***************
*** 3089,3099 ****
  @dirrm bricolage/comp/help/zh_hk/admin
  @dirrm bricolage/comp/help/zh_hk
  @dirrm bricolage/comp/help/zh_cn/workflow/trail
! @dirrm bricolage/comp/help/zh_cn/workflow/profile/templates
! @dirrm bricolage/comp/help/zh_cn/workflow/profile/story/container
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/story
- @dirrm bricolage/comp/help/zh_cn/workflow/profile/media/container
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/media
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/alias
  @dirrm bricolage/comp/help/zh_cn/workflow/profile
  @dirrm bricolage/comp/help/zh_cn/workflow/manager
--- 2936,2945 ----
  @dirrm bricolage/comp/help/zh_hk/admin
  @dirrm bricolage/comp/help/zh_hk
  @dirrm bricolage/comp/help/zh_cn/workflow/trail
! @dirrm bricolage/comp/help/zh_cn/workflow/profile/template
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/story
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/media
+ @dirrm bricolage/comp/help/zh_cn/workflow/profile/container
  @dirrm bricolage/comp/help/zh_cn/workflow/profile/alias
  @dirrm bricolage/comp/help/zh_cn/workflow/profile
  @dirrm bricolage/comp/help/zh_cn/workflow/manager
***************
*** 3110,3120 ****
  @dirrm bricolage/comp/help/zh_cn/admin
  @dirrm bricolage/comp/help/zh_cn
  @dirrm bricolage/comp/help/vi_vn/workflow/trail
! @dirrm bricolage/comp/help/vi_vn/workflow/profile/templates
! @dirrm bricolage/comp/help/vi_vn/workflow/profile/story/container
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/story
- @dirrm bricolage/comp/help/vi_vn/workflow/profile/media/container
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/media
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/alias
  @dirrm bricolage/comp/help/vi_vn/workflow/profile
  @dirrm bricolage/comp/help/vi_vn/workflow/manager
--- 2956,2965 ----
  @dirrm bricolage/comp/help/zh_cn/admin
  @dirrm bricolage/comp/help/zh_cn
  @dirrm bricolage/comp/help/vi_vn/workflow/trail
! @dirrm bricolage/comp/help/vi_vn/workflow/profile/template
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/story
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/media
+ @dirrm bricolage/comp/help/vi_vn/workflow/profile/container
  @dirrm bricolage/comp/help/vi_vn/workflow/profile/alias
  @dirrm bricolage/comp/help/vi_vn/workflow/profile
  @dirrm bricolage/comp/help/vi_vn/workflow/manager
***************
*** 3131,3141 ****
  @dirrm bricolage/comp/help/vi_vn/admin
  @dirrm bricolage/comp/help/vi_vn
  @dirrm bricolage/comp/help/ug/workflow/trail
! @dirrm bricolage/comp/help/ug/workflow/profile/templates
! @dirrm bricolage/comp/help/ug/workflow/profile/story/container
  @dirrm bricolage/comp/help/ug/workflow/profile/story
- @dirrm bricolage/comp/help/ug/workflow/profile/media/container
  @dirrm bricolage/comp/help/ug/workflow/profile/media
  @dirrm bricolage/comp/help/ug/workflow/profile/alias
  @dirrm bricolage/comp/help/ug/workflow/profile
  @dirrm bricolage/comp/help/ug/workflow/manager
--- 2976,2985 ----
  @dirrm bricolage/comp/help/vi_vn/admin
  @dirrm bricolage/comp/help/vi_vn
  @dirrm bricolage/comp/help/ug/workflow/trail
! @dirrm bricolage/comp/help/ug/workflow/profile/template
  @dirrm bricolage/comp/help/ug/workflow/profile/story
  @dirrm bricolage/comp/help/ug/workflow/profile/media
+ @dirrm bricolage/comp/help/ug/workflow/profile/container
  @dirrm bricolage/comp/help/ug/workflow/profile/alias
  @dirrm bricolage/comp/help/ug/workflow/profile
  @dirrm bricolage/comp/help/ug/workflow/manager
***************
*** 3152,3162 ****
  @dirrm bricolage/comp/help/ug/admin
  @dirrm bricolage/comp/help/ug
  @dirrm bricolage/comp/help/ru_ru/workflow/trail
! @dirrm bricolage/comp/help/ru_ru/workflow/profile/templates
! @dirrm bricolage/comp/help/ru_ru/workflow/profile/story/container
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/story
- @dirrm bricolage/comp/help/ru_ru/workflow/profile/media/container
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/media
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/alias
  @dirrm bricolage/comp/help/ru_ru/workflow/profile
  @dirrm bricolage/comp/help/ru_ru/workflow/manager
--- 2996,3005 ----
  @dirrm bricolage/comp/help/ug/admin
  @dirrm bricolage/comp/help/ug
  @dirrm bricolage/comp/help/ru_ru/workflow/trail
! @dirrm bricolage/comp/help/ru_ru/workflow/profile/template
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/story
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/media
+ @dirrm bricolage/comp/help/ru_ru/workflow/profile/container
  @dirrm bricolage/comp/help/ru_ru/workflow/profile/alias
  @dirrm bricolage/comp/help/ru_ru/workflow/profile
  @dirrm bricolage/comp/help/ru_ru/workflow/manager
***************
*** 3173,3183 ****
  @dirrm bricolage/comp/help/ru_ru/admin
  @dirrm bricolage/comp/help/ru_ru
  @dirrm bricolage/comp/help/pt_pt/workflow/trail
! @dirrm bricolage/comp/help/pt_pt/workflow/profile/templates
! @dirrm bricolage/comp/help/pt_pt/workflow/profile/story/container
  @dirrm bricolage/comp/help/pt_pt/workflow/profile/story
- @dirrm bricolage/comp/help/pt_pt/workflow/profile/media/container
  @dirrm bricolage/comp/help/pt_pt/workflow/profile/media
  @dirrm bricolage/comp/help/pt_pt/workflow/profile
  @dirrm bricolage/comp/help/pt_pt/workflow/manager
  @dirrm bricolage/comp/help/pt_pt/workflow/events
--- 3016,3025 ----
  @dirrm bricolage/comp/help/ru_ru/admin
  @dirrm bricolage/comp/help/ru_ru
  @dirrm bricolage/comp/help/pt_pt/workflow/trail
! @dirrm bricolage/comp/help/pt_pt/workflow/profile/template
  @dirrm bricolage/comp/help/pt_pt/workflow/profile/story
  @dirrm bricolage/comp/help/pt_pt/workflow/profile/media
+ @dirrm bricolage/comp/help/pt_pt/workflow/profile/container
  @dirrm bricolage/comp/help/pt_pt/workflow/profile
  @dirrm bricolage/comp/help/pt_pt/workflow/manager
  @dirrm bricolage/comp/help/pt_pt/workflow/events
***************
*** 3190,3200 ****
  @dirrm bricolage/comp/help/pt_pt/admin
  @dirrm bricolage/comp/help/pt_pt
  @dirrm bricolage/comp/help/my/workflow/trail
! @dirrm bricolage/comp/help/my/workflow/profile/templates
! @dirrm bricolage/comp/help/my/workflow/profile/story/container
  @dirrm bricolage/comp/help/my/workflow/profile/story
- @dirrm bricolage/comp/help/my/workflow/profile/media/container
  @dirrm bricolage/comp/help/my/workflow/profile/media
  @dirrm bricolage/comp/help/my/workflow/profile/alias
  @dirrm bricolage/comp/help/my/workflow/profile
  @dirrm bricolage/comp/help/my/workflow/manager
--- 3032,3041 ----
  @dirrm bricolage/comp/help/pt_pt/admin
  @dirrm bricolage/comp/help/pt_pt
  @dirrm bricolage/comp/help/my/workflow/trail
! @dirrm bricolage/comp/help/my/workflow/profile/template
  @dirrm bricolage/comp/help/my/workflow/profile/story
  @dirrm bricolage/comp/help/my/workflow/profile/media
+ @dirrm bricolage/comp/help/my/workflow/profile/container
  @dirrm bricolage/comp/help/my/workflow/profile/alias
  @dirrm bricolage/comp/help/my/workflow/profile
  @dirrm bricolage/comp/help/my/workflow/manager
***************
*** 3211,3221 ****
  @dirrm bricolage/comp/help/my/admin
  @dirrm bricolage/comp/help/my
  @dirrm bricolage/comp/help/lo/workflow/trail
! @dirrm bricolage/comp/help/lo/workflow/profile/templates
! @dirrm bricolage/comp/help/lo/workflow/profile/story/container
  @dirrm bricolage/comp/help/lo/workflow/profile/story
- @dirrm bricolage/comp/help/lo/workflow/profile/media/container
  @dirrm bricolage/comp/help/lo/workflow/profile/media
  @dirrm bricolage/comp/help/lo/workflow/profile/alias
  @dirrm bricolage/comp/help/lo/workflow/profile
  @dirrm bricolage/comp/help/lo/workflow/manager
--- 3052,3061 ----
  @dirrm bricolage/comp/help/my/admin
  @dirrm bricolage/comp/help/my
  @dirrm bricolage/comp/help/lo/workflow/trail
! @dirrm bricolage/comp/help/lo/workflow/profile/template
  @dirrm bricolage/comp/help/lo/workflow/profile/story
  @dirrm bricolage/comp/help/lo/workflow/profile/media
+ @dirrm bricolage/comp/help/lo/workflow/profile/container
  @dirrm bricolage/comp/help/lo/workflow/profile/alias
  @dirrm bricolage/comp/help/lo/workflow/profile
  @dirrm bricolage/comp/help/lo/workflow/manager
***************
*** 3232,3242 ****
  @dirrm bricolage/comp/help/lo/admin
  @dirrm bricolage/comp/help/lo
  @dirrm bricolage/comp/help/ko_ko/workflow/trail
! @dirrm bricolage/comp/help/ko_ko/workflow/profile/templates
! @dirrm bricolage/comp/help/ko_ko/workflow/profile/story/container
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/story
- @dirrm bricolage/comp/help/ko_ko/workflow/profile/media/container
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/media
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/alias
  @dirrm bricolage/comp/help/ko_ko/workflow/profile
  @dirrm bricolage/comp/help/ko_ko/workflow/manager
--- 3072,3081 ----
  @dirrm bricolage/comp/help/lo/admin
  @dirrm bricolage/comp/help/lo
  @dirrm bricolage/comp/help/ko_ko/workflow/trail
! @dirrm bricolage/comp/help/ko_ko/workflow/profile/template
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/story
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/media
+ @dirrm bricolage/comp/help/ko_ko/workflow/profile/container
  @dirrm bricolage/comp/help/ko_ko/workflow/profile/alias
  @dirrm bricolage/comp/help/ko_ko/workflow/profile
  @dirrm bricolage/comp/help/ko_ko/workflow/manager
***************
*** 3253,3263 ****
  @dirrm bricolage/comp/help/ko_ko/admin
  @dirrm bricolage/comp/help/ko_ko
  @dirrm bricolage/comp/help/km/workflow/trail
! @dirrm bricolage/comp/help/km/workflow/profile/templates
! @dirrm bricolage/comp/help/km/workflow/profile/story/container
  @dirrm bricolage/comp/help/km/workflow/profile/story
- @dirrm bricolage/comp/help/km/workflow/profile/media/container
  @dirrm bricolage/comp/help/km/workflow/profile/media
  @dirrm bricolage/comp/help/km/workflow/profile/alias
  @dirrm bricolage/comp/help/km/workflow/profile
  @dirrm bricolage/comp/help/km/workflow/manager
--- 3092,3101 ----
  @dirrm bricolage/comp/help/ko_ko/admin
  @dirrm bricolage/comp/help/ko_ko
  @dirrm bricolage/comp/help/km/workflow/trail
! @dirrm bricolage/comp/help/km/workflow/profile/template
  @dirrm bricolage/comp/help/km/workflow/profile/story
  @dirrm bricolage/comp/help/km/workflow/profile/media
+ @dirrm bricolage/comp/help/km/workflow/profile/container
  @dirrm bricolage/comp/help/km/workflow/profile/alias
  @dirrm bricolage/comp/help/km/workflow/profile
  @dirrm bricolage/comp/help/km/workflow/manager
***************
*** 3274,3284 ****
  @dirrm bricolage/comp/help/km/admin
  @dirrm bricolage/comp/help/km
  @dirrm bricolage/comp/help/it_it/workflow/trail
! @dirrm bricolage/comp/help/it_it/workflow/profile/templates
! @dirrm bricolage/comp/help/it_it/workflow/profile/story/container
  @dirrm bricolage/comp/help/it_it/workflow/profile/story
- @dirrm bricolage/comp/help/it_it/workflow/profile/media/container
  @dirrm bricolage/comp/help/it_it/workflow/profile/media
  @dirrm bricolage/comp/help/it_it/workflow/profile
  @dirrm bricolage/comp/help/it_it/workflow/manager
  @dirrm bricolage/comp/help/it_it/workflow/events
--- 3112,3121 ----
  @dirrm bricolage/comp/help/km/admin
  @dirrm bricolage/comp/help/km
  @dirrm bricolage/comp/help/it_it/workflow/trail
! @dirrm bricolage/comp/help/it_it/workflow/profile/template
  @dirrm bricolage/comp/help/it_it/workflow/profile/story
  @dirrm bricolage/comp/help/it_it/workflow/profile/media
+ @dirrm bricolage/comp/help/it_it/workflow/profile/container
  @dirrm bricolage/comp/help/it_it/workflow/profile
  @dirrm bricolage/comp/help/it_it/workflow/manager
  @dirrm bricolage/comp/help/it_it/workflow/events
***************
*** 3291,3301 ****
  @dirrm bricolage/comp/help/it_it/admin
  @dirrm bricolage/comp/help/it_it
  @dirrm bricolage/comp/help/en_us/workflow/trail
! @dirrm bricolage/comp/help/en_us/workflow/profile/templates
! @dirrm bricolage/comp/help/en_us/workflow/profile/story/container
  @dirrm bricolage/comp/help/en_us/workflow/profile/story
- @dirrm bricolage/comp/help/en_us/workflow/profile/media/container
  @dirrm bricolage/comp/help/en_us/workflow/profile/media
  @dirrm bricolage/comp/help/en_us/workflow/profile/alias
  @dirrm bricolage/comp/help/en_us/workflow/profile
  @dirrm bricolage/comp/help/en_us/workflow/manager
--- 3128,3137 ----
  @dirrm bricolage/comp/help/it_it/admin
  @dirrm bricolage/comp/help/it_it
  @dirrm bricolage/comp/help/en_us/workflow/trail
! @dirrm bricolage/comp/help/en_us/workflow/profile/template
  @dirrm bricolage/comp/help/en_us/workflow/profile/story
  @dirrm bricolage/comp/help/en_us/workflow/profile/media
+ @dirrm bricolage/comp/help/en_us/workflow/profile/container
  @dirrm bricolage/comp/help/en_us/workflow/profile/alias
  @dirrm bricolage/comp/help/en_us/workflow/profile
  @dirrm bricolage/comp/help/en_us/workflow/manager
***************
*** 3312,3322 ****
  @dirrm bricolage/comp/help/en_us/admin
  @dirrm bricolage/comp/help/en_us
  @dirrm bricolage/comp/help/de_de/workflow/trail
! @dirrm bricolage/comp/help/de_de/workflow/profile/templates
! @dirrm bricolage/comp/help/de_de/workflow/profile/story/container
  @dirrm bricolage/comp/help/de_de/workflow/profile/story
- @dirrm bricolage/comp/help/de_de/workflow/profile/media/container
  @dirrm bricolage/comp/help/de_de/workflow/profile/media
  @dirrm bricolage/comp/help/de_de/workflow/profile/alias
  @dirrm bricolage/comp/help/de_de/workflow/profile
  @dirrm bricolage/comp/help/de_de/workflow/manager
--- 3148,3157 ----
  @dirrm bricolage/comp/help/en_us/admin
  @dirrm bricolage/comp/help/en_us
  @dirrm bricolage/comp/help/de_de/workflow/trail
! @dirrm bricolage/comp/help/de_de/workflow/profile/template
  @dirrm bricolage/comp/help/de_de/workflow/profile/story
  @dirrm bricolage/comp/help/de_de/workflow/profile/media
+ @dirrm bricolage/comp/help/de_de/workflow/profile/container
  @dirrm bricolage/comp/help/de_de/workflow/profile/alias
  @dirrm bricolage/comp/help/de_de/workflow/profile
  @dirrm bricolage/comp/help/de_de/workflow/manager
***************
*** 3333,3343 ****
  @dirrm bricolage/comp/help/de_de/admin
  @dirrm bricolage/comp/help/de_de
  @dirrm bricolage/comp/help/bo/workflow/trail
! @dirrm bricolage/comp/help/bo/workflow/profile/templates
! @dirrm bricolage/comp/help/bo/workflow/profile/story/container
  @dirrm bricolage/comp/help/bo/workflow/profile/story
- @dirrm bricolage/comp/help/bo/workflow/profile/media/container
  @dirrm bricolage/comp/help/bo/workflow/profile/media
  @dirrm bricolage/comp/help/bo/workflow/profile/alias
  @dirrm bricolage/comp/help/bo/workflow/profile
  @dirrm bricolage/comp/help/bo/workflow/manager
--- 3168,3177 ----
  @dirrm bricolage/comp/help/de_de/admin
  @dirrm bricolage/comp/help/de_de
  @dirrm bricolage/comp/help/bo/workflow/trail
! @dirrm bricolage/comp/help/bo/workflow/profile/template
  @dirrm bricolage/comp/help/bo/workflow/profile/story
  @dirrm bricolage/comp/help/bo/workflow/profile/media
+ @dirrm bricolage/comp/help/bo/workflow/profile/container
  @dirrm bricolage/comp/help/bo/workflow/profile/alias
  @dirrm bricolage/comp/help/bo/workflow/profile
  @dirrm bricolage/comp/help/bo/workflow/manager
***************
*** 3355,3361 ****
  @dirrm bricolage/comp/help/bo
  @dirrm bricolage/comp/help
  @dirrm bricolage/comp/errors
! @exec [ -d bricolage/comp/data ] || (mkdir -p bricolage/comp/data && chown www:www bricolage/comp/data)
  @dirrm bricolage/comp/data
  @dirrm bricolage/comp/admin/profile/workflow
  @dirrm bricolage/comp/admin/profile/user_pref
--- 3189,3195 ----
  @dirrm bricolage/comp/help/bo
  @dirrm bricolage/comp/help
  @dirrm bricolage/comp/errors
! @exec [ -d %D/bricolage/comp/data ] || (mkdir -p %D/bricolage/comp/data && chown www:www %D/bricolage/comp/data)
  @dirrm bricolage/comp/data
  @dirrm bricolage/comp/admin/profile/workflow
  @dirrm bricolage/comp/admin/profile/user_pref
***************
*** 3370,3378 ****
  @dirrm bricolage/comp/admin/profile/keyword
  @dirrm bricolage/comp/admin/profile/job
  @dirrm bricolage/comp/admin/profile/grp
  @dirrm bricolage/comp/admin/profile/element_type
- @dirrm bricolage/comp/admin/profile/element_data
- @dirrm bricolage/comp/admin/profile/element
  @dirrm bricolage/comp/admin/profile/dest
  @dirrm bricolage/comp/admin/profile/desk
  @dirrm bricolage/comp/admin/profile/contrib_type
--- 3204,3211 ----
  @dirrm bricolage/comp/admin/profile/keyword
  @dirrm bricolage/comp/admin/profile/job
  @dirrm bricolage/comp/admin/profile/grp
+ @dirrm bricolage/comp/admin/profile/field_type
  @dirrm bricolage/comp/admin/profile/element_type
  @dirrm bricolage/comp/admin/profile/dest
  @dirrm bricolage/comp/admin/profile/desk
  @dirrm bricolage/comp/admin/profile/contrib_type
***************
*** 3381,3391 ****
  @dirrm bricolage/comp/admin/profile/alert_type
  @dirrm bricolage/comp/admin/profile/action
  @dirrm bricolage/comp/admin/profile
! @dirrm bricolage/comp/admin/manager/element
  @dirrm bricolage/comp/admin/manager
  @dirrm bricolage/comp/admin/events
  @dirrm bricolage/comp/admin/control/publish
- @dirrm bricolage/comp/admin/control/change_user
  @dirrm bricolage/comp/admin/control
  @dirrm bricolage/comp/admin/alerts
  @dirrm bricolage/comp/admin
--- 3214,3223 ----
  @dirrm bricolage/comp/admin/profile/alert_type
  @dirrm bricolage/comp/admin/profile/action
  @dirrm bricolage/comp/admin/profile
! @dirrm bricolage/comp/admin/manager/element_type
  @dirrm bricolage/comp/admin/manager
  @dirrm bricolage/comp/admin/events
  @dirrm bricolage/comp/admin/control/publish
  @dirrm bricolage/comp/admin/control
  @dirrm bricolage/comp/admin/alerts
  @dirrm bricolage/comp/admin
--- bricolage.1_10_0.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602042145.k14LjlsS020076>