From 5f18223b0f0c20c0f4500850beac241dbb48048f Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 29 Oct 2014 15:53:57 +0000 Subject: [PATCH] Some additional translations git-svn-id: https://svn.libreccm.org/ccm/trunk@2929 8810af33-2d31-482b-a856-94f89814c4df --- ccm-bundle/bundles/slimline/cfg/project.xml | 6 +- ccm-bundle/bundles/standard/cfg/project.xml | 4 +- .../ui/ImageAttachmentEditForm.java | 2 +- .../cms/contentassets/ui/NotesEdit.java | 3 +- .../contenttypes/ui/editors/ScaleEditor.java | 2 +- .../src/com/arsdigita/cms/ContentType.java | 26 ++++- .../ui/admin/AdminResources_en.properties | 68 +++--------- .../ui/admin/AdminResources_fr.properties | 66 ++--------- .../WorkspaceResources_en.properties | 10 +- .../WorkspaceResources_fr.properties | 10 +- .../portlet/bookmarks/Initializer.java | 103 +++++++++--------- .../arsdigita/portlet/bookmarks/Loader.java | 35 +++--- ccm-sci-bundle/bundles/devel/cfg/project.xml | 2 +- .../navigation/sci-portal-welcome.jsp | 54 ++++----- .../ccm-navigation/navigation/sci-portal.jsp | 55 +++++----- 15 files changed, 192 insertions(+), 254 deletions(-) diff --git a/ccm-bundle/bundles/slimline/cfg/project.xml b/ccm-bundle/bundles/slimline/cfg/project.xml index c80b4faf6..138798446 100644 --- a/ccm-bundle/bundles/slimline/cfg/project.xml +++ b/ccm-bundle/bundles/slimline/cfg/project.xml @@ -12,10 +12,10 @@ diff --git a/ccm-bundle/bundles/standard/cfg/project.xml b/ccm-bundle/bundles/standard/cfg/project.xml index 68abf6b95..5cd997fc4 100644 --- a/ccm-bundle/bundles/standard/cfg/project.xml +++ b/ccm-bundle/bundles/standard/cfg/project.xml @@ -14,8 +14,8 @@ ccmVersion="6.1" name="librecms-std" prettyName="LibreCMS (Standard Bundle)" - version="2.2.x" - release="trunk" + version="2.3.0" + release="devel-SNAPSHOT-r2915" webxml="libre-web.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java index c78f7c525..b6ca9149a 100644 --- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java +++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageAttachmentEditForm.java @@ -67,7 +67,7 @@ public class ImageAttachmentEditForm extends Form public void submitted(final FormSectionEvent event) throws FormProcessException { if (saveCancelSection.getCancelButton().isSelected(event.getPageState())) { imageStep.setAttachment(event.getPageState(), null); - + imageStep.showDisplayPane(event.getPageState()); } } diff --git a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java index 97d3ba0f3..79aeb3940 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java @@ -57,7 +57,8 @@ public class NotesEdit extends SimpleContainer { final DHTMLEditor content = new DHTMLEditor( contentParam, ContentSection.getConfig() .getDHTMLEditorConfig() ); - content.setRows( 20 ); + content.setCols(50); + content.setRows(20); m_form.add( content ); m_form.add( m_saveCancel ); diff --git a/ccm-cms-types-survey/src/com/arsdigita/cms/contenttypes/ui/editors/ScaleEditor.java b/ccm-cms-types-survey/src/com/arsdigita/cms/contenttypes/ui/editors/ScaleEditor.java index dbc2c7c53..11a0bdbf2 100644 --- a/ccm-cms-types-survey/src/com/arsdigita/cms/contenttypes/ui/editors/ScaleEditor.java +++ b/ccm-cms-types-survey/src/com/arsdigita/cms/contenttypes/ui/editors/ScaleEditor.java @@ -72,7 +72,7 @@ public class ScaleEditor extends PropertiesEditor { String[] tableHeaders = new String[]{"Nr", "Frage", "", ""}; m_table = new Table(new QuestionTableModelBuilder(), tableHeaders); - m_table.setDefaultCellRender(new QuestionTableCellRenderer()); + m_table.setDefaultCellRenderer(new QuestionTableCellRenderer()); m_table.addTableActionListener(new QuestionTableActionListener()); add(m_table); diff --git a/ccm-cms/src/com/arsdigita/cms/ContentType.java b/ccm-cms/src/com/arsdigita/cms/ContentType.java index e7be264fd..14827ef38 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentType.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentType.java @@ -215,6 +215,9 @@ public class ContentType extends ACSObject { String typeResourcePath = CONTENTTYPE_DEFINITIONFILE_PATH .concat(objectTypeName.replace(".", "/")) .concat(".xml"); + if (s_log.isDebugEnabled()) { + s_log.debug("type resource path is " + typeResourcePath); + } // We assume the name of the key in resource bundle is the same as // the ObjectType minus the domain part ("com.arsdigita.") @@ -222,20 +225,26 @@ public class ContentType extends ACSObject { String labelKey = objectTypeName.substring(objectTypeName.indexOf("cms")) .concat(".type_label") .toLowerCase(); + if (s_log.isDebugEnabled()) { + s_log.debug("label key is " + labelKey); + } // First try: check, if the resource file really exists, and if it does, // use it. if (this.getClass().getClassLoader().getResource(bundleResourcePath) != null) { + s_log.debug("Found resource file, using it."); // Property file exists, use it! final String bundleName = objectTypeName.concat("Resources"); // Create the globalized label label = new GlobalizedMessage(labelKey, bundleName); } else { + s_log.debug("No resource file found, using item's definition file"); // No property file found, try to use the item's definition file final InputStream defFile = Thread.currentThread().getContextClassLoader() .getResourceAsStream(typeResourcePath); if (defFile == null) { + s_log.warn("Failed to translate content type name."); // Giving up! // As a fall back use the (not globalized) "name" of the type as @@ -245,6 +254,7 @@ public class ContentType extends ACSObject { // found in a resource file. label = new GlobalizedMessage(getName()); } else { + s_log.debug("Using item definition file."); // item definition file found. Use it. // determine the bundle from attribute "descriptionBundle" @@ -260,15 +270,19 @@ public class ContentType extends ACSObject { if (bundleName.getName() == null) { // Fallback to the non-globalized identifier (name) + s_log.warn("Failed to translate content type name. No bundle found."); return new GlobalizedMessage(getName()); } else { label = new GlobalizedMessage(labelKey, bundleName.getName()); } } catch (ParserConfigurationException ex) { + s_log.warn("Failed to translate content type name:", ex); label = new GlobalizedMessage(getName()); } catch (SAXException ex) { + s_log.warn("Failed to translate content type name:", ex); label = new GlobalizedMessage(getName()); } catch (IOException ex) { + s_log.warn("Failed to translate content type name:", ex); label = new GlobalizedMessage(getName()); } } @@ -279,7 +293,7 @@ public class ContentType extends ACSObject { } /** - * + * */ private class BundleName extends DefaultHandler { @@ -289,23 +303,23 @@ public class ContentType extends ACSObject { * Constructor, does nothing. */ public BundleName() { - //Nothing + //Nothing } /** - * - * @return + * + * @return */ public String getName() { return name; } /** - * + * * @param namespaceURI * @param localName * @param qName - * @param attributes + * @param attributes */ @Override public void startElement(final String namespaceURI, diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties index 3a7abcb1a..174b4c0c5 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties @@ -92,59 +92,17 @@ ui.admin.user.userpasswordform.question=Question: ui.admin.user.userpasswordform.submit=Change ui.admin.tab.applications=Applications ui.admin.applications.tree.heading=Applications -ui.admin.applications.url.validation.not_blank= -ui.admin.applications.url.valiation.minmaxlength= -ui.admin.applications.title.validation.not_blank= -ui.admin.applications.title.valiation.minmaxlength= -ui.admin.applications.desc.valiation.minmaxlength= -ui.admin.applications.url.label= -ui.admin.applications.title.label= -ui.admin.applications.desc.label= -ui.admin.applications.url.validation.url_already_in_use= -ui.admin.applications.url.validation.no_slash_allowed= -ui.admin.applications.ApplicationInstancePane.title.label= -ui.admin.applications.ApplicationInstancePane.parent_app.label= -ui.admin.applications.ApplicationInstancePane.path.label= -ui.admin.applications.ApplicationInstancePane.desc.label= -ui.admin.applications.ApplicationInstancePane.info.heading= -ui.admin.MultiInstanceApplicationPane.manage.heading= -ui.admin.MultiInstancePane.manage.no_instance_admin_pane_found= -ui.admin.applications.ApplicationInfoSection.title.label= -ui.admin.applications.ApplicationInfoSection.app_class.label= -ui.admin.applications.ApplicationInfoSection.singleton.label= -ui.admin.applications.ApplicationInfoSection.singleton.yes= -ui.admin.applications.ApplicationInfoSection.singleton.no= -ui.admin.applications.ApplicationInfoSection.singleton_instance.path.label= -ui.admin.applications.ApplicationInfoSection.singleton_instance.no_instance_found= -ui.admin.applications.ApplicationInfoSection.heading= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_title.header= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_url.header= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_desc.header= -ui.admin.MultiInstanceApplicationPane.instances= -ui.admin.MultiInstanceApplicationPane.manage_instances.heading= -ui.admin.MultiInstancePane.manage.no_create_form_found= -ui.admin.MultiInstanceApplicationPane.create_instance= -ui.admin.SingletonApplicationPane.manage.heading= -ui.admin.SingletonApplicationPane.manage.no_admin_pane_found= -ui.admin.applications.ApplicationInfoSection.desc.label= -ui.admin.applications.no_settings= -ui.admin.applications.form_not_compatible_now= -ui.admin.applications.ApplicationInstancePane.manage.heading= -ui.admin.applications.parent.label= -ui.admin.user.userinfo.name= -ui.admin.user.userinfo.screenname= -ui.admin.user.userinfo.primaryemail= -ui.admin.groups.name= -ui.admin.applications.placeholder= -ui.admin.cancel=Cancel +ui.admin.applications.url.validation.not_blank=The URL of an application instance can is mandatory. +ui.admin.applications.url.valiation.minmaxlength=The length of an URL of an application instance must be between 1 and 100 characters. +ui.admin.applications.title.validation.not_blank=Title is mandatory for an application instance. +ui.admin.applications.title.valiation.minmaxlength=The minimum length of the title of an applicatio instance is one character, the maximum length are 200 characters +ui.admin.applications.desc.valiation.minmaxlength=The maximum length of a descrption of an application instance are 4000 characters. +ui.admin.applications.url.label=URL +ui.admin.applications.title.label=Title +ui.admin.applications.desc.label=Description +ui.admin.applications.url.validation.url_already_in_use=The provided URL is already in use +ui.admin.applications.url.validation.no_slash_allowed=The URL fragement may not contain slashes +ui.admin.applications.ApplicationInstancePane.title.label=Title of the instance +ui.admin.applications.ApplicationInstancePane.parent_app.label=Parent application +i.admin.cancel=Cancel ui.admin.cancel_msg=Submission cancelled -ui.admin.tab.sysinfo.title= -ui.admin.sysinfo.appinfo= -ui.admin.sysinfo.java_system_properties= -ui.admin.sysinfo.xml_transformer_factory= -ui.admin.sysinfo.xml_transformer= -ui.admin.sysinfo.xml_document_builder_factory= -ui.admin.sysinfo.xml_document_builder= -ui.admin.sysinfo.sax_parser_factory= -ui.admin.sysinfo.sax_parser= -ui.admin.sysinfo.xml_config= diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties index d219f65da..c4e6d5de2 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties @@ -78,59 +78,17 @@ ui.admin.user.userpasswordform.question=Question: ui.admin.user.userpasswordform.submit=Changer ui.admin.tab.applications= ui.admin.applications.tree.heading= -ui.admin.applications.url.validation.not_blank= -ui.admin.applications.url.valiation.minmaxlength= -ui.admin.applications.title.validation.not_blank= -ui.admin.applications.title.valiation.minmaxlength= -ui.admin.applications.desc.valiation.minmaxlength= -ui.admin.applications.url.label= -ui.admin.applications.title.label= -ui.admin.applications.desc.label= -ui.admin.applications.url.validation.url_already_in_use= -ui.admin.applications.url.validation.no_slash_allowed= -ui.admin.applications.ApplicationInstancePane.title.label= -ui.admin.applications.ApplicationInstancePane.parent_app.label= -ui.admin.applications.ApplicationInstancePane.path.label= -ui.admin.applications.ApplicationInstancePane.desc.label= -ui.admin.applications.ApplicationInstancePane.info.heading= -ui.admin.MultiInstanceApplicationPane.manage.heading= -ui.admin.MultiInstancePane.manage.no_instance_admin_pane_found= -ui.admin.applications.ApplicationInfoSection.title.label= -ui.admin.applications.ApplicationInfoSection.app_class.label= -ui.admin.applications.ApplicationInfoSection.singleton.label= -ui.admin.applications.ApplicationInfoSection.singleton.yes= -ui.admin.applications.ApplicationInfoSection.singleton.no= -ui.admin.applications.ApplicationInfoSection.singleton_instance.path.label= -ui.admin.applications.ApplicationInfoSection.singleton_instance.no_instance_found= -ui.admin.applications.ApplicationInfoSection.heading= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_title.header= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_url.header= -ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_desc.header= -ui.admin.MultiInstanceApplicationPane.instances= -ui.admin.MultiInstanceApplicationPane.manage_instances.heading= -ui.admin.MultiInstancePane.manage.no_create_form_found= -ui.admin.MultiInstanceApplicationPane.create_instance= -ui.admin.SingletonApplicationPane.manage.heading= -ui.admin.SingletonApplicationPane.manage.no_admin_pane_found= -ui.admin.applications.ApplicationInfoSection.desc.label= -ui.admin.applications.no_settings= -ui.admin.applications.form_not_compatible_now= -ui.admin.applications.ApplicationInstancePane.manage.heading= -ui.admin.applications.parent.label= -ui.admin.user.userinfo.name= -ui.admin.user.userinfo.screenname= -ui.admin.user.userinfo.primaryemail= -ui.admin.groups.name= -ui.admin.applications.placeholder= +ui.admin.applications.url.validation.not_blank=The URL of an application instance can is mandatory. +ui.admin.applications.url.valiation.minmaxlength=The length of an URL of an application instance must be between 1 and 100 characters. +ui.admin.applications.title.validation.not_blank=Title is mandatory for an application instance. +ui.admin.applications.title.valiation.minmaxlength=The minimum length of the title of an applicatio instance is one character, the maximum length are 200 characters +ui.admin.applications.desc.valiation.minmaxlength=The maximum length of a descrption of an application instance are 4000 characters. +ui.admin.applications.url.label=URL +ui.admin.applications.title.label=Title +ui.admin.applications.desc.label=Description +ui.admin.applications.url.validation.url_already_in_use=DescriptionThe provided URL is already in use +ui.admin.applications.url.validation.no_slash_allowed=The URL fragement may not contain slashes +ui.admin.applications.ApplicationInstancePane.title.label=Title of the instance +ui.admin.applications.ApplicationInstancePane.parent_app.label=Parent application ui.admin.cancel=Cancel ui.admin.cancel_msg=Submission cancelled -ui.admin.tab.sysinfo.title= -ui.admin.sysinfo.appinfo= -ui.admin.sysinfo.java_system_properties= -ui.admin.sysinfo.xml_transformer_factory= -ui.admin.sysinfo.xml_transformer= -ui.admin.sysinfo.xml_document_builder_factory= -ui.admin.sysinfo.xml_document_builder= -ui.admin.sysinfo.sax_parser_factory= -ui.admin.sysinfo.sax_parser= -ui.admin.sysinfo.xml_config= diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties index 0b72ebe58..12c88c18b 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties @@ -28,8 +28,8 @@ cw.workspace.ui.select_user_or_group_to_add=Select user or group to add: cw.permissions.add_a_privilege=Add a privilege cw.workspace.ui.participant_info=Participant Info cw.workspace.ui.participant_roles=Participant Roles -cw.workspace.ui.admin.no_settings= -cw.workspace.default_layout= -cw.workspace.ui.categorized.create_workspace.info= -cw.workspace.ui.categorized.create_workspace.link= -cw.workspace.ui.categorized.workspace.add_row.link= +cw.workspace.ui.admin.no_settings=No settings yet +cw.workspace.default_layout=Layout +cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below. +cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category +cw.workspace.ui.categorized.workspace.add_row.link=Add new row diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties index 0b72ebe58..12c88c18b 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties @@ -28,8 +28,8 @@ cw.workspace.ui.select_user_or_group_to_add=Select user or group to add: cw.permissions.add_a_privilege=Add a privilege cw.workspace.ui.participant_info=Participant Info cw.workspace.ui.participant_roles=Participant Roles -cw.workspace.ui.admin.no_settings= -cw.workspace.default_layout= -cw.workspace.ui.categorized.create_workspace.info= -cw.workspace.ui.categorized.create_workspace.link= -cw.workspace.ui.categorized.workspace.add_row.link= +cw.workspace.ui.admin.no_settings=No settings yet +cw.workspace.default_layout=Layout +cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below. +cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category +cw.workspace.ui.categorized.workspace.add_row.link=Add new row diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Initializer.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Initializer.java index 684c4c3eb..7573491eb 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Initializer.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Initializer.java @@ -16,10 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - package com.arsdigita.portlet.bookmarks; - import com.arsdigita.bebop.RequestLocal; import com.arsdigita.db.DbHelper; import com.arsdigita.domain.DomainObject; @@ -40,84 +38,87 @@ import com.arsdigita.runtime.RuntimeConfig; /** * based on com.arsdigita.london.portal.installer.portlet - * + * * @author cgyg9330 (Chris Gilbert) * @version $Id: Initializer.java,v 1.3 2005/06/08 14:45:43 cgyg9330 Exp $ */ public class Initializer extends CompoundInitializer { - - /** + /** * Constructor. */ public Initializer() { - final String url = RuntimeConfig.getConfig().getJDBCURL(); - final int database = DbHelper.getDatabaseFromURL(url); + final String url = RuntimeConfig.getConfig().getJDBCURL(); + final int database = DbHelper.getDatabaseFromURL(url); - add( - new PDLInitializer( - new ManifestSource( - "ccm-portlet-bookmarks.pdl.mf", - new NameFilter( - DbHelper.getDatabaseSuffix(database), - "pdl")))); - } + add( + new PDLInitializer( + new ManifestSource( + "ccm-portlet-bookmarks.pdl.mf", + new NameFilter( + DbHelper.getDatabaseSuffix(database), + "pdl")))); + } /** - * - * @param e + * + * @param e */ @Override public void init(DomainInitEvent e) { super.init(e); e.getFactory().registerInstantiator( - BookmarksPortlet.BASE_DATA_OBJECT_TYPE, - new ACSObjectInstantiator() { + BookmarksPortlet.BASE_DATA_OBJECT_TYPE, + new ACSObjectInstantiator() { + @Override public DomainObject doNewInstance(DataObject dataObject) { return new BookmarksPortlet(dataObject); } - }); - - e.getFactory().registerInstantiator( - Bookmark.BASE_DATA_OBJECT_TYPE, - new ACSObjectInstantiator() { - @Override - public DomainObject doNewInstance(DataObject dataObject) { - return new Bookmark(dataObject); - } - }); - new ResourceTypeConfig(BookmarksPortlet.BASE_DATA_OBJECT_TYPE) { - @Override - public ResourceConfigFormSection getCreateFormSection( - final ResourceType resType, - final RequestLocal parentAppRL) { - - final ResourceConfigFormSection config = - new BookmarksPortletAdder(resType, parentAppRL); + }); - return config; - } + e.getFactory().registerInstantiator( + Bookmark.BASE_DATA_OBJECT_TYPE, + new ACSObjectInstantiator() { + + @Override + public DomainObject doNewInstance(DataObject dataObject) { + return new Bookmark(dataObject); + } + + }); + + new ResourceTypeConfig(BookmarksPortlet.BASE_DATA_OBJECT_TYPE) { @Override - public ResourceConfigFormSection getModifyFormSection( - final RequestLocal application) { + public ResourceConfigFormSection getCreateFormSection( + final ResourceType resType, + final RequestLocal parentAppRL) { + + final ResourceConfigFormSection config = new BookmarksPortletAdder(resType, + parentAppRL); - final BookmarksPortletEditor config = - new BookmarksPortletEditor(application); return config; } + + @Override + public ResourceConfigFormSection getModifyFormSection( + final RequestLocal application) { + + final BookmarksPortletEditor config = new BookmarksPortletEditor(application); + return config; + } + }; - - /** - * implementation of framework that allows portlets to be bundled up - * as discrete applications - */ - PortletType.registerXSLFile(BookmarksPortlet.BASE_DATA_OBJECT_TYPE, - "/packages/westsussex-portlets/xsl/bookmarks-portlet.xsl"); + /** + * implementation of framework that allows portlets to be bundled up as discrete + * applications + */ + PortletType.registerXSLFile(BookmarksPortlet.BASE_DATA_OBJECT_TYPE, + "/packages/westsussex-portlets/xsl/bookmarks-portlet.xsl"); } -} \ No newline at end of file +} diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Loader.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Loader.java index 02f3dbe5c..17a38d265 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Loader.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/Loader.java @@ -26,37 +26,38 @@ import com.arsdigita.runtime.ScriptContext; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.StringParameter; - /** - * Just create the portlet type - includes Load parameter (that can be - * set via interactive load) for the type name, though this can be - * changed in the DB later if required in application_types table - * + * Just create the portlet type - includes Load parameter (that can be set via interactive load) for + * the type name, though this can be changed in the DB later if required in application_types table + * * @author cgyg9330 * @version $Id: Loader.java,v 1.1 2005/02/25 08:41:56 cgyg9330 Exp $ */ public class Loader extends PackageLoader { - private StringParameter typeName = new StringParameter - ("uk.gov.westsussex.portlet.bookmarks.name", - Parameter.REQUIRED, "My Links"); + private StringParameter typeName = new StringParameter( + "uk.gov.westsussex.portlet.bookmarks.name", + Parameter.REQUIRED, "My Links"); + + public Loader() { + register(typeName); + + } - public Loader() { - register(typeName); - - } public void run(final ScriptContext ctx) { new KernelExcursion() { + public void excurse() { setEffectiveParty(Kernel.getSystemParty()); PortletType type = PortletType - .createPortletType((String)get(typeName), - PortletType.WIDE_PROFILE, - BookmarksPortlet.BASE_DATA_OBJECT_TYPE); - type.setDescription("Allows users to maintain a list of internal and external links"); + .createPortletType((String) get(typeName), + PortletType.WIDE_PROFILE, + BookmarksPortlet.BASE_DATA_OBJECT_TYPE); + type + .setDescription("Allows users to maintain a list of internal and external links"); } + }.run(); } - } diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 411426ff9..1265f064a 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -9,7 +9,7 @@ name="ScientificCMS" prettyName="Scientific CMS" version="2.3.0" - release="devel-SNAPSHOT-r2849" + release="devel-SNAPSHOT-r2915" webxml="sci-web.xml" portletxml="sci-portlet.xml" webapp="libreccm" diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp index 24d9bd135..1056811e2 100644 --- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal-welcome.jsp @@ -1,38 +1,40 @@ - + - + - - - - + + + + - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); if (age == 0) { DispatcherHelper.cacheDisable(response); } else { DispatcherHelper.cacheForWorld(response, (int)age); } - - - - - - - - - ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); - - + + + + + + + portalsPage.setClassAttr("portalPage"); + ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); + + + + diff --git a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp index 24d9bd135..d90293cbb 100644 --- a/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp +++ b/ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-portal.jsp @@ -1,38 +1,41 @@ - + - + - - - - + + + + - + long age = Navigation.getConfig().getIndexPageCacheLifetime(); if (age == 0) { DispatcherHelper.cacheDisable(response); } else { DispatcherHelper.cacheForWorld(response, (int)age); } - - - - - - - - - ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); - - + + + + + + + portalsPage.setClassAttr("portalPage"); + + ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); + + + +