LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG/ccm-cms: Changes from todays coding session 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4684 8810af33-2d31-482b-a856-94f89814c4df
jensp 2017-04-20 14:51:37 +00:00
parent 25dc47cddc
commit 3f184ce092
6 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java
View File

@ -36,6 +36,7 @@ import org.librecms.contentsection.ContentSection;
import com.arsdigita.cms.dispatcher.CMSPage; import com.arsdigita.cms.dispatcher.CMSPage;
import com.arsdigita.cms.ui.assets.AssetPane; import com.arsdigita.cms.ui.assets.AssetPane;
import com.arsdigita.cms.ui.category.CategoryAdminPane;
//ToDo NG import com.arsdigita.cms.ui.category.CategoryAdminPane; //ToDo NG import com.arsdigita.cms.ui.category.CategoryAdminPane;
import com.arsdigita.cms.ui.cse.ContentSoonExpiredPane; import com.arsdigita.cms.ui.cse.ContentSoonExpiredPane;
import com.arsdigita.cms.ui.folder.FolderAdminPane; import com.arsdigita.cms.ui.folder.FolderAdminPane;
@ -127,7 +128,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
private RoleAdminPane m_rolePane; private RoleAdminPane m_rolePane;
private WorkflowAdminPane m_workflowPane; private WorkflowAdminPane m_workflowPane;
private LifecycleAdminPane m_lifecyclePane; private LifecycleAdminPane m_lifecyclePane;
//ToDo NG private CategoryAdminPane m_categoryPane; private CategoryAdminPane m_categoryPane;
private ContentTypeAdminPane m_typePane; private ContentTypeAdminPane m_typePane;
//private LayoutPanel m_userAdminPane; //private LayoutPanel m_userAdminPane;
private LayoutPanel m_csePane; private LayoutPanel m_csePane;
@ -155,7 +156,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
m_rolePane = getRoleAdminPane(); m_rolePane = getRoleAdminPane();
m_workflowPane = getWorkflowAdminPane(); m_workflowPane = getWorkflowAdminPane();
m_lifecyclePane = getLifecycleAdminPane(); m_lifecyclePane = getLifecycleAdminPane();
//ToDo NG m_categoryPane = getCategoryAdminPane(); m_categoryPane = getCategoryAdminPane();
m_typePane = getContentTypeAdminPane(); m_typePane = getContentTypeAdminPane();
// userAdminPane removed, used to contain just one item (reset user // userAdminPane removed, used to contain just one item (reset user
// folder) which moved to the FolderAdminPane // folder) which moved to the FolderAdminPane
@ -191,11 +192,11 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
m_workflowPane, m_workflowPane,
permissionChecker.isPermitted( permissionChecker.isPermitted(
AdminPrivileges.ADMINISTER_WORKFLOW)); AdminPrivileges.ADMINISTER_WORKFLOW));
//ToDo NG m_tabbedPane.setTabVisible(
// m_tabbedPane.setTabVisible( state,
// state, m_categoryPane, m_categoryPane,
// permissionChecker.isPermitted( permissionChecker.isPermitted(
// AdminPrivileges.ADMINISTER_CATEGORIES)); AdminPrivileges.ADMINISTER_CATEGORIES));
m_tabbedPane.setTabVisible( m_tabbedPane.setTabVisible(
state, state,
m_lifecyclePane, m_lifecyclePane,
@ -256,7 +257,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
protected ItemSearch getSearchPane() { protected ItemSearch getSearchPane() {
if (m_searchPane == null) { if (m_searchPane == null) {
m_searchPane m_searchPane
= new ItemSearch( = new ItemSearch(
ContentItemVersion.DRAFT.toString(), ContentItemVersion.DRAFT.toString(),
CMSConfig.getConfig().isLimitItemSearchToContentSection()); CMSConfig.getConfig().isLimitItemSearchToContentSection());
} }
@ -311,13 +312,13 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
* Creates, and then caches, the category administration pane. Overriding * Creates, and then caches, the category administration pane. Overriding
* this method to return null will prevent this tab from appearing. * this method to return null will prevent this tab from appearing.
*/ */
//ToDo NG protected CategoryAdminPane getCategoryAdminPane() {
// protected CategoryAdminPane getCategoryAdminPane() { if (m_categoryPane == null) {
// if (m_categoryPane == null) { m_categoryPane = new CategoryAdminPane();
// m_categoryPane = new CategoryAdminPane(); }
// } return m_categoryPane;
// return m_categoryPane; }
// }
/** /**
* Creates, and then caches, the content type administration pane. * Creates, and then caches, the content type administration pane.
* Overriding this method to return null will prevent this tab from * Overriding this method to return null will prevent this tab from
@ -360,9 +361,9 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
* Adds the specified component, with the specified tab name, to the tabbed * Adds the specified component, with the specified tab name, to the tabbed
* pane only if it is not null. * pane only if it is not null.
* *
* @param pane The pane to which to add the tab * @param pane The pane to which to add the tab
* @param tabName The name of the tab if it's added * @param tabName The name of the tab if it's added
* @param comp The component to add to the pane * @param comp The component to add to the pane
*/ */
protected void addToPane(final TabbedPane pane, protected void addToPane(final TabbedPane pane,
final String tabName, final String tabName,
@ -405,7 +406,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
tab(pane, "cms.ui.roles", getRoleAdminPane()); tab(pane, "cms.ui.roles", getRoleAdminPane());
tab(pane, "cms.ui.workflows", getWorkflowAdminPane()); tab(pane, "cms.ui.workflows", getWorkflowAdminPane());
tab(pane, "cms.ui.lifecycles", getLifecycleAdminPane()); tab(pane, "cms.ui.lifecycles", getLifecycleAdminPane());
// ToDo NG tab(pane, "cms.ui.categories", getCategoryAdminPane()); tab(pane, "cms.ui.categories", getCategoryAdminPane());
tab(pane, "cms.ui.content_types", getContentTypeAdminPane()); tab(pane, "cms.ui.content_types", getContentTypeAdminPane());
tab(pane, "cms.ui.cse", getCSEPane()); tab(pane, "cms.ui.cse", getCSEPane());
tab(pane, "cms.ui.reports", getReportPane()); tab(pane, "cms.ui.reports", getReportPane());
@ -457,8 +458,8 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
m_workflowPane.reset(state); m_workflowPane.reset(state);
} else if (pane == m_lifecyclePane) { } else if (pane == m_lifecyclePane) {
m_lifecyclePane.reset(state); m_lifecyclePane.reset(state);
//ToDo NG } else if (pane == m_categoryPane) { } else if (pane == m_categoryPane) {
// m_categoryPane.reset(state); m_categoryPane.reset(state);
} else if (pane == m_typePane) { } else if (pane == m_typePane) {
m_typePane.reset(state); m_typePane.reset(state);
// } else if (pane == m_userAdminPane) { // } else if (pane == m_userAdminPane) {
@ -472,7 +473,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
* Construct a URL for displaying the tab * Construct a URL for displaying the tab
* *
* @param item The item from which we get the corresponding content section * @param item The item from which we get the corresponding content section
* @param tab The index of the tab to display * @param tab The index of the tab to display
* *
* @return * @return
*/ */

1
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminPane.java
View File

@ -209,6 +209,7 @@ public final class CategoryAdminPane extends BaseAdminPane {
prompt.add(catLabel); prompt.add(catLabel);
} }
@Override
public final void process(final FormSectionEvent e) public final void process(final FormSectionEvent e)
throws FormProcessException { throws FormProcessException {
final PageState state = e.getPageState(); final PageState state = e.getPageState();

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryItemPane.java
View File

@ -189,7 +189,7 @@ class CategoryItemPane extends BaseItemPane {
m_detailPane.add(new LinkedCategorySection(linkAddLink)); m_detailPane.add(new LinkedCategorySection(linkAddLink));
// Templates // Templates
m_detailPane.add(new AdminVisible(new CategoryTemplateSection())); // m_detailPane.add(new AdminVisible(new CategoryTemplateSection()));
// Permissions // Permissions
//m_detailPane.add(new PermissionsSection()); //m_detailPane.add(new PermissionsSection());

1
ccm-cms/src/main/resources/org/librecms/CmsResources.properties
View File

@ -270,3 +270,4 @@ cms.ui.assets.binaryasset.description=Description
cms.ui.assets.binaryasset.filename=File name cms.ui.assets.binaryasset.filename=File name
cms.ui.assets.binaryasset.mimetype=Type cms.ui.assets.binaryasset.mimetype=Type
cms.ui.assets.binaryasset.size=Size (bytes) cms.ui.assets.binaryasset.size=Size (bytes)
cms.ui.categories=Categories

1
ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
View File

@ -269,3 +269,4 @@ cms.ui.assets.binaryasset.description=Beschreibung
cms.ui.assets.binaryasset.filename=Dateiname cms.ui.assets.binaryasset.filename=Dateiname
cms.ui.assets.binaryasset.mimetype=Typ cms.ui.assets.binaryasset.mimetype=Typ
cms.ui.assets.binaryasset.size=Gr\u00f6\u00dfe (Bytes) cms.ui.assets.binaryasset.size=Gr\u00f6\u00dfe (Bytes)
cms.ui.categories=Kategorien

1
ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
View File

@ -228,3 +228,4 @@ cms.ui.assets.binaryasset.description=Description
cms.ui.assets.binaryasset.filename=File name cms.ui.assets.binaryasset.filename=File name
cms.ui.assets.binaryasset.mimetype=Type cms.ui.assets.binaryasset.mimetype=Type
cms.ui.assets.binaryasset.size=Size (bytes) cms.ui.assets.binaryasset.size=Size (bytes)
cms.ui.categories=Categories