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

Image-Tab 

Event-handling verbessert. Die Links zu den Unterseiten funktioneren nun und werden richtig initialisiert und zurückgesetzt.

Upload-Formula funktioniert noch nicht.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1911 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2012-11-06 13:06:30 +00:00
parent 755c7ab48a
commit 1c151d775c
5 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/src/com/arsdigita/cms/CMSResources.properties
View File

@ -1111,3 +1111,4 @@ cms.ui.search.create.select_edit=Select item and edit
cms.ui.clear=Clear
cms.ui.item_search.create.folder_missing=No folder selected
cms.ui.images_links=

1
ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
View File

@ -1104,3 +1104,4 @@ cms.ui.clear=Zur\u00fccksetzen
cms.ui.type.minimum_number_of_values_bigger_than_maximum_number_of_values=Maximaler Wert kleiner als minimaler Wert
cms.ui.type.minimummaximum_number_of_values_cannot_be_negative=Keine negativen Werte erlaubt
cms.ui.item_search.create.folder_missing=kein Ordner ausgew\u00e4hlt
cms.ui.images_links=

1
ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
View File

@ -50,3 +50,4 @@ cms.ui.search.create.select_edit=
cms.ui.clear=
cms.ui.item_search.create.folder_missing=
cms.ui.images_links=

1
ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
View File

@ -581,3 +581,4 @@ cms.ui.search.create.select_edit=
cms.ui.clear=
cms.ui.item_search.create.folder_missing=
cms.ui.images_links=

94
ccm-cms/src/com/arsdigita/cms/ui/ImagesPane.java
View File

@ -5,6 +5,7 @@
package com.arsdigita.cms.ui;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.FormModel;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.List;
import com.arsdigita.bebop.ListPanel;
@ -16,16 +17,17 @@ import com.arsdigita.bebop.Resettable;
import com.arsdigita.bebop.SegmentedPanel;
import com.arsdigita.bebop.SegmentedPanel.Segment;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.event.ChangeEvent;
import com.arsdigita.bebop.event.ChangeListener;
import com.arsdigita.bebop.list.ListModel;
import com.arsdigita.bebop.list.ListModelBuilder;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.toolbox.ui.ActionGroup;
import com.arsdigita.toolbox.ui.LayoutPanel;
import com.arsdigita.toolbox.ui.Section;
import com.arsdigita.util.Assert;
import com.arsdigita.util.LockableImpl;
import java.util.ArrayList;
import java.util.HashMap;
@ -47,14 +49,15 @@ public class ImagesPane extends LayoutPanel implements Resettable {
private ListPanel m_listPanel;
final private SegmentedPanel m_body;
private HashMap<String, Segment> m_bodySegments = new HashMap();
private final SingleSelectionModel m_model;
private final ResettableParameterSingleSelectionModel m_model;
private final List m_links;
private final LinksSection m_modes;
public ImagesPane() {
super();
m_model = new ParameterSingleSelectionModel(new StringParameter(List.SELECTED));
m_model = new ResettableParameterSingleSelectionModel(new StringParameter(List.SELECTED));
m_model.setDefaultSelection(ImageComponent.LIBRARY);
m_model.addChangeListener(new ImageAdminSelectionListener());
m_links = new List(new ImageAdminListModelBuilder());
@ -63,8 +66,8 @@ public class ImagesPane extends LayoutPanel implements Resettable {
final SimpleContainer left = new SimpleContainer();
setLeft(left);
final LinksSection staff = new LinksSection();
left.add(staff);
m_modes = new LinksSection();
left.add(m_modes);
m_body = new SegmentedPanel();
setBody(m_body);
@ -81,7 +84,7 @@ public class ImagesPane extends LayoutPanel implements Resettable {
final ImageLibraryComponent library = new ImageLibraryComponent(ImageComponent.ADMIN_IMAGES);
library.getForm().addInitListener(m_adminListener);
library.getForm().addProcessListener(m_adminListener);
library.addUploadLink(m_adminListener);
// library.addUploadLink(m_adminListener);
selectors.put(ImageComponent.LIBRARY, library);
m_bodySegments.put(ImageComponent.LIBRARY, m_body.addSegment(
new Label(GlobalizationUtil.globalize("cms.ui.image_library")),
@ -107,24 +110,9 @@ public class ImagesPane extends LayoutPanel implements Resettable {
while (keys.hasNext()) {
String key = keys.next();
page.setVisibleDefault(m_bodySegments.get(key), ImageComponent.LIBRARY.equals(key));
// for (int index = 0; index < m_bodySegments.get(key).size(); index++) {
// Component component = m_bodySegments.get(key).get(index);
// page.setVisibleDefault(component, ImageComponent.LIBRARY.equals(key));
// }
page.setVisibleDefault(m_bodySegments.get(key), m_model.getDefaultSelection().equals(key));
}
// final Map componentsMap = m_imageComponent.getComponentsMap();
//
// final Iterator keyIter = componentsMap.keySet().iterator();
// while (keyIter.hasNext()) {
// final Object key = keyIter.next();
// final Component component = (Component) componentsMap.get(key);
//
// page.setVisibleDefault(component, ImageComponent.LIBRARY.equals(key));
// }
//
page.addComponentStateParam(this, m_imageComponentKey);
}
@ -137,39 +125,61 @@ public class ImagesPane extends LayoutPanel implements Resettable {
public final void reset(final PageState state) {
super.reset(state);
m_model.reset(state);
this.setActiveImageComponent(state, m_model.getDefaultSelection());
}
public final void setActiveImageComponent(PageState state, String activeComp) {
Iterator<String> keys = m_bodySegments.keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
state.setVisible(m_bodySegments.get(key), ImageComponent.LIBRARY.equals(key));
final boolean visibility = key.equals(activeComp);
state.setVisible(m_bodySegments.get(key), visibility);
for (int index = 0; index < m_bodySegments.get(key).size(); index++) {
Component component = m_bodySegments.get(key).get(index);
// state.setVisible(component, ImageComponent.LIBRARY.equals(key));
// Reset all components if they are of type Resettable
// Reset all components if they are of type Resettable
if (component instanceof Resettable) {
((Resettable) component).reset(state);
}
// Set visibility
component.setVisible(state, visibility);
}
}
}
private class ResettableParameterSingleSelectionModel extends ParameterSingleSelectionModel
implements Resettable {
// final Map componentsMap = m_imageComponent.getComponentsMap();
// m_imageComponent.setSelectedKey(state, ImageComponent.LIBRARY);
// final Iterator keyIter = componentsMap.keySet().iterator();
// while (keyIter.hasNext()) {
// final Object key = keyIter.next();
// final Component component = (Component) componentsMap.get(key);
//
// state.setVisible(component, ImageComponent.LIBRARY.equals(key));
//
// // Reset all components if they are of type Resettable
// if (component instanceof Resettable) {
// ((Resettable) component).reset(state);
// }
// }
private String defaultKey;
public ResettableParameterSingleSelectionModel(ParameterModel m) {
super(m);
}
public void setDefaultSelection(String selKey) {
this.defaultKey = selKey;
}
public String getDefaultSelection() {
return defaultKey;
}
public void reset(PageState state) {
if (Assert.isEnabled()) {
final FormModel model = state.getPage().getStateModel();
Assert.isTrue(model.containsFormParam(getStateParameter()));
}
state.setValue(getStateParameter(), this.defaultKey);
}
}
private class ImageAdminListModel implements ListModel {
@ -212,13 +222,13 @@ public class ImagesPane extends LayoutPanel implements Resettable {
final PageState state = e.getPageState();
// getBody().reset(state);
// ImagesPane.this.reset(state);
if (m_model.isSelected(state)) {
S_LOG.debug("The selection model is selected; displaying "
+ "the item pane");
// getBody().push(state, getItemPane());
ImagesPane.this.setActiveImageComponent(state, state.getControlEventValue());
}
}
}