diff --git a/ccm-gen-aplaws/bundles/devel/bundle.in b/ccm-gen-aplaws/bundles/devel/bundle.in index e9ed3a3b4..8c02b64fb 100755 --- a/ccm-gen-aplaws/bundles/devel/bundle.in +++ b/ccm-gen-aplaws/bundles/devel/bundle.in @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-devel BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle" -VERSION=1.0.9devel +VERSION=1.1.2devel RELEASE=1 diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties index dc8648b56..1abb20e7e 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties @@ -18,7 +18,7 @@ waf.kernel.primary_user_identifier=email ; waf.kernel.primary_user_identifier=screen_name waf.kernel.supported_languages=de,en -; security.properties: +; security.properties: waf.auto_registration_on=false # MOVED to ui.Config diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg b/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg index 8504c3884..c29ab9108 100644 --- a/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg @@ -47,6 +47,8 @@ ccm-cms-types-newsitem # ccm-auth-http # ccm-bookmarks ccm-docmgr +ccm-docrepo +ccm-faq # ccm-formbuilder-pdf ccm-forum # ccm-forum-categorised diff --git a/ccm-gen-aplaws/bundles/staatsschiff/bundle.in b/ccm-gen-aplaws/bundles/staatsschiff/bundle.in index ad1200c37..69ee060f6 100755 --- a/ccm-gen-aplaws/bundles/staatsschiff/bundle.in +++ b/ccm-gen-aplaws/bundles/staatsschiff/bundle.in @@ -1,4 +1,4 @@ -BUNDLE_NAME=aplaws-plus-devel -BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle" -VERSION=1.0.5devel +BUNDLE_NAME=aplaws-plus-staatsschiff +BUNDLE_PRETTY_NAME="APLAWS+ Bundle Staatsschiff" +VERSION=1.1.2 RELEASE=1 diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg index 588a1ec36..2e5607817 100755 --- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg @@ -7,7 +7,6 @@ ccm-cms-assets-fileattachment ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink -## -- ccm-ldn-dublin ist das eigentlich ein asset? # Content types #ccm-cms-types-address @@ -27,18 +26,18 @@ ccm-cms-types-newsitem # Applications #ccm-docmgr #ccm-forum +ccm-portalworkspace +ccm-themedirector #ccm-user-preferences # LDN extensions # ## ccm-ldn-image-step ccm-ldn-navigation -ccm-ldn-portal ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms -ccm-ldn-theme ccm-ldn-util # sci extensions diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties index 5e676d224..47ba52d61 100755 --- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties @@ -1,11 +1,13 @@ +# Staatsschiff bundle integration.properties release version 1.2.2 / r92x +# 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.bebop.dhtml_editor=Xinha -waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js waf.categorization.show_internal_name=true -waf.categorization.supported_languages=en,de waf.dispatcher.default_expiry=3600 ; @@ -13,76 +15,88 @@ waf.dispatcher.default_expiry=3600 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 + +waf.mail.default_from=webmaster@staatsschiff.staat.uni-bremen.de ; 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 + +waf.mail.default_from=webmaster@staatsschiff.staat.uni-bremen.de + +; 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 + core.ui.pagemap.root_page_url=navigation/ core.ui.pagemap.workspace_url=navigation/ core.ui.pagemap.user_redirect_url=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 ; 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_item_template_path=/default/aplaws-item.jsp 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 -;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 +; Xinha is default and should work out of the box +; 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 com.arsdigita.cms.dhtml_editor_hidden_buttons= -; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS com.arsdigita.cms.dhtml_editor_plugins= +; 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_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_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.skip_asset_steps=com.arsdigita.cms.contenttypes.MultiPartArticle:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.contenttypes.InlineSite:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.InlineSite:com.arsdigita.cms.contentassets.ui.FileAttachmentsStep -#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 +# ccm-cms-types-images parameter +com.arsdigita.cms.contenttypes.image.start_year=1200 +com.arsdigita.cms.contenttypes.image.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.newsitem.hide_homepage=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 - +# 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 @@ -92,22 +106,27 @@ com.arsdigita.london.navigation.category_menu_show_grand_children=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_context= +; themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf themedirector.default_theme_path=themes/static/aplaws-generic +themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # com.arsdigita.london.cms.dublin.audience_domain=LGAL ; ============================================================================================= -; devel specific configurations -waf.mail.default_from=webmaster@staatsschiff.staat.uni-bremen.de - -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/staatsschiff?user\=staatsschiff&password\=ccm4cartoons -waf.runtime.jdbc_pool_size=40 -waf.web.server=localhost\:8080 +; runtime specific configurations waf.admin.email=webmaster@staatsschiff.staat.uni-bremen.de waf.admin.name.given=CCM @@ -116,6 +135,13 @@ waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/staatsschiff?user\=staatsschiff&password\=ccm4cartoons +waf.runtime.jdbc_pool_size=40 +waf.web.server=localhost\:8080 + + +# ============================================================================================= +# devel specific configurations # com.arsdigita.aplaws.lite_load=true # waf.debug=true # waf.bebop.fancy_xsl_errors=true diff --git a/ccm-gen-aplaws/bundles/zsr/bundle.in b/ccm-gen-aplaws/bundles/zsr/bundle.in index ad1200c37..47eaa340c 100644 --- a/ccm-gen-aplaws/bundles/zsr/bundle.in +++ b/ccm-gen-aplaws/bundles/zsr/bundle.in @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-devel BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle" -VERSION=1.0.5devel +VERSION=1.1.2 RELEASE=1 diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg b/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg index d9c5b763c..f33697f89 100644 --- a/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg @@ -1,4 +1,5 @@ -# Main apps +# ZSR application.cfg (release version 1.2.2 / r92x) +# Main apps ccm-core ccm-cms @@ -7,38 +8,60 @@ ccm-cms-assets-fileattachment ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink -## -- ccm-ldn-dublin ist das eigentlich ein asset? # Content types -#ccm-cms-types-address +# -- ccm-cms-types-address +# -- ccm-cms-types-agenda ccm-cms-types-article ccm-cms-types-bookmark -#ccm-cms-types-contact +# -- ccm-cms-types-contact +# -- ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem -#ccm-cms-types-glossaryitem -#ccm-cms-types-image -#ccm-cms-types-member +# ccm-cms-types-glossaryitem +# -- ccm-cms-types-htmlform +# -- ccm-cms-types-inlinesite +# -- ccm-cms-types-job +# -- ccm-cms-types-legalnotice +# ccm-cms-types-member +# -- ccm-cms-types-minutes +# -- ccm-cms-types-motditem ccm-cms-types-mparticle ccm-cms-types-newsitem +# -- ccm-cms-types-organization +# ccm-cms-types-person +# -- ccm-cms-types-pressrelease +# -- ccm-cms-types-researchnetwork +# -- ccm-cms-types-service +# ## Fuer OpenCCM aktivieren: +# -- ccm-cms-types-siteproxy +# -- ccm-cms-types-xmlfeed # Applications +# ------------ +# -- ccm-auth-http ccm-bookmarks -#ccm-docmgr +# -- ccm-docmngr +# -- ccm-formbuilder-pdf ccm-forum -#ccm-user-preferences +# ccm-forum-categorised +# ccm-portalserver +ccm-portalworkspace +# -- ccm-simplesurvey +ccm-themedirector +# ccm-user-preferences +# -- ccm-weblog +# -- ccm-webpage # LDN extensions ccm-ldn-navigation -ccm-ldn-portal ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms -ccm-ldn-theme ccm-ldn-util ccm-sci-publications diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties index 363a75154..67e5b75c2 100644 --- a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties @@ -1,11 +1,13 @@ +# ZSR bundle integration.properties release version 1.2.2 / r92x +# 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.bebop.dhtml_editor=Xinha -waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js waf.categorization.show_internal_name=true -waf.categorization.supported_languages=en,de waf.dispatcher.default_expiry=3600 ; @@ -13,96 +15,118 @@ waf.dispatcher.default_expiry=3600 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 + +; mail configuration +waf.mail.default_from=webmaster@z-sozialreform.de + +; 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 + core.ui.pagemap.root_page_url=navigation/ core.ui.pagemap.workspace_url=navigation/ core.ui.pagemap.user_redirect_url=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 ; 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_item_template_path=/default/aplaws-item.jsp 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 -;com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js +; Xinha is default and should work out of the box +; 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/XinhaConfig.js -com.arsdigita.cms.dhtml_editor_hidden_buttons= -; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS -com.arsdigita.cms.dhtml_editor_plugins= 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_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_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.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 +# 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.newsitem.hide_homepage=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.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.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +# 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_grand_children=true +com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; 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_context= +; themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf themedirector.default_theme_path=themes/static/aplaws-generic +themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # com.arsdigita.london.cms.dublin.audience_domain=LGAL ; ============================================================================================= -; devel specific configurations +; runtime specific configurations waf.mail.default_from=webmaster@z-sozialreform.de waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zsr?user\=zsr&password\=zsr48web @@ -116,6 +140,9 @@ waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 + +# ============================================================================================= +# devel specific configurations # com.arsdigita.aplaws.lite_load=true # waf.debug=true # waf.bebop.fancy_xsl_errors=true diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index faa437fc7..c218881ec 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -191,7 +191,7 @@ public class Loader extends PackageLoader { /* Workspace portal = (Workspace)Application .retrieveApplicationForPath("/portal/"); portal.setDefaultLayout(PageLayout - .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); */ + .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); */ } // end run method // public void registerServicesTemplate(String appURL) { @@ -221,10 +221,10 @@ public class Loader extends PackageLoader { */ public void registerNavigationTemplates() { - Template template ; + Template template; - /* In navigation werden bereits Grund-Templates erstellt. - */ + /* In navigation werden bereits Grund-Templates erstellt. + */ template = Template.create( "Generic AtoZ paginator", "Generic AtoZ paginator index page", @@ -263,6 +263,19 @@ public class Loader extends PackageLoader { "Specializing list", "Displays a list of items as the ordinary template, but specializes the objects in the list.", "/packages/navigation/templates/SpecializingList.jsp"); + + template = + Template.create( + "SciProject list", + "Displays a list of SciProject items, including some attributes.", + "/packages/navigation/templates/SciProjectList.jsp"); + + template = + Template.create( + "SciPublication list", + "Displays a list of publication items, including some attributes.", + "/packages/navigation/templates/SciPublicationList.jsp"); + } /** @@ -283,7 +296,7 @@ public class Loader extends PackageLoader { // -- "com.arsdigita.aplaws.custom_nav_key", // -- Parameter.REQUIRED, // -- "APLAWS-NAVIGATION"); - + /* Zugriff auf Website wird nicht benötigt, aber der Parameter bei Einrichtung * der Kategorien. Funktion URL prüft auf korrekte Syntax, nicht auf Existenz */ diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java index 1b9365278..8f2809ac4 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java @@ -45,7 +45,7 @@ import com.arsdigita.london.terms.ui.TermWidget; public class ItemCategoryPicker extends ACSObjectCategoryPicker { private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class); - // private static final class s_picker = this ; + public ItemCategoryPicker(BigDecimalParameter root, StringParameter mode) { diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp index dde10fef7..d93dcef04 100644 --- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp +++ b/ccm-gen-aplaws/web/packages/navigation/templates/gen-portal.jsp @@ -1,10 +1,10 @@ + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - <%-- JSP template to use a portal page as index page in navigation --%> + diff --git a/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp b/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp index bdf3f7745..485784b21 100644 --- a/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp +++ b/ccm-gen-aplaws/web/packages/navigation/templates/gen-welcome.jsp @@ -1,10 +1,10 @@ + xmlns:show="/WEB-INF/bebop-show.tld" + version="1.2"> - <%-- JSP template for the ZeS welcome / start page using navigation --%> +