From c82117ef63e78707c3a40739dc48e098fa427540 Mon Sep 17 00:00:00 2001 From: quasi Date: Thu, 5 Jul 2012 08:24:32 +0000 Subject: [PATCH] ImageStepEdit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reihenfolge für das Formular geändert. Die Auswahl der bereits vorhandenen Bilder kommt nun zuerst. Dort ist der Link zum Upload. Die Upload-Seite hat nun keinen Link mehr auf die Auswahl-Seite, um Schleifen zu vermeiden. git-svn-id: https://svn.libreccm.org/ccm/trunk@1752 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/contentassets/ui/ImageStepEdit.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java index 81bf83006..91563f0f8 100755 --- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java +++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ui/ImageStepEdit.java @@ -113,7 +113,7 @@ public class ImageStepEdit extends SimpleContainer Object key = i.next(); Component component = (Component) componentsMap.get( key ); - p.setVisibleDefault( component, UPLOAD.equals( key ) ); + p.setVisibleDefault( component, LIBRARY.equals( key ) ); } p.addComponentStateParam( this, m_imageComponentKey ); @@ -276,6 +276,10 @@ public class ImageStepEdit extends SimpleContainer m_saveCancel = new SaveCancelSection(); add(m_saveCancel); + /* Removed by Quasimodo: Changed editing workflow, so that library comes first + * Also, library mode has now a link to upload images whixh will link to this + * form. Consequently, this link will create a loop, which isn't fatal but + * confusing ActionLink library = new ActionLink( "Select an existing image" ); library.addActionListener( new ActionListener() { public void actionPerformed( ActionEvent ev ) { @@ -283,6 +287,7 @@ public class ImageStepEdit extends SimpleContainer } } ); add( library, ColumnPanel.FULL_WIDTH ); + */ } public SaveCancelSection getSaveCancelSection() {