diff --git a/OracleToPostgres/OracleToPostgres.pdf b/OracleToPostgres/OracleToPostgres.pdf
new file mode 100644
index 000000000..4cdb1a146
Binary files /dev/null and b/OracleToPostgres/OracleToPostgres.pdf differ
diff --git a/OracleToPostgres/Outer Join.pdf b/OracleToPostgres/Outer Join.pdf
new file mode 100644
index 000000000..263009024
Binary files /dev/null and b/OracleToPostgres/Outer Join.pdf differ
diff --git a/OracleToPostgres/TraductionMandalay.docx b/OracleToPostgres/TraductionMandalay.docx
new file mode 100644
index 000000000..9cd978819
Binary files /dev/null and b/OracleToPostgres/TraductionMandalay.docx differ
diff --git a/OracleToPostgres/~$aductionMandalay.docx b/OracleToPostgres/~$aductionMandalay.docx
new file mode 100644
index 000000000..f390a8adb
Binary files /dev/null and b/OracleToPostgres/~$aductionMandalay.docx differ
diff --git a/ccm-core/src/com/arsdigita/kernel/Resource.java b/ccm-core/src/com/arsdigita/kernel/Resource.java
index a5814ae07..aa6e05f0b 100755
--- a/ccm-core/src/com/arsdigita/kernel/Resource.java
+++ b/ccm-core/src/com/arsdigita/kernel/Resource.java
@@ -199,11 +199,9 @@ public class Resource extends ACSObject {
setAssociation(RESOURCE_TYPE, resourceType);
}
-
// Can return null.
public Resource getParentResource() {
DataObject dataObject = (DataObject) get(PARENT_RESOURCE);
-
if (dataObject == null) {
return null;
}
diff --git a/ccm-core/src/com/arsdigita/mail/Mail.java b/ccm-core/src/com/arsdigita/mail/Mail.java
index 891f0e0a0..6d624e7c3 100755
--- a/ccm-core/src/com/arsdigita/mail/Mail.java
+++ b/ccm-core/src/com/arsdigita/mail/Mail.java
@@ -249,7 +249,7 @@ public class Mail implements MessageType {
Mail msg = new Mail(to, from, subject, body);
msg.send();
}
-
+
/**
* Sends the message.
*/
diff --git a/ccm-core/src/com/arsdigita/web/Application.java b/ccm-core/src/com/arsdigita/web/Application.java
index 5a42f4147..93b631699 100755
--- a/ccm-core/src/com/arsdigita/web/Application.java
+++ b/ccm-core/src/com/arsdigita/web/Application.java
@@ -385,7 +385,7 @@ public class Application extends Resource {
setAssociation("resourceType", applicationType);
}
-
+
/**
*
* @return (Can return null.)
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
index 83414b030..a75f750d2 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.java
@@ -577,7 +577,7 @@ public class BrowseFileInfoPropertiesPane extends ModalContainer implements DMCo
public void prepare(PrintEvent e) {
SingleSelect select = (SingleSelect) e.getTarget();
- select.addOption(new Option("workspace", Web.getContext().getApplication().getParentApplication().getDisplayName() + " members"));
+ select.addOption(new Option("workspace", Web.getContext().getApplication().getParentApplication()== null? Web.getContext().getApplication().getDisplayName():Web.getContext().getApplication().getParentApplication().getDisplayName() + " members"));
select.addOption(new Option("internal", new Label(FILE_INTENDED_AUDIENCE_INTERNAL)));
select.addOption(new Option("public", new Label(FILE_INTENDED_AUDIENCE_PUBLIC)));
}
@@ -862,7 +862,6 @@ public class BrowseFileInfoPropertiesPane extends ModalContainer implements DMCo
m_parent.displayThankYou(state);
// send the mail
-
User u = Web.getContext().getUser();
s_log.debug(FILE_SEND_COLLEAGUE_RETURN_ADDRESS.localize().toString());
@@ -870,7 +869,6 @@ public class BrowseFileInfoPropertiesPane extends ModalContainer implements DMCo
Mail mail = new Mail((String) data.get(EMAIL_PARAM_NAME), FILE_SEND_COLLEAGUE_RETURN_ADDRESS.localize().toString(),
FILE_SEND_COLLEAGUE_SUBJECT.localize().toString(), FILE_SEND_COLLEAGUE_MESSAGE.localize().toString() + " " + u.getName());
Document doc = new Document((BigDecimal) state.getValue(docIDParam));
-
try {
FileAsset fa = doc.getFile();
if (fa == null) {
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
new file mode 100755
index 000000000..8f2f09e13
--- /dev/null
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
@@ -0,0 +1,91 @@
+ui.action.edit.copy=Copy
+ui.action.edit.cut=Cut
+ui.action.edit.delete=Delete
+ui.action.error=The following error(s) occured:
+ui.action.error.continue=Continue
+ui.action.delete.submit=Delete
+ui.action.delete.confirm='Do you really want to delete the selected files and folders?'
+ui.action.copy.submit=Copy to ...
+ui.action.move.submit=Move to ...
+ui.action.newfile=New Document
+ui.action.newfolder=New Folder
+ui.cancel=Cancel
+ui.cat.browse.content.header=Browse Documents by Category
+ui.cat.portlet.browse.header=Click a category below to begin browsing documents.
+ui.email.formatinvalid=Did not send document to following e-mail addresses because of invalid format
+ui.error.parentnotfound=Could not find parent folder. The parent folder may have just been deleted.
+ui.error.resourceexists=Resource already exists
+ui.error.mimetype=The new version cannot have a different MIME type than the original file!
+ui.file.description=Description: (opt.)
+ui.file.categories=Categories:
+ui.file.keywords=Keywords:
+ui.file.intended.audience=Intended Audience
+ui.file.intended.audience.internal=Internal Users
+ui.file.intended.audience.public=Public
+ui.file.upload=Upload File: (*)
+ui.file.name=Name: (opt.)
+ui.file.name.required=Name: (*)
+ui.file.save=Save
+ui.file.submit=Upload
+ui.file.source=Source:
+ui.file.version.description=Version Description: (*)
+ui.file.upload.header=Upload File into Folder
+ui.filedelete.confirm=Do you really want to delete this file?
+ui.fileinfo.goback.label=Return to
+ui.fileinfo.actions.header=Actions
+ui.fileinfo.comments.title=Feedback
+ui.fileinfo.delete.header=Delete Document
+ui.fileinfo.delete.link=Delete
+ui.fileinfo.download.header=Download Document
+ui.fileinfo.download.link=Download
+ui.fileinfo.edit.action.description=Changed name/description
+ui.fileinfo.edit.header=Document Properties
+ui.fileinfo.edit.link=Edit
+ui.fileinfo.feedback.header=Comments and Ratings
+ui.fileinfo.history.header=Revision History
+ui.fileinfo.history.title=History
+ui.fileinfo.links.title=Links
+ui.fileinfo.newversion.link=Upload new revision
+ui.fileinfo.properties.header=Document Properties
+ui.fileinfo.properties.title=Properties
+ui.fileinfo.sendcolleague.header=E-mail Document
+ui.fileinfo.sendcolleague.link=Send to a Colleague
+ui.fileinfo.sendcolleague.form.email=Enter Email Address:
+ui.fileinfo.sendcolleague.return.address=sender@example.net
+ui.fileinfo.sendcolleague.thanks=Your message has been sent!
+ui.fileinfo.sendcolleague.thanks.return.link=Back to Document Properties
+ui.fileinfo.sendcolleague.subject=Document from a colleague at UNDP
+ui.fileinfo.sendcolleague.submit=Send Message
+ui.fileinfo.sendcolleague.message=This document has been sent to you on behalf of
+ui.fileinfo.title=File Info
+ui.fileinfo.upload.header=Upload New Version
+ui.folder.empty=This folder is empty
+ui.folder.name=Name: (*)
+ui.folder.description=Description: (opt.)
+ui.folder.save=Create
+ui.folder.content.header=Contents of
+ui.folder.create.header=Create New Folder in
+ui.folder.destination.list.header=Destination folder
+ui.link.target.required=Link Target:(*)
+ui.link.action.newdoclink=New Link
+ui.link.create.header=Create New Link in
+ui.link.create.explanation=Create a link by entering any URL below, OR, by searching internally for another Document to link to.
+ui.link.create.link=Create New Link
+ui.nav.help=Help
+ui.nav.signout=Sign Out
+ui.repositories.content.header=Available Document Repositories
+ui.repositories.mounted.save=Update
+ui.repositories.recentDocs.empty=There are no recently edited documents.
+ui.send.friend.description=Personal Message:
+ui.send.friend.email.list=Send to:
+ui.send.friend.email.subject=Subject
+ui.send.friend.submit=Send
+ui.title=Document Manager
+ui.workspace.browse.title=Browse
+ui.workspace.repositories.title=Repositories
+ui.workspace.search.title=Search
+ui.workspace.title=Workspace
+ui.fileinfo.upload.initialversion.description=Initial version
+ui.portlet.action.newresource=New Document
+ui.folderTableModelBuilder.folderItemCounts=subfolders:{0};subitems:{1}
+ui.portlet.action.new.doclink=New DocLink
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileEditForm.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileEditForm.java
index 5668bb957..ebbcda554 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileEditForm.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FileEditForm.java
@@ -690,12 +690,14 @@ class FileEditForm extends Form
public void prepare(PrintEvent e) {
SingleSelect select = (SingleSelect) e.getTarget();
-
+
select.addOption
(new Option("workspace",
Web.getContext().getApplication()
- .getParentApplication().getDisplayName()+
+ .getParentApplication() == null ? Web.getContext().getApplication().getDisplayName()
+ : Web.getContext().getApplication().getParentApplication().getDisplayName()+
" members"));
+
select.addOption
(new Option("internal",
new Label(FILE_INTENDED_AUDIENCE_INTERNAL)));
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/util/GlobalizationUtil.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/util/GlobalizationUtil.java
index f73b954c2..58d83153b 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/util/GlobalizationUtil.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/util/GlobalizationUtil.java
@@ -31,7 +31,7 @@ import com.arsdigita.globalization.GlobalizedMessage;
public class GlobalizationUtil implements Globalized {
- private static final String BUNDLE_NAME = "com.arsdigita.cms.docmgr.ui.DocsResources";
+ private static final String BUNDLE_NAME = "com.arsdigita.cms.docmgr.ui.DMResources";
public static GlobalizedMessage globalize(String key) {
return new GlobalizedMessage(key, BUNDLE_NAME);
diff --git a/ccm-docmgr/web/themes/heirloom/packages/docmgr/xsl/docs.xsl b/ccm-docmgr/web/themes/heirloom/packages/docmgr/xsl/docs.xsl
index c09c18baf..ac9b50ddd 100755
--- a/ccm-docmgr/web/themes/heirloom/packages/docmgr/xsl/docs.xsl
+++ b/ccm-docmgr/web/themes/heirloom/packages/docmgr/xsl/docs.xsl
@@ -9,7 +9,7 @@
-
+
@@ -39,7 +39,7 @@
+ href="{$internal-theme}/packages/cms/xsl/admin/cms-admin.css" />