From 701f9059988b4ed0509d4871c9f48ee153d44d4c Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 29 Jun 2014 14:01:10 +0000 Subject: [PATCH] Unfortunately, a rather complex update: * new class DescriptiveComponent, provides setLabel and setHint * classes Label, BaseLink and Widgets inherit from DescriptiveComponent and are ready to use setLabel and setHint * classes TextStylable and Blockstylable removed, both provide direct html which the responsibility of the theme * created Interface bebop/util/Panelcontraints to provide positional information for blocks fpr backwards compatibility. We have to decide whether to discard/replace or retain them. * created cass Embedded as a kind of spinn-off from Label to handle arbitrary String data, specifically JavaScript. It's part of a strategy to remove Strings from Label to prevent developers just to hack fixed strings and make a mess of the User Interface. * various reformatting and documentation added. git-svn-id: https://svn.libreccm.org/ccm/trunk@2728 8810af33-2d31-482b-a856-94f89814c4df --- .../auth/http/GlobalizationUtil.java | 43 +++ .../auth/http/HTTPAuthResources.properties | 12 + .../auth/http/HTTPAuthResources_de.properties | 12 + .../auth/http/HTTPAuthResources_en.properties | 12 + .../auth/http/HTTPAuthResources_fr.properties | 12 + .../auth/http/ui/UpdateUsersForm.java | 31 +- .../auth/http/ui/UserManageForm.java | 24 +- .../bookmarks/ui/BookmarkEditPane.java | 3 +- .../ui/mparticle/SectionTable.java | 1 + .../com/arsdigita/cms/CMSResources.properties | 5 + .../arsdigita/cms/CMSResources_de.properties | 5 + .../cms/CMSResources_en_GB.properties | 5 + .../arsdigita/cms/CMSResources_fr.properties | 5 + .../arsdigita/cms/TextPage.java.noLongerInUse | 11 + .../cms/contenttypes/ui/LinkPropertyForm.java | 21 +- .../com/arsdigita/cms/ui/BaseAdminPane.java | 7 +- .../com/arsdigita/cms/ui/BaseDeleteForm.java | 2 +- .../src/com/arsdigita/cms/ui/BrowsePane.java | 3 +- .../arsdigita/cms/ui/CMSItemSearchPage.java | 2 +- .../cms/ui/CMSSearchResultRedirector.java | 14 +- .../com/arsdigita/cms/ui/CategoryForm.java | 18 +- .../cms/ui/ContentItemContextBar.java | 1 + .../cms/ui/ContentItemDatesData.java | 4 +- .../arsdigita/cms/ui/ContentSectionPage.java | 17 +- .../com/arsdigita/cms/ui/FlatItemList.java | 85 +++-- .../com/arsdigita/cms/ui/FolderContent.java | 16 +- .../cms/ui/ItemSearchCreateItemPane.java | 13 +- .../cms/ui/ItemSearchFlatBrowsePane.java | 21 +- .../cms/ui/category/BaseCategoryForm.java | 1 + .../cms/ui/category/CategoryItemsBrowser.java | 1 + .../ui/category/CategoryLocalizationForm.java | 13 +- .../ContentSectionContainer.java | 320 +++++++++++------- .../cms/ui/contentcenter/TasksPanel.java | 16 +- .../cms/ui/revision/DifferencePane.java | 15 +- .../bebop/demo/AutoDispatcher.java | 0 .../bebop/demo/BebopDispatcher.java | 0 .../bebop/demo/DemoDispatcher.java | 0 .../bebop/demo/HelloDate.java | 0 .../bebop/demo/MinimalDispatcher.java | 0 .../bebop/demo/MySitePage.java | 0 .../bebop/demo/OtherDispatcher.java | 0 .../bebop/demo/UserList.java | 0 .../bebop/demo/WorkflowAdminPage.java | 0 .../bebop/demo/package.html | 0 .../bebop/demo/workflow/AddProcess.java | 0 .../bebop/demo/workflow/AddTask.java | 0 .../bebop/demo/workflow/AdminPane.java | 0 .../bebop/demo/workflow/DisplayTask.java | 0 .../bebop/demo/workflow/Listing.java | 0 .../bebop/demo/workflow/Process.java | 0 .../bebop/demo/workflow/ProcessDisplay.java | 0 .../bebop/demo/workflow/SampleProcesses.java | 0 .../bebop/demo/workflow/Task.java | 0 .../bebop/demo/workflow/package.html | 0 .../src/com/arsdigita/bebop/BaseLink.java | 158 +++++---- .../arsdigita/bebop/BebopResources.properties | 1 + .../bebop/BebopResources_de.properties | 1 + .../bebop/BebopResources_fr.properties | 1 + .../com/arsdigita/bebop/BlockStylable.java | 162 +++++---- .../src/com/arsdigita/bebop/BoxPanel.java | 104 +++--- .../src/com/arsdigita/bebop/ColumnPanel.java | 103 +++--- .../src/com/arsdigita/bebop/Component.java | 16 +- .../arsdigita/bebop/DescriptiveComponent.java | 119 +++++++ .../src/com/arsdigita/bebop/Embedded.java | 146 ++++++++ .../arsdigita/bebop/FormProcessException.java | 20 ++ .../src/com/arsdigita/bebop/FormSection.java | 7 +- ccm-core/src/com/arsdigita/bebop/Grid.java | 2 + .../src/com/arsdigita/bebop/GridPanel.java | 18 +- ccm-core/src/com/arsdigita/bebop/Image.java | 10 +- ccm-core/src/com/arsdigita/bebop/Label.java | 79 +++-- ccm-core/src/com/arsdigita/bebop/Link.java | 31 +- ccm-core/src/com/arsdigita/bebop/Page.java | 2 +- .../com/arsdigita/bebop/SimpleComponent.java | 2 + .../com/arsdigita/bebop/SimpleContainer.java | 3 +- ccm-core/src/com/arsdigita/bebop/Table.java | 68 ++-- .../src/com/arsdigita/bebop/TextStylable.java | 51 --- ccm-core/src/com/arsdigita/bebop/Wizard.java | 13 +- .../com/arsdigita/bebop/form/ImageSubmit.java | 91 ++--- .../src/com/arsdigita/bebop/form/Option.java | 36 +- .../src/com/arsdigita/bebop/form/Submit.java | 3 + .../src/com/arsdigita/bebop/form/Widget.java | 111 +++--- .../arsdigita/bebop/jsp/DefineContainer.java | 4 + .../src/com/arsdigita/bebop/util/Color.java | 7 +- .../bebop/util/PanelConstraints.java | 103 ++++++ .../com/arsdigita/caching/CacheServlet.java | 12 +- .../com/arsdigita/util/servlet/HttpHost.java | 1 + .../web/monitoring/DBTestServlet.java | 16 +- .../WEB-INF/web.d/web.default-ccm-core.xml | 25 +- .../cms/docmgr/ui/CreateDocLinkPane.java | 3 +- .../arsdigita/forum/ui/ForumAlertsView.java | 2 + .../london/contenttypes/Councillor.java | 4 +- .../contenttypes/CouncillorInitializer.java | 22 +- .../arsdigita/london/contenttypes/Person.java | 4 +- .../contenttypes/ui/CouncillorEditForm.java | 3 +- .../permissions/ErrorMessageDisplay.java | 11 +- .../permissions/ObjectPermissionEdit.java | 20 +- .../ui/admin/AnswerValuesPanel.java | 8 +- .../cms/webpage/ui/WebpageCMSEditorPage.java | 2 + 98 files changed, 1611 insertions(+), 765 deletions(-) create mode 100755 ccm-auth-http/src/com/arsdigita/auth/http/GlobalizationUtil.java create mode 100644 ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources.properties create mode 100644 ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_de.properties create mode 100644 ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_en.properties create mode 100644 ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_fr.properties rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/AutoDispatcher.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/BebopDispatcher.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/DemoDispatcher.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/HelloDate.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/MinimalDispatcher.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/MySitePage.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/OtherDispatcher.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/UserList.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/WorkflowAdminPage.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/package.html (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/AddProcess.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/AddTask.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/AdminPane.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/DisplayTask.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/Listing.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/Process.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/ProcessDisplay.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/SampleProcesses.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/Task.java (100%) rename ccm-core/{src/com/arsdigita => examples}/bebop/demo/workflow/package.html (100%) create mode 100755 ccm-core/src/com/arsdigita/bebop/DescriptiveComponent.java create mode 100644 ccm-core/src/com/arsdigita/bebop/Embedded.java delete mode 100755 ccm-core/src/com/arsdigita/bebop/TextStylable.java create mode 100644 ccm-core/src/com/arsdigita/bebop/util/PanelConstraints.java diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/GlobalizationUtil.java b/ccm-auth-http/src/com/arsdigita/auth/http/GlobalizationUtil.java new file mode 100755 index 000000000..eb1f07d86 --- /dev/null +++ b/ccm-auth-http/src/com/arsdigita/auth/http/GlobalizationUtil.java @@ -0,0 +1,43 @@ + +/* + * Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. + * + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of + * the License at http://www.redhat.com/licenses/ccmpl.html + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + */ + +package com.arsdigita.auth.http; + +import com.arsdigita.globalization.Globalized; +import com.arsdigita.globalization.GlobalizedMessage; + +/** + *

+ * . + * Contains methods to simplify globalizing keys + *

+ * + * @author sarnold@redhat.com + * @version $Revision: #1 $ $Date: 2003/07/28 $ + */ + +public class GlobalizationUtil implements Globalized { + + private static final String BUNDLE_NAME = "com.arsdigita.auth.http.HTTPAuthResources"; + + public static GlobalizedMessage globalize(String key) { + return new GlobalizedMessage(key, BUNDLE_NAME); + } + public static GlobalizedMessage globalize(String key, Object[] args) { + return new GlobalizedMessage(key, BUNDLE_NAME, args); + + } +} diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources.properties b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources.properties new file mode 100644 index 000000000..51d0fb8cf --- /dev/null +++ b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources.properties @@ -0,0 +1,12 @@ +# To change this license header, choose License Headers in Project Properties. +# To change this template file, choose Tools | Templates +# and open the template in the editor. + +auth.http.users_file=Users file +auth.http.users_processed=Users processed:
+auth.http.users_invalid=Invalid users:
+auth.http.users_failed=
Failed Users:  +auth.http.value_dummy={0} +auth.http.user_domain=Domain +auth.http.user_name=  Username +auth.http.ui.add_edit_user=Add/Edit User diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_de.properties b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_de.properties new file mode 100644 index 000000000..140039c7d --- /dev/null +++ b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_de.properties @@ -0,0 +1,12 @@ +# To change this license header, choose License Headers in Project Properties. +# To change this template file, choose Tools | Templates +# and open the template in the editor. + +auth.http.users_file=Users file +auth.http.users_processed=Users processed:
+auth.http.users_invalid=Invalid users:
+auth.http.users_failed=
Failed Users:  +auth.http.value_dummy={0} +auth.http.user_domain=Domain +auth.http.user_name=  Username +auth.http.ui.add_edit_user=Benutzer hinzuf\u00fcgen / bearbeiten diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_en.properties b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_en.properties new file mode 100644 index 000000000..51d0fb8cf --- /dev/null +++ b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_en.properties @@ -0,0 +1,12 @@ +# To change this license header, choose License Headers in Project Properties. +# To change this template file, choose Tools | Templates +# and open the template in the editor. + +auth.http.users_file=Users file +auth.http.users_processed=Users processed:
+auth.http.users_invalid=Invalid users:
+auth.http.users_failed=
Failed Users:  +auth.http.value_dummy={0} +auth.http.user_domain=Domain +auth.http.user_name=  Username +auth.http.ui.add_edit_user=Add/Edit User diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_fr.properties b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_fr.properties new file mode 100644 index 000000000..51d0fb8cf --- /dev/null +++ b/ccm-auth-http/src/com/arsdigita/auth/http/HTTPAuthResources_fr.properties @@ -0,0 +1,12 @@ +# To change this license header, choose License Headers in Project Properties. +# To change this template file, choose Tools | Templates +# and open the template in the editor. + +auth.http.users_file=Users file +auth.http.users_processed=Users processed:
+auth.http.users_invalid=Invalid users:
+auth.http.users_failed=
Failed Users:  +auth.http.value_dummy={0} +auth.http.user_domain=Domain +auth.http.user_name=  Username +auth.http.ui.add_edit_user=Add/Edit User diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java b/ccm-auth-http/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java index 5767e1def..e3196bb87 100755 --- a/ccm-auth-http/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java +++ b/ccm-auth-http/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java @@ -32,6 +32,7 @@ import com.arsdigita.bebop.list.ListCellRenderer; import com.arsdigita.bebop.list.ListModel; import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.dispatcher.MultipartHttpServletRequest; +import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; import java.io.File; @@ -60,13 +61,17 @@ public class UpdateUsersForm extends Form private List m_invalidUserList; private List m_failedUserList; + /** + * + */ public UpdateUsersForm() { super( "updateUsers" ); setMethod( Form.POST ); setEncType("multipart/form-data"); - m_uploadForm.add( new Label( "Users file" ) ); + m_uploadForm.add( new Label(GlobalizationUtil + .globalize("auth.http.users_file"))); m_uploadForm.add( m_uploadFile ); m_uploadForm.add( m_uploadSubmit ); @@ -77,12 +82,20 @@ public class UpdateUsersForm extends Form m_invalidUserList.setCellRenderer( this ); m_failedUserList.setCellRenderer( this ); - m_displayAction.add( new Label( "Users processed:" ) ); - m_displayAction.add( new Label( "

", false)); - m_displayAction.add( new Label( "Invalid users:" ) ); + m_displayAction.add( new Label(GlobalizationUtil + .globalize("auth.http.users_processed"), + false)); + // m_displayAction.add( new Label( "

", false)); + // m_displayAction.add( new Label( "Invalid users:" ) ); + m_displayAction.add( new Label(GlobalizationUtil + .globalize("auth.http.users_invalid"), + false)); m_displayAction.add( m_invalidUserList ); - m_displayAction.add( new Label( "

", false ) ); - m_displayAction.add( new Label( "Failed users:" ) ); + // m_displayAction.add( new Label( "

", false ) ); + // m_displayAction.add( new Label( "Failed users:" ) ); + m_displayAction.add( new Label(GlobalizationUtil + .globalize("auth.http.users_failed"), + false)); m_displayAction.add( m_failedUserList ); add( m_displayAction ); @@ -90,9 +103,13 @@ public class UpdateUsersForm extends Form addProcessListener( this ); } + @Override public Component getComponent( List list, PageState state, Object value, String key, int index, boolean isSelected ) { - return new Label( value.toString() ); + String[] values = new String[1]; + values[0] = value.toString(); + return new Label( GlobalizationUtil + .globalize("auth.http.value_dummy", values) ); } private class UserCSVListModel implements ListModelBuilder { diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserManageForm.java b/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserManageForm.java index e01d2118e..764f63b98 100755 --- a/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserManageForm.java +++ b/ccm-auth-http/src/com/arsdigita/auth/http/ui/UserManageForm.java @@ -17,6 +17,7 @@ package com.arsdigita.auth.http.ui; import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; @@ -28,6 +29,7 @@ import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.form.TextField; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; +import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; import java.util.TooManyListenersException; @@ -40,7 +42,8 @@ public class UserManageForm extends Form { private SingleSelect m_domainSelect = new SingleSelect( DOMAIN_SELECT ); private TextField m_domainField = new TextField( DOMAIN_FIELD ); private TextField m_username = new TextField( USERNAME ); - private Submit m_submit = new Submit( "Add/Edit User" ); + private Submit m_submit = new Submit(GlobalizationUtil + .globalize("auth.http.ui.add_edit_user")); private ColumnPanel m_editForm = new ColumnPanel( 2 ); @@ -57,7 +60,14 @@ public class UserManageForm extends Form { ( "com.arsdigita.auth.ntlm.GetDomains" ); while ( q.next() ) { String domain = q.getParameter( "domain" ).toString(); - m_domainSelect.addOption( new Option( domain ), ps ); + String[] doms = new String[1]; + doms[0] = domain; + m_domainSelect + .addOption( new Option( domain, + (Component)GlobalizationUtil + .globalize("auth.http.value_dummy" + ,doms)) + , ps ); } } } ); @@ -73,10 +83,14 @@ public class UserManageForm extends Form { BoxPanel userSearch = new BoxPanel( BoxPanel.HORIZONTAL ); - userSearch.add( new Label( "Domain" ) ); + //userSearch.add( new Label( "Domain" ) ); + userSearch.add( new Label( GlobalizationUtil + .globalize("auth.http.user_domain")) ); userSearch.add( domainEntry ); - userSearch.add( new Label( " ", false ) ); - userSearch.add( new Label( "Username" ) ); + // userSearch.add( new Label( " ", false ) ); + // userSearch.add( new Label( "Username" ) ); + userSearch.add( new Label( GlobalizationUtil + .globalize("auth.http.user_name"), false ) ); userSearch.add( m_username ); userSearch.add( m_submit ); diff --git a/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkEditPane.java b/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkEditPane.java index 69ec66087..1e8d9ef45 100755 --- a/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkEditPane.java +++ b/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkEditPane.java @@ -252,8 +252,7 @@ public class BookmarkEditPane extends DynamicListWizard { public Component getComponent(List list, PageState state, Object value, String key, int index, boolean isSelected) { - Bookmarks app = (Bookmarks) Web.getWebContext() - .getApplication(); + Bookmarks app = (Bookmarks) Web.getWebContext().getApplication(); BookmarkCollection bColl = app.getBookmarks(); final long size = bColl.size(); bColl.close(); diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java index 80a0101a4..803ccdb0a 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java @@ -241,6 +241,7 @@ public class SectionTable extends Table { /** * Return the data element for the given column and the current row. */ + @Override public Object getElementAt(int columnIndex) { if (m_colModel == null) { diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 7eab946ba..5b691eb5f 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1080,3 +1080,8 @@ cms.ui.authoring.parameter_should_be_a_valid_filename=This parameter should be a cms.ui.authoring.parameter_may_not_contain_periods=This parameter may not contain periods cms.ui.cse.none=No soon expired items were found. cms.ui.contentcenter.task_panel_control=Experimental. Try to use it. +cms.ui.contentcenter.sectiontable.nosections=There are currently no content sections installed. +cms.ui.contentcenter.section_hint=All content items are organized in one or more contect sections. Each of them may have its own system of permissions and its own administrators, independent from each other. Select the section where you will edit a document or create a new one. +cms.ui.contentcenter.location=Location +cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. +cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 561ed7f6b..32eb09b2e 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1074,3 +1074,8 @@ cms.ui.authoring.parameter_should_be_a_valid_filename=Dieser Parameter muss eine cms.ui.authoring.parameter_may_not_contain_periods=This parameter may not contain periods cms.ui.cse.none=Es wurde keine bald abgelaufenen Dokumente gefunden. cms.ui.contentcenter.task_panel_control=Experimental. Try to use it. +cms.ui.contentcenter.sectiontable.nosections=Es sind keine Sektionen installiert. +cms.ui.contentcenter.section_hint=All documents are organized in one or more contect sections. Each content section may have its own system of permission and its own administrators, independent from each other. Select a section where you will edit a document or create a new one. +cms.ui.contentcenter.location=Ort +cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. +cms.ui.contentcenter.action_hint=Falls aktiv wird ein Formular angezeigt, um im ROOT Verzeichnis der entsprechenden Sektion ein neues Dokument anzulegen. Administratoren deaktivieren diese Option, um das ROOT Verzeichnis nicht zu \u00fcberfrachten. diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties index 3323432fb..c61c4e886 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -128,3 +128,8 @@ cms.ui.authoring.parameter_should_be_a_valid_filename=This parameter should be a cms.ui.authoring.parameter_may_not_contain_periods=This parameter may not contain periods cms.ui.cse.none= cms.ui.contentcenter.task_panel_control=Experimental. Try to use it. +cms.ui.contentcenter.sectiontable.nosections=There are currently no content sections installed. +cms.ui.contentcenter.section_hint=All content items are organized in one or more contect sections. Each of them may have its own system of permissions and its own administrators, independent from each other. Select a section where you will edit a document or create a new one. +cms.ui.contentcenter.location=Location +cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. +cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index 6665c471f..fec12116d 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -602,3 +602,8 @@ cms.ui.authoring.parameter_should_be_a_valid_filename=This parameter should be a cms.ui.authoring.parameter_may_not_contain_periods=This parameter may not contain periods cms.ui.cse.none= cms.ui.contentcenter.task_panel_control=Experimental. Try to use it. +cms.ui.contentcenter.sectiontable.nosections=Translate: There are currently no content sections installed. +cms.ui.contentcenter.section_hint=All documents are organized in one or more contect sections. Each content section may have its own system of permission and its own administrators, independent from each other. Select a section where you will edit a document or create a new one. +cms.ui.contentcenter.location=TRANSLATE: Location +cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. +cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. diff --git a/ccm-cms/src/com/arsdigita/cms/TextPage.java.noLongerInUse b/ccm-cms/src/com/arsdigita/cms/TextPage.java.noLongerInUse index c8aaa1c47..f17df7e9f 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextPage.java.noLongerInUse +++ b/ccm-cms/src/com/arsdigita/cms/TextPage.java.noLongerInUse @@ -26,6 +26,17 @@ import org.apache.log4j.Logger; import java.math.BigDecimal; +// ///////////////////////////////////////////////////////////////////////////// +// +// Refactored, excluded from class hierarchy, functionality moded to ??? +// Retained here for easy reference until all modules are adopted. +// e.g. ccm-ldn-types-concillor and other contributions by West Sussex!! +// +// ///////////////////////////////////////////////////////////////////////////// + + + + /** * This class extends a content page with an additional text attribute. * diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java index 44f60235d..5292c9759 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java @@ -19,13 +19,13 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Embedded; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormSection; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SaveCancelSection; -import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.event.FormInitListener; @@ -153,7 +153,8 @@ public class LinkPropertyForm extends FormSection "cms.contenttypes.ui.description"))); add(m_description); - add(new Label( + //add(new Label( + add(new Embedded( "