LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formatierungen etc. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2301 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-08-08 18:32:23 +00:00
parent 183d95a836
commit dc69fcc9ae
5 changed files with 28 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-subsite/src/com/arsdigita/subsite/SubsiteAppManager.java
View File

@ -18,11 +18,7 @@
*/
package com.arsdigita.subsite;
import com.arsdigita.bebop.BoxPanel;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Link;
import com.arsdigita.subsite.ui.AppManagerPanel;
import com.arsdigita.ui.admin.GlobalizationUtil;
import com.arsdigita.ui.admin.applications.AbstractSingletonApplicationManager;
import com.arsdigita.ui.admin.applications.ApplicationInstanceAwareContainer;
@ -41,15 +37,7 @@ public class SubsiteAppManager extends AbstractSingletonApplicationManager<Subsi
@Override
public ApplicationInstanceAwareContainer getApplicationAdminForm() {
final ApplicationInstanceAwareContainer container = new ApplicationInstanceAwareContainer();
// final BoxPanel panel = new BoxPanel(BoxPanel.VERTICAL);
// final Label warnLabel = new Label(GlobalizationUtil.globalize("ui.admin.applications.form_not_compatible_now"));
// warnLabel.setClassAttr("warning");
// panel.add(warnLabel);
// panel.add(new Link("Subsite Admin", "/admin/subsite"));
//
// container.add(panel);
final AppManagerPanel panel = new AppManagerPanel();
container.add(panel);

16
ccm-subsite/src/com/arsdigita/subsite/ui/AppManagerPanel.java
View File

@ -18,11 +18,9 @@
*/
package com.arsdigita.subsite.ui;
import com.arsdigita.bebop.BoxPanel;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.subsite.Subsite;
/**
*
@ -34,20 +32,8 @@ public class AppManagerPanel extends SimpleContainer {
private final SiteSelectionModel selectionModel = new SiteSelectionModel(new BigDecimalParameter("site"));
public AppManagerPanel() {
// super(Subsite.SUBSITE_XML_PREFIX + "controlCenter",
// Subsite.SUBSITE_XML_NS);
// final BoxPanel panel = new BoxPanel(BoxPanel.VERTICAL);
// final Label warnLabel = new Label(GlobalizationUtil.globalize("ui.admin.applications.form_not_compatible_now"));
// warnLabel.setClassAttr("warning");
// add(warnLabel);
// panel.add(warnLabel);
// panel.add(new Link("", "/ccm/admin/subsite"));
//add(new SiteListing(selectionModel));
add(new SiteTable(selectionModel));
add(new SiteForm("site", selectionModel));
// add(panel);
add(new SiteForm("site", selectionModel));
}
@Override

50
ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java
View File

@ -20,50 +20,46 @@ package com.arsdigita.subsite.ui;
import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.SaveCancelSection;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.bebop.event.PrintListener;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.event.FormValidationListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SaveCancelSection;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.event.FormValidationListener;
import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.PrintListener;
import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.categorization.Category;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.categorization.ui.CategoryPicker;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.subsite.Site;
import com.arsdigita.subsite.Subsite;
import com.arsdigita.ui.UI;
import com.arsdigita.util.StringUtils;
import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.Classes;
import com.arsdigita.util.StringUtils;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationCollection;
import java.math.BigDecimal;
import java.util.TooManyListenersException;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Iterator;
import java.util.TooManyListenersException;
import org.apache.log4j.Logger;
/**

7
ccm-subsite/src/com/arsdigita/subsite/ui/SiteTable.java
View File

@ -22,7 +22,6 @@ import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.ControlLink;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.ParameterSingleSelectionModel;
import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.event.TableActionEvent;
import com.arsdigita.bebop.event.TableActionListener;
@ -48,12 +47,12 @@ import com.arsdigita.util.LockableImpl;
public class SiteTable extends Table implements TableActionListener {
private static final String TABLE_COL_EDIT = "table_col_edit";
private static final String TABLE_COL_DEL = "table_col_del";
//private final ParameterSingleSelectionModel siteSelect;
private static final String TABLE_COL_DEL = "table_col_del";
private final SiteSelectionModel siteSelect;
public SiteTable(final SiteSelectionModel siteSelect) {
super();
this.siteSelect = siteSelect;
setEmptyView(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.no_subsites")));

4
ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java
View File

@ -1,7 +1,3 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package com.arsdigita.subsite.ui;
import com.arsdigita.globalization.GlobalizedMessage;