diff --git a/ccm-gen-aplaws/CHANGE_LOG b/ccm-gen-aplaws/CHANGE_LOG index 7e21e3f96..6cd41ce0c 100644 --- a/ccm-gen-aplaws/CHANGE_LOG +++ b/ccm-gen-aplaws/CHANGE_LOG @@ -4,7 +4,8 @@ themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes. 2007-08-06: ./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp - --> + subsite /* @@ -501,6 +502,7 @@ /print/* + diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg b/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg index 132b3fd7d..412b3553c 100644 --- a/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg @@ -12,6 +12,8 @@ ccm-cms-assets-relatedlink # is ccm-ldn-dublin really an asset? ## -- ccm-ldn-dublin +ccm-cms-publicpersonalprofile + # Content types # ccm-cms-types-address # ccm-cms-types-agenda @@ -34,7 +36,7 @@ ccm-cms-types-member ccm-cms-types-mparticle ccm-cms-types-newsitem # ccm-cms-types-organization -# ccm-cms-types-person +ccm-cms-types-person # ccm-cms-types-pressrelease # ccm-cms-types-service # ## Fuer OpenCCM aktivieren: @@ -47,7 +49,7 @@ ccm-cms-types-newsitem # ccm-auth-http # ccm-bookmarks ccm-docmgr -# ccm-docrepo +ccm-docrepo ccm-faq # ccm-formbuilder-pdf ccm-forum diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java index 3196b2d8a..4f4883161 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java @@ -31,7 +31,7 @@ import org.apache.log4j.Logger; /** * The APLAWS initializer. * - * @version $Id: Initializer.java 1232 2006-06-22 12:01:30Z sskracic $ + * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Initializer extends CompoundInitializer { diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 3807a7e97..5d2d4ffea 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -43,8 +43,6 @@ import com.arsdigita.util.parameter.StringParameter; // import com.arsdigita.util.parameter.URLParameter; import com.arsdigita.web.Application; -import org.apache.log4j.Logger; - // import java.net.URL; // import java.net.MalformedURLException; // import java.util.Date; @@ -52,6 +50,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.apache.log4j.Logger; + /** * Loader. * diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java index 01b6059ad..ca27b195e 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java @@ -28,9 +28,10 @@ import com.arsdigita.portalworkspace.ui.PortalConstants; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; +import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Party; -import com.arsdigita.kernel.Kernel;import org.apache.log4j.Logger; +import org.apache.log4j.Logger; /** @@ -139,6 +140,7 @@ public class HomepageWorkspace extends SimpleContainer { m_editor.setVisible(state, !browse); } + @Override public void register(Page page) { super.register(page); @@ -149,6 +151,7 @@ public class HomepageWorkspace extends SimpleContainer { page.setVisibleDefault(m_editor, false); } + @Override public void generateXML(PageState state, Element parent) { Party party = Kernel.getContext().getParty(); diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java index fc6fc5d57..a3d439d50 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java @@ -41,6 +41,10 @@ import com.arsdigita.domain.DataObjectNotFoundException; import org.apache.log4j.Logger; +/** + * + * + */ public class HomepageWorkspaceSelectionModel { private RequestLocal m_loaded = new RequestLocal(); private RequestLocal m_global = new RequestLocal(); diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse index 028ae2edd..f45e0d7ab 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse @@ -61,6 +61,8 @@ import com.arsdigita.xml.XML; * nb - widget applies to allocation of categories to any ACSObject hence * xml prefix should be more generic eg bebop rather than cms. cms retained * for compatibility with existing stylesheets + * + * @deprecated Use c.ad.london.terms.ui.TermWidget instead! */ public class TermWidget extends Widget { private StringParameter m_mode; @@ -161,15 +163,15 @@ public class TermWidget extends Widget { } } - if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) { - // add attribute to the parent node, so that in stylesheet - // we can look for any ancestor with this attribute (can't - // add attribute to categoryWidget element as that is not - // visible when subbranches are transformed) - el.addAttribute("expand", "all" ); - } - - for (Iterator i=roots.iterator(); i.hasNext(); ) { + if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) { + // add attribute to the parent node, so that in stylesheet + // we can look for any ancestor with this attribute (can't + // add attribute to categoryWidget element as that is not + // visible when subbranches are transformed) + el.addAttribute("expand", "all" ); + } + + for (Iterator i=roots.iterator(); i.hasNext(); ) { TermSortKeyPair pair = (TermSortKeyPair) i.next(); Term term = pair.getTerm(); BigDecimal sortKey = pair.getSortKey(); diff --git a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt index 8db7e6319..b288a2697 100644 --- a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt +++ b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/README.txt @@ -2,5 +2,17 @@ jsp files replace files provided by ccm-ldn-portal. goal: Make the portal homepage read-only and cached for 15min. EXPERIMENTAL -Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins to get the 'customize area' links. +Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins +to get the 'customize area' links. see r1082 + +Actually: +In the default configuration BaseDispatcher searches in the following order: +1. /templates/ccm-ldn-portal/portal/index.jsp +2. /templates/ccm-ldn-portal/portal/index.html +3. /templates/ccm-ldn-portal/index.jsp +4. /templates/ccm-ldn-portal/index.html (probably, not tested) + +So, currently the first try is successfull and +aplaws/ui/HomepageWorkspaceSelectionModel is always used via index.jsp + diff --git a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp index 2000fb99d..be25d901d 100755 --- a/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp +++ b/ccm-gen-aplaws/web/templates/ccm-portalworkspace/portal/index.jsp @@ -1,39 +1,40 @@ + xmlns:define="/WEB-INF/bebop-define.tld" + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - - - - DispatcherHelper.cacheForWorld(response,900); - - - - - - - + com.arsdigita.aplaws.ui.*" /> -HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel(); -((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0)); -((HomepageWorkspace)left).setReadOnly(true); -((HomepageWorkspace)left).setName("left"); -((HomepageWorkspace)left).addWidgets(); -((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1)); -((HomepageWorkspace)middle).setReadOnly(true); -((HomepageWorkspace)middle).setName("middle"); -((HomepageWorkspace)middle).addWidgets(); -((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2)); -((HomepageWorkspace)right).setReadOnly(true); -((HomepageWorkspace)right).setName("right"); -((HomepageWorkspace)right).addWidgets(); + DispatcherHelper.cacheForWorld(response,900); - - + + + + + + + + HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel(); + + ((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0)); + ((HomepageWorkspace)left).setReadOnly(true); + ((HomepageWorkspace)left).setName("left"); + ((HomepageWorkspace)left).addWidgets(); + ((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1)); + ((HomepageWorkspace)middle).setReadOnly(true); + ((HomepageWorkspace)middle).setName("middle"); + ((HomepageWorkspace)middle).addWidgets(); + ((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2)); + ((HomepageWorkspace)right).setReadOnly(true); + ((HomepageWorkspace)right).setName("right"); + ((HomepageWorkspace)right).addWidgets(); + + + + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl index ad7703bd7..2b44351a7 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl @@ -1,3 +1,4 @@ + - - - + + + @@ -28,13 +29,15 @@ --> - + + - + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl index 86e99e146..5fe9f6cfb 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl @@ -1,3 +1,4 @@ + - - - - - + --> + + + + - - - - + + + diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl index b68bf25b1..9e0074492 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl @@ -1,3 +1,4 @@ + - - diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl index eb23cb5ff..7ce59b280 100644 --- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl +++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl @@ -5,7 +5,6 @@ xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:nav="http://ccm.redhat.com/london/navigation" - exclude-result-prefixes="xsl bebop aplaws ui cms nav" version="1.0"> diff --git a/ccm-ldn-aplaws/CHANGE_LOG b/ccm-ldn-aplaws/CHANGE_LOG new file mode 100644 index 000000000..f3866fe13 --- /dev/null +++ b/ccm-ldn-aplaws/CHANGE_LOG @@ -0,0 +1,11 @@ +2011-05-12 +Adaptation in web to the relocation of default theme files (from __ccm__ to +themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes. + +2007-08-06: +./ccm-ldn-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp + - + + + + + + + + + - The Red Hat Web Application Framework is a platform for writing - database-backed web applications in Java. + Service module which tailors the aplaws software to a specific purpose + and/or a specific site. + - setting up a categorization / terms system (cf. load.java) + - integrate custom spezific jsp's + - setting up custom specific configuration parameters (cf. the bundles) + - overwrite default classes by custom specific ones (cf. src/.../aplaws) + - provide a default theme, which meets accessibility requirements and + overwrites the default, table based design (cf. web/.../themes) + + This modules tailors APLAWS to Local Authorities purpose. + + APLAWS is a collaboration and content management system which is based upon + the Red Hat Web Application Framework, which is a platform for writing + database-backed web applications in Java. diff --git a/ccm-ldn-aplaws/bundles/complete/bundle.in b/ccm-ldn-aplaws/bundles/complete/bundle.in index c0613e7ff..89c39e0c3 100755 --- a/ccm-ldn-aplaws/bundles/complete/bundle.in +++ b/ccm-ldn-aplaws/bundles/complete/bundle.in @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-complete BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle" -VERSION=1.0.5devel +VERSION=1.1.3devel RELEASE=1 diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg index dc28cac64..d5306c22e 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg @@ -1,3 +1,5 @@ +# Complete bundle application.cfg + # Main apps ccm-core ccm-cms @@ -5,10 +7,11 @@ ccm-cms # Content assets ccm-cms-assets-fileattachment ccm-cms-assets-imagestep -## ccm-cms-assets-notes +ccm-cms-assets-notes ccm-cms-assets-relatedlink -# is ldn-dublin really an asset? -ccm-ldn-dublin + +# is ccm-ldn-dublin really an asset? +## -- ccm-ldn-dublin # Content types ccm-cms-types-address @@ -20,8 +23,8 @@ ccm-cms-types-esdservice ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem -ccm-cms-types-formsectionitem ccm-cms-types-formitem +ccm-cms-types-formsectionitem ccm-cms-types-glossaryitem ccm-cms-types-htmlform ccm-cms-types-inlinesite @@ -33,27 +36,39 @@ ccm-cms-types-mparticle ccm-cms-types-newsitem ccm-cms-types-organization ccm-cms-types-pressrelease -ccm-cms-types-service +# siteproxy is required by ccm-ldn-atoz ccm-cms-types-siteproxy ccm-cms-types-xmlfeed # Applications -ccm-ldn-util +# ------------ +ccm-auth-http +ccm-bookmarks +ccm-formbuilder-pdf +ccm-forum +ccm-forum-categorised +ccm-portalserver +ccm-portalworkspace +ccm-simplesurvey +ccm-themedirector +ccm-user-preferences +ccm-weblog + +# ldn extensions +# -------------- ccm-ldn-atoz -ccm-ldn-rss -ccm-ldn-portal +ccm-ldn-dublin +ccm-ldn-exporter +ccm-ldn-freeform +ccm-ldn-importer ccm-ldn-navigation +ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms +ccm-ldn-util + +# integration layer ccm-ldn-aplaws -ccm-formbuilder-pdf -ccm-ldn-freeform -ccm-user-preferences -ccm-forum -ccm-simplesurvey -ccm-auth-http -ccm-ldn-importer -ccm-ldn-exporter -ccm-ldn-theme + diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties index 7fa79b182..797a6bd3f 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties @@ -1,37 +1,160 @@ +# Complete bundle integration.properties +# +waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +# +; dhtml editor to use (system wide) +; Xinha is default +; waf.bebop.dhtml_editor=Xinha +; waf.bebop.dhtml_editor=FCKeditor + +waf.categorization.show_internal_name=true +waf.categorization.supported_languages=de,en + +waf.dispatcher.default_expiry=3600 +; +waf.kernel.data_permission_check_enabled=false +waf.kernel.primary_user_identifier=email +; if you activate screen_name, forum loader doesn't work. +; waf.kernel.primary_user_identifier=screen_name +waf.kernel.supported_languages=de,en + +; security.properties: +waf.auto_registration_on=false + +# MOVED to ui.Config +#waf.pagemap.root=portal/ +#waf.pagemap.workspace=portal/ +#waf.pagemap.login_redirect=content/content-center-redirect.jsp + +; Searches for localized style sheet (among others) waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt -waf.kernel.data_permission_check_enabled=false -waf.dispatcher.default_expiry=3600 -waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage -waf.pagemap.root=portal/ -waf.pagemap.workspace=portal/ -waf.pagemap.login_redirect=content/content-center-redirect.jsp -com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp +core.ui.pagemap.root_page_url=navigation/ +core.ui.pagemap.workspace_url=navigation/ +core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp + +; workflow configuration +waf.workflow.simple.alerts_enabled=true +waf.workflow.simple.alerts_sender=root@localhost.localdomain + +; Configures the xml processing +waf.xml.xsl_transformer=xalan +waf.xml.activate_full_date_formatter=true + +# ccm-cms parameters + +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker + com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp +com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver + +; Configure dhtml editor for use in cms content-center +; Xinha is default and should work out of the box +;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js +; as a temporary measure a different configuration file which includes a link selection box for CCM items +; and CCM images should be specified: +com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js + +; to use FCKeditor: +; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js +; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js +; com.arsdigita.cms.dhtml_editor_hidden_buttons= +; com.arsdigita.cms.dhtml_editor_plugins= + +; to use deprecated HTMLarea (NOT recommended!): +; currently configuration is hardcoded, so the fest alternative works +; com.arsdigita.cms.dhtml_editor_config=HTMLArea +; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js +; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS + com.arsdigita.cms.disable_item_pfs=true + +com.arsdigita.cms.hide_admin_tabs=true +com.arsdigita.cms.hide_folder_index_checkbox=true +com.arsdigita.cms.hide_launch_date=true +com.arsdigita.cms.hide_templates_tab=true +com.arsdigita.cms.hide_timezone=true +com.arsdigita.cms.hide_udct_ui=true + com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true -com.arsdigita.cms.hide_templates_tab=true -com.arsdigita.cms.hide_admin_tabs=true -com.arsdigita.cms.hide_timezone=true -com.arsdigita.cms.hide_launch_date=true -com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js -com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker + + +# ccm-cms-types-event parameters +com.arsdigita.cms.contenttypes.event.hide_cost=true +com.arsdigita.cms.contenttypes.event.hide_date_description=false +com.arsdigita.cms.contenttypes.event.hide_event_type=true +com.arsdigita.cms.contenttypes.event.hide_link_to_map=true +com.arsdigita.cms.contenttypes.event.hide_main_contributor=true +com.arsdigita.cms.contenttypes.event.use_html_date_description=false +com.arsdigita.cms.contenttypes.event.start_year=2000 +com.arsdigita.cms.contenttypes.event.end_year_delta=5 + + +# ccm-cms-types-newsitem parameters com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true +com.arsdigita.cms.contenttypes.newsitem.start_year=2000 +com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 + + +# ?? Where are these used? com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp + com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp -com.arsdigita.cms.hide_udct_ui=true -com.arsdigita.cms.hide_folder_index_checkbox=true + +# Forum application +com.arsdigita.forum.show_new_tabs=true +com.arsdigita.forum.use_wysiwyg_editor=true +com.arsdigita.forum.allow_quick_finish=true +com.arsdigita.forum.disable_page_caching=true + +; atoz com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws -com.arsdigita.london.theme.default_theme_context= -com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf +# ccm-ldn-navigation application +; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive +; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 +com.arsdigita.london.navigation.category_menu_show_grand_children=false +; com.arsdigita.london.navigation.category_menu_show_nephews=false +com.arsdigita.london.navigation.default_cat_root_path=/navigation/ +com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp + + +# ccm-ldn-search application com.arsdigita.london.search.show_sponsored_links=true + +# ccm-ldn-subsite application +com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker + + +# ccm-themedirector application +themedirector.default_theme_path=themes/static/aplaws + com.arsdigita.london.cms.dublin.audience_domain=LGAL + +; ============================================================================================= +; runtime specific configurations + +waf.admin.email=webmaster@aplaws.org +waf.admin.name.given=aplaws +waf.admin.name.family=Administrator +waf.admin.password=123456 +waf.admin.password.question=12345 +waf.admin.password.answer=6 + +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm +waf.runtime.jdbc_pool_size=60 + +waf.web.server=localhost\:8080 + + +# ============================================================================================= +# devel specific configurations +#waf.debug=true +#waf.bebop.fancy_xsl_errors=true diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml index 29ff94b80..2c7c01497 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml @@ -15,6 +15,21 @@ + + + shortcuts com.arsdigita.london.shortcuts.ShortcutFilter @@ -25,12 +40,22 @@ com.arsdigita.london.subsite.SubsiteFilter + + + subsite - /ccm/* - @@ -133,7 +158,6 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - TextOnlyServlet Text Only Servlet @@ -180,8 +204,6 @@ - - portal-files com.arsdigita.web.ApplicationFileServlet @@ -281,33 +303,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + - + theme-files /theme-files/* @@ -395,7 +417,7 @@ ThemePreviewServlet /theme/* - + + + shortcuts com.arsdigita.london.shortcuts.ShortcutFilter @@ -25,12 +40,22 @@ com.arsdigita.london.subsite.SubsiteFilter + + + subsite - /ccm/* - @@ -133,7 +158,6 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - TextOnlyServlet Text Only Servlet @@ -180,8 +204,6 @@ - - portal-files com.arsdigita.web.ApplicationFileServlet @@ -281,33 +303,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + - + theme-files /theme-files/* @@ -395,7 +417,7 @@ ThemePreviewServlet /theme/* - + diff --git a/ccm-ldn-aplaws/bundles/standard/bundle.in b/ccm-ldn-aplaws/bundles/standard/bundle.in index 3fe020606..9ddd75d11 100755 --- a/ccm-ldn-aplaws/bundles/standard/bundle.in +++ b/ccm-ldn-aplaws/bundles/standard/bundle.in @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-standard BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle" -VERSION=1.0.5devel +VERSION=1.1.3 RELEASE=1 diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg index 02e53bc69..5fed92f86 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg @@ -7,15 +7,21 @@ ccm-cms # Content assets ccm-cms-assets-fileattachment -## ccm-cms-assets-imagestep +ccm-cms-assets-imagestep ## ccm-cms-assets-notes ccm-cms-assets-relatedlink + # is ldn-dublin really an asset? ccm-ldn-dublin # Content types +#ccm-cms-types-address +#ccm-cms-types-agenda ccm-cms-types-article +#ccm-cms-types-bookmark ccm-cms-types-contact +# esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact +# not decided yet which one to choose ccm-cms-types-esdservice ccm-cms-types-filestorageitem ccm-cms-types-formitem @@ -29,10 +35,27 @@ ccm-cms-types-siteproxy ccm-cms-types-xmlfeed # Applications -ccm-ldn-aplaws +# ------------ +#ccm-auth-http +#ccm-bookmarks +#ccm-formbuilder-pdf +ccm-forum +# ccm-forum-categorised +#ccm-portalserver +ccm-portalworkspace +# ccm-simplesurvey +ccm-themedirector +#ccm-user-preferences +#ccm-weblog + +# ldn extensions +# -------------- ccm-ldn-atoz +ccm-ldn-dublin +ccm-ldn-exporter +ccm-ldn-freeform +ccm-ldn-importer ccm-ldn-navigation -ccm-ldn-portal ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts @@ -40,7 +63,6 @@ ccm-ldn-subsite ccm-ldn-terms ccm-ldn-util -# Extra apps -ccm-forum -ccm-ldn-importer -ccm-ldn-theme +# integration layer +ccm-ldn-aplaws + diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties index 4283e42bb..a736e61cf 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties @@ -1,36 +1,160 @@ +# Devel bundle intgegration.properties +# +waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +# +; dhtml editor to use (system wide) +; Xinha is default +; waf.bebop.dhtml_editor=Xinha +; waf.bebop.dhtml_editor=FCKeditor + +waf.categorization.show_internal_name=true +waf.categorization.supported_languages=de,en + +waf.dispatcher.default_expiry=3600 +; +waf.kernel.data_permission_check_enabled=false +waf.kernel.primary_user_identifier=email +; if you activate screen_name, forum loader doesn't work. +; waf.kernel.primary_user_identifier=screen_name +waf.kernel.supported_languages=de,en + +; security.properties: +;waf.auto_registration_on=false + +# MOVED to ui.Config +#waf.pagemap.root=portal/ +#waf.pagemap.workspace=portal/ +#waf.pagemap.login_redirect=content/content-center-redirect.jsp + +; Searches for localized style sheet (among others) waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt -waf.kernel.data_permission_check_enabled=false -waf.dispatcher.default_expiry=3600 -waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage -waf.pagemap.root=portal/ -waf.pagemap.workspace=portal/ -waf.pagemap.login_redirect=content/content-center-redirect.jsp -com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp +core.ui.pagemap.root_page_url=navigation/ +core.ui.pagemap.workspace_url=navigation/ +core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp + +; workflow configuration +waf.workflow.simple.alerts_enabled=true +waf.workflow.simple.alerts_sender=root@localhost.localdomain + +; Configures the xml processing +waf.xml.xsl_transformer=xalan +waf.xml.activate_full_date_formatter=true + +# ccm-cms parameters + +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker + com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp +com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver + +; Configure dhtml editor for use in cms content-center +; Xinha is default and should work out of the box +;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js +; as a temporary measure a different configuration file which includes a link selection box for CCM items +; and CCM images should be specified: +com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js + +; to use FCKeditor: +; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js +; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js +; com.arsdigita.cms.dhtml_editor_hidden_buttons= +; com.arsdigita.cms.dhtml_editor_plugins= + +; to use deprecated HTMLarea (NOT recommended!): +; currently configuration is hardcoded, so the fest alternative works +; com.arsdigita.cms.dhtml_editor_config=HTMLArea +; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js +; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS + com.arsdigita.cms.disable_item_pfs=true + +com.arsdigita.cms.hide_admin_tabs=true +com.arsdigita.cms.hide_folder_index_checkbox=true +com.arsdigita.cms.hide_launch_date=true +com.arsdigita.cms.hide_templates_tab=true +com.arsdigita.cms.hide_timezone=true +com.arsdigita.cms.hide_udct_ui=true + com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true -com.arsdigita.cms.hide_templates_tab=true -com.arsdigita.cms.hide_admin_tabs=true -com.arsdigita.cms.hide_timezone=true -com.arsdigita.cms.hide_launch_date=true -com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js -com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker + + +# ccm-cms-types-event parameters +com.arsdigita.cms.contenttypes.event.hide_cost=true +com.arsdigita.cms.contenttypes.event.hide_date_description=false +com.arsdigita.cms.contenttypes.event.hide_event_type=true +com.arsdigita.cms.contenttypes.event.hide_link_to_map=true +com.arsdigita.cms.contenttypes.event.hide_main_contributor=true +com.arsdigita.cms.contenttypes.event.use_html_date_description=false +com.arsdigita.cms.contenttypes.event.start_year=2000 +com.arsdigita.cms.contenttypes.event.end_year_delta=5 + + +# ccm-cms-types-newsitem parameters com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true +com.arsdigita.cms.contenttypes.newsitem.start_year=2000 +com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 + + +# ?? Where are these used? com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp -com.arsdigita.cms.hide_udct_ui=true -com.arsdigita.cms.hide_folder_index_checkbox=true +; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp + + +# Forum application +com.arsdigita.forum.show_new_tabs=true +com.arsdigita.forum.use_wysiwyg_editor=true +com.arsdigita.forum.allow_quick_finish=true +com.arsdigita.forum.disable_page_caching=true + +; atoz currently not in use com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws -com.arsdigita.london.theme.default_theme_context= -com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf +# ccm-ldn-navigation application +; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive +; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 +; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 +com.arsdigita.london.navigation.category_menu_show_grand_children=false +; com.arsdigita.london.navigation.category_menu_show_nephews=false +com.arsdigita.london.navigation.default_cat_root_path=/navigation/ +com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp + + +# ccm-ldn-search application com.arsdigita.london.search.show_sponsored_links=true + +# ccm-ldn-subsite application +com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker + + +# ccm-themedirector application +themedirector.default_theme_path=themes/static/aplaws + com.arsdigita.london.cms.dublin.audience_domain=LGAL + +; ============================================================================================= +; runtime specific configurations + +waf.admin.email=webmaster@aplaws.org +waf.admin.name.given=aplaws +waf.admin.name.family=Administrator +waf.admin.password=123456 +waf.admin.password.question=12345 +waf.admin.password.answer=6 + +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm +waf.runtime.jdbc_pool_size=60 + +waf.web.server=localhost\:8080 + + +# ============================================================================================= +# devel specific configurations +waf.debug=true +waf.bebop.fancy_xsl_errors=true diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml index 29ff94b80..2d3c7498a 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml @@ -15,6 +15,21 @@ + + + shortcuts com.arsdigita.london.shortcuts.ShortcutFilter @@ -25,12 +40,22 @@ com.arsdigita.london.subsite.SubsiteFilter + + + subsite - /ccm/* - @@ -133,7 +158,6 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - TextOnlyServlet Text Only Servlet @@ -180,8 +204,6 @@ - - portal-files com.arsdigita.web.ApplicationFileServlet @@ -281,33 +303,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + - + theme-files /theme-files/* @@ -395,7 +417,7 @@ ThemePreviewServlet /theme/* - + diff --git a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp b/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp index 42c0c7cc9..b32819af7 100755 --- a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp +++ b/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp @@ -1,7 +1,7 @@ + xmlns:define="/WEB-INF/bebop-define.tld" + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> ccm-ldn-aplaws +http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl +http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl # APLAWS default, with locale # XXX change ROOT -> ccm-ldn-aplaws +http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::locale::.xsl +http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl # Global default, from application's own web app http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl + +# Global default, from application's own web app - relocated version >= 6.6.1 +http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl +http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl +http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl +http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java index 0181ea8d9..d0aea23d1 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -57,6 +57,9 @@ import org.apache.log4j.Logger; /** * Loader. * + * Creates category domains in the terms application according to + * configuration files and adds jsp templates to navigation. + * * @author Justin Ross <jross@redhat.com> * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $ */ @@ -313,7 +316,7 @@ public class Loader extends PackageLoader { " in context " + context); } - Domain domain = Domain.retrieve(domainKey); + Domain domain = Domain.retrieve(domainKey); // package com.arsdigita.london.terms Application app = Application.retrieveApplicationForPath(appURL); domain.setAsRootForObject(app, context); if (app instanceof ContentSection) { @@ -322,8 +325,8 @@ public class Loader extends PackageLoader { Set categorizeRoles = new HashSet(); while (coll.next()) { Role role = coll.getRole(); - final DataQuery privs = RoleFactory.getRolePrivileges - (app.getID(), role.getGroup().getID()); + final DataQuery privs = RoleFactory.getRolePrivileges( + app.getID(), role.getGroup().getID()); while (privs.next()) { String priv = (String) privs.get(RoleFactory.PRIVILEGE); if (priv.equals(SecurityManager.CMS_CATEGORY_ADMIN)) { @@ -332,7 +335,7 @@ public class Loader extends PackageLoader { categorizeRoles.add(role); } } - + } RootCategoryCollection catCollection = Category.getRootCategories(((ContentSection) app)); while (catCollection.next()) { diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java index 56da85a78..ad36940b4 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + package com.arsdigita.aplaws; import com.arsdigita.xml.Element; @@ -369,4 +370,5 @@ public class ObjectTypeSchemaGenerator extends ObjectTypeTraversal { } m_property = (Property) m_properties.pop(); } + } diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ACSObjectCategoryPicker.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ACSObjectCategoryPicker.java deleted file mode 100755 index d5bc111af..000000000 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ACSObjectCategoryPicker.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -package com.arsdigita.aplaws.ui; - - -import com.arsdigita.aplaws.Aplaws; -// import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.bebop.event.ActionEvent; -import com.arsdigita.bebop.event.ActionListener; -// import com.arsdigita.bebop.form.Widget; -// import com.arsdigita.categorization.ui.ACSObjectCategoryForm; -// import com.arsdigita.persistence.SessionManager; -// import com.arsdigita.persistence.DataCollection; -// import com.arsdigita.domain.DomainCollection; -// import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.london.terms.Term; -import com.arsdigita.london.terms.Domain; - -import java.util.Collection; -import java.util.List; -import java.util.LinkedList; -import java.util.Iterator; - -import org.apache.log4j.Logger; - -/** - * Extends com.arsdigita.london.terms.ui.ACSObjectCategoryPicker and overwrites - * the private class ItemCategoryFormCompletion to add functionality to its - * lgclSelected() method. - * - */ -public abstract class ACSObjectCategoryPicker - extends com.arsdigita.london.terms.ui.ACSObjectCategoryPicker{ - - private static final Logger s_log = Logger.getLogger(ACSObjectCategoryPicker.class); - - /** - * Constructor - * - * @param root - * @param mode - */ - public ACSObjectCategoryPicker(BigDecimalParameter root, - StringParameter mode) { - super(root,mode); - } - - - /** - * Overwrites private class of the parent class to add functionality for - * processing or mapping from LGCL to APLAWS-NAV in method lgclSelected(). - */ - private class ItemCategoryFormCompletion implements ActionListener { - - public void actionPerformed(ActionEvent ev) { - - PageState state = ev.getPageState(); - Domain domain = getDomain(state); - String domainKey = domain.getKey(); - - if (s_log.isDebugEnabled()) { - s_log.debug("Saving categories in: " + domainKey); - } - - ACSObject object = getObject(state); - - if ("LGCL".equals(domainKey)) { - lgclSelected(domain, object); - } - - else if ("LGDL".equals(domainKey)) { - lgdlSelected(domain, object); - } - - fireCompletionEvent(state); - } - - /** - * Adds processing or mapping from LGCL to APLAWS-NAV too. - * - * ANav and the corresponding configuration parameter in module - * ccm-ldn-aplaws are highly specific to the needs of British Local - * Authorities and should not be used in more general parts of the - * code. - * - * @param domain - * @param object - */ - private void lgclSelected(Domain domain, ACSObject object) { - List lgclTerms = getCurrentCategories(domain, object); - - Domain gcl = Domain.retrieve("GCL"); - Collection gclTerms = getRelatedTerms(lgclTerms, gcl); - clearTerms(gcl, object); - assignTerms(gclTerms, object); - - // The assignment below is removed to satisfy requirement 4.1, - // use case 1 of the document "Metadata Improvements" version 1 - // by Camden, dated 23/01/05. - //Domain lgsl = Domain.retrieve("LGSL"); - //Collection lgslTerms = getRelatedTerms(lgclTerms, lgsl); - //clearTerms(lgsl, object); - //assignTerms(lgslTerms, object); - - // adding processing or mapping from LGCL to APLAWS-NAV too - boolean lgclOverrideAnav = Aplaws.getAplawsConfig(). - getOverrideAnavFromLGCLMappings().booleanValue(); - if (lgclOverrideAnav) { - Domain aplawsNav = Domain.retrieve("APLAWS-NAV"); - Collection aplawsNavTerms = getRelatedTerms(lgclTerms, aplawsNav); - clearTerms(aplawsNav, object); - assignTerms(aplawsNavTerms, object); - } - } - - // User has selected a term in the LGDL hierarchy, which includes - // terms from the LGSL. We're only interested in LGSL terms here. - private void lgdlSelected(Domain domain, ACSObject object) { - Domain lgsl = Domain.retrieve("LGSL"); - Domain gcl = Domain.retrieve("GCL"); - Domain lgcl = Domain.retrieve("LGCL"); - - // We have a mapping LGSL -> LGCL based on the reverse of a - // published mapping. We don't have a mapping LGSL -> GCL, so we - // do LGSL -> LGCL -> GCL instead. - - List lgslTerms = getCurrentCategories(lgsl, object); - Collection lgclTerms = getRelatedTerms(lgslTerms, lgcl); - - LinkedList lgclIDs = new LinkedList(); - Iterator i = lgclTerms.iterator(); - while (i.hasNext()) { - Term term = (Term) i.next(); - lgclIDs.add(term.getModel().getID()); - } - - Collection gclTerms = getRelatedTerms(lgclIDs, gcl); - - clearTerms(lgcl, object); - assignTerms(lgclTerms, object); - - clearTerms(gcl, object); - assignTerms(gclTerms, object); - } - } - - -} diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java.nolongerInUse similarity index 91% rename from ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java rename to ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java.nolongerInUse index 196683e5a..a632dfa22 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java.nolongerInUse @@ -15,7 +15,6 @@ import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.categorization.Category; import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.london.terms.ui.TermWidget; import com.arsdigita.persistence.OID; import com.arsdigita.xml.Element; @@ -23,22 +22,20 @@ import com.arsdigita.xml.Element; * Generate part of the category tree. Used by Assign Category authoring step. * * @author Alan Pevec - * @deprecated use com.arsdigita.london.terms.ui.CategorySubtree instead! + * @deprecated use com.arsdigita.london.terms.ui.CategorySubtree instead. */ public class CategorySubtree extends SimpleComponent { StringParameter nodeIDparam = new StringParameter("nodeID"); private static Logger s_log = Logger.getLogger(CategorySubtree.class); - - @Override + public void register(Page p) { super.register(p); p.addGlobalStateParam(nodeIDparam); } - @Override public void generateXML(PageState state, Element p) { String node = (String)state.getValue(nodeIDparam); diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java index 5bc195c75..65c0b2dab 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java @@ -22,9 +22,15 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.domain.DomainObject; +import org.apache.log4j.Logger; + public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel implements PortalSelectionModel { + /** Private logger instance for debugging */ + private static Logger s_log = Logger.getLogger( + HomepagePortalSelectionModel.class); + private HomepageWorkspaceSelectionModel m_workspace; private int m_column; @@ -32,6 +38,13 @@ public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel int column) { m_workspace = workspace; m_column = column; + + if (s_log.isDebugEnabled()) { + s_log.debug("Constructor HomepageWorkspaceSelectionModel " + " [" + + "Workspace: " + m_workspace + "," + + "Columns: " + column + "]"); + } + } public void onCustomize(PageState state) { diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java index 26581a44c..ca27b195e 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java @@ -18,22 +18,32 @@ package com.arsdigita.aplaws.ui; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.ActionLink; import com.arsdigita.bebop.Page; -import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; +import com.arsdigita.portalworkspace.ui.PersistentPortal; +import com.arsdigita.portalworkspace.Workspace; +import com.arsdigita.bebop.PageState; +import com.arsdigita.xml.Element; +import com.arsdigita.portalworkspace.ui.PortalConstants; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; -import com.arsdigita.kernel.Party; import com.arsdigita.kernel.Kernel; -import com.arsdigita.portalworkspace.ui.PersistentPortal; -import com.arsdigita.portalworkspace.ui.PortalConstants; -import com.arsdigita.portalworkspace.Workspace; -import com.arsdigita.xml.Element; +import com.arsdigita.kernel.Party; + +import org.apache.log4j.Logger; +/** + * + * + */ public class HomepageWorkspace extends SimpleContainer { + /** Private logger instance for debugging */ + private static Logger s_log = Logger.getLogger( + HomepageWorkspace.class); + private HomepagePortalSelectionModel m_model; private ActionLink m_reset; private ActionLink m_browse; @@ -47,10 +57,19 @@ public class HomepageWorkspace extends SimpleContainer { public HomepageWorkspace() { super("portal:homepageWorkspace", PortalConstants.PORTAL_XML_NS); m_customizable = false; + + if (s_log.isDebugEnabled()) { + s_log.debug("Constructor HomepageWorkspace finished. " ); + } + } public void setModel(HomepagePortalSelectionModel model) { m_model = model; + + if (s_log.isDebugEnabled()) { + s_log.debug("setModel: " + m_model ); + } } public void setCustomizable(boolean customizable) { diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java index 659f174de..8f2809ac4 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java @@ -43,13 +43,14 @@ import com.arsdigita.london.terms.ui.TermWidget; public class ItemCategoryPicker extends ACSObjectCategoryPicker { + private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class); public ItemCategoryPicker(BigDecimalParameter root, StringParameter mode) { - super(root, mode); - s_log.debug("instantiating ItemCategoryPicker"); + super(root, mode); + s_log.debug("instantiating ItemCategoryPicker"); } @@ -59,7 +60,8 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker { com.arsdigita.bebop.parameters.BigDecimalParameter, com.arsdigita.bebop.parameters.StringParameter) */ - protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) { + protected ACSObjectCategoryForm getForm(BigDecimalParameter root, + StringParameter mode) { s_log.debug("getForm"); return new ItemCategoryForm(root, mode, new TermWidget(mode, this)); } diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/SimplePage.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/SimplePage.java index babb4510e..bafa8be3c 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/SimplePage.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/SimplePage.java @@ -25,7 +25,14 @@ import com.arsdigita.xml.Document; import com.arsdigita.xml.Element; import com.arsdigita.web.Web; - +/** + *

+ * Special implementation of com.arsdigita.ui.SimplePage as + * the base page to serve bebop pages.

+ * + *

Activated by pointing the parameter waf.bebop.base_page + * to it.

+ */ public class SimplePage extends com.arsdigita.ui.SimplePage { public SimplePage(String application, @@ -39,6 +46,14 @@ public class SimplePage extends com.arsdigita.ui.SimplePage { Document parent) { Element page = super.generateXMLHelper(state, parent); + /* + * TODO: What specific funcionality is added here and what is + * its purpose and why is the bebop standard implementation + * insufficient. + * + * Two xml attributes are added in addition to the bebop standard + * implementation. + */ if (Web.getContext().getRequestURL() != null) { page.addAttribute("url", Web.getContext().getRequestURL().toString()); diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse index f96c5a9f1..f45e0d7ab 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java.nolongerInUse @@ -132,7 +132,7 @@ public class TermWidget extends Widget { } Element el = generateCategory(widget, domain.getModel(), ids, null); - + /** * Used by kea based keyphrase extraction facility. * (Added r1885) @@ -268,7 +268,7 @@ public class TermWidget extends Widget { // recognisable attribute has to be in the XML for each snippet that is transformed, // hence add it to the parent el.addAttribute("expand", "all" ); - } + } List roots = (List) children.get(root.getID()); if (null != roots) { diff --git a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws index edf4507fa..540c76859 100755 --- a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws +++ b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws @@ -15,6 +15,23 @@ + + + + shortcuts com.arsdigita.london.shortcuts.ShortcutFilter @@ -25,6 +42,20 @@ com.arsdigita.london.subsite.SubsiteFilter + + + + subsite /* @@ -177,14 +208,12 @@ - - - portal-files + portalworkspace-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-portal + /templates/ccm-portalworkspace @@ -330,8 +359,8 @@ - portal-files - /ccm-ldn-portal/files/* + portalworkspace-files + /ccm-portalworkspace/files/* diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.css b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.css deleted file mode 100755 index 132b7d723..000000000 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url("/css/acs-master.css"); -@import url("/__ccm__/static/forum/forum.css"); diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl deleted file mode 100755 index b7b067338..000000000 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-admin.css b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-admin.css deleted file mode 100755 index 278ecd8e6..000000000 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-admin.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url("/css/acs-master.css"); -@import url("/__ccm__/apps/navigation/xsl/admin.css"); diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-index.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-index.xsl deleted file mode 100755 index b18a3896b..000000000 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-index.xsl +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-services.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-services.xsl deleted file mode 100755 index 6a8c818af..000000000 --- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/navigation-services.xsl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.js b/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.js new file mode 100644 index 000000000..fe045f7ce --- /dev/null +++ b/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.js @@ -0,0 +1,137 @@ +/* + * FCKeditor - The text editor for internet + * Copyright (C) 2003-2005 Frederico Caldeira Knabben + * + * Licensed under the terms of the GNU Lesser General Public License: + * http://www.opensource.org/licenses/lgpl-license.php + * + * For further information visit: + * http://www.fckeditor.net/ + * + * File Name: fckconfigOpenCCM.js + * Editor configuration settings for use in admin interface in APLAWS/OpenCCM. + * This configuration is designed to match the following goals: + * - Easy useage of the editor + * - Clean HTML output, this means for example that no deprected elements are useable from the editor + * + * This file is organized in the same way as the page of the FCKEditor documentation showing all config options. + * The page can be found here: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options + * + * - Semantic HTML output. This means that elements like are prefered against such as + * This config is loaded from the Javascript in the calling page using AFTER the + * default fckconfig.js is loaded. + * + * File Authors: + * Chris Burnett (orginale fckeditordefaultstyle.js for APLAWS) + * Jens Pelzetter + */ + +/* **************************************************************************************************************** */ + + +/* Editor Behavior + --------------- */ + +FCKConfig.AutoDetectPasteFromWord = false ; //Paste Word text directly to the editor (only IE) +FCKConfig.CleanWordKeepsStructure = true ; //Prefer to keep HTML structure, not layout +FCKConfig.DocType = '' ; +FCKConfig.ForcePasteAsPlainText = true ; //Text pasted in from another app will appear as plain text + + +/* Styles + ------ */ + +FCKConfig.StylesXmlPath = FCKConfig.EditorPath + 'config/fckconfigOpenCCM.xml' ; //Some styles + +/* HTML Output + ----------- */ + +FCKConfig.FormatOutput = true ; //Format output code +FCKConfig.FormatSource = true ; + +/* User interface + -------------- */ + +FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; +FCKConfig.ImageDlgHideLink = true ; +FCKConfig.ImageDlgHideAdvanced = true ; +FCKConfig.ShowDropDialog = true ; +FCKConfig.ToolbarSets["AplawsBasic"] = [ + ['Style','-','OrderedList','UnorderedList','Subscript', 'Superscript', '-','SpellCheck','Link','Unlink','RemoveFormat','-','ImageButton', '-', 'AdvToolbar', 'About'] +] ; + +FCKConfig.ToolbarSets["AplawsAdvanced"] = [ + ['Style','-','OrderedList','UnorderedList','Subscript', 'Superscript'], + ['Cut','Copy','Paste','PasteText','PasteWord','Undo','Redo','RemoveFormat'], + ['Find','Replace','SelectAll', '-','SpellCheck'], + '/', + ['Link','Unlink','Anchor','-','Source'], + ['SimpleToolbar'] +] ; + + +// Replace the Advanced toolbar with AplawsAdvanced & setup the Basic toolbar to use the AplawsBasic toolbar +// The two toolbars are used to support the dynamic toolbar switching plugin. +// Set the Default to be the Basic version so that the editor loads the basic toolbar on startup. + +FCKConfig.ToolbarSets["Advanced"] = FCKConfig.ToolbarSets["AplawsAdvanced"] ; +FCKConfig.ToolbarSets["Basic"] = FCKConfig.ToolbarSets["AplawsBasic"] ; +FCKConfig.ToolbarSets["Default"] = FCKConfig.ToolbarSets["Basic"] ; + +/* Advanced + -------- */ +FCKConfig.FirefoxSpellChecker = true ; +FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' +FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + +/* File Browser and Updoader + ------------------------- */ + +FCKConfig.LinkBrowser = true ; +FCKConfig.LinkBrowserURL = "/ccm/content/admin/search.jsp?useURL=true&widget=getElementById('txtUrl')" ; +FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% +FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% + + +/* +FCKConfig.ToolbarSets["AplawsBasic"] = [ + ['Style','-','Bold','OrderedList','UnorderedList','-','SpellCheck','Link','Unlink','RemoveFormat','-','AdvToolbar'] +] ; + +FCKConfig.ToolbarSets["AplawsAdvanced"] = [ + ['Style','-','Bold','OrderedList','UnorderedList'], + ['Cut','Copy','Paste','PasteText','PasteWord','Undo','Redo','RemoveFormat'], + ['Find','Replace','SelectAll', '-','SpellCheck'], + '/', + ['UniversalKey'], + ['Link','Unlink','Anchor','-','Source'], + ['SimpleToolbar'] +] ; + + +// Replace the Advanced toolbar with AplawsAdvanced & setup the Basic toolbar to use the AplawsBasic toolbar +// The two toolbars are used to support the dynamic toolbar switching plugin. +// Set the Default to be the Basic version so that the editor loads the basic toolbar on startup. + +FCKConfig.ToolbarSets["Advanced"] = FCKConfig.ToolbarSets["AplawsAdvanced"] ; +FCKConfig.ToolbarSets["Basic"] = FCKConfig.ToolbarSets["AplawsBasic"] ; +FCKConfig.ToolbarSets["Default"] = FCKConfig.ToolbarSets["Basic"] ; + + +FCKConfig.StylesXmlPath = FCKConfig.EditorPath + 'config/fckconfigstyledefault.xml' ; +FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ; + +FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages' +FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ; + +FCKConfig.ImageDlgHideLink = true ; +FCKConfig.ImageDlgHideAdvanced = true ; + +FCKConfig.FlashDlgHideAdvanced = true ; + +FCKConfig.LinkBrowser = true ; +FCKConfig.LinkBrowserURL = "/ccm/content/admin/search.jsp?useURL=true&widget=getElementById('txtUrl')" ; +FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% +FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% +*/ + diff --git a/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.xml b/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.xml new file mode 100644 index 000000000..c5ebd5667 --- /dev/null +++ b/ccm-ldn-aplaws/web/assets/fckeditor/config/fckconfigOpenCCM.xml @@ -0,0 +1,12 @@ + + + + +