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

SearchWidget 

Die Suchmaske ist nun in der linken Spalte und für alle Varianten gleich

git-svn-id: https://svn.libreccm.org/ccm/trunk@2124 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2013-04-15 12:08:16 +00:00
parent a176171d1d
commit 67d3015b19
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,6 @@ import com.arsdigita.cms.ui.workflow.WorkflowAdminPane;
import com.arsdigita.cms.util.SecurityConstants; import com.arsdigita.cms.util.SecurityConstants;
import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.User; import com.arsdigita.kernel.User;
import com.arsdigita.toolbox.ui.LayoutPanel;
import com.arsdigita.ui.DebugPanel; import com.arsdigita.ui.DebugPanel;
import com.arsdigita.util.Assert; import com.arsdigita.util.Assert;
import com.arsdigita.web.Web; import com.arsdigita.web.Web;
@ -132,7 +131,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
private FolderAdminPane m_folderPane; private FolderAdminPane m_folderPane;
private BrowsePane m_browsePane; private BrowsePane m_browsePane;
private LayoutPanel m_searchPane; private ItemSearch m_searchPane;
private ImagesPane m_imagesPane; private ImagesPane m_imagesPane;
private RoleAdminPane m_rolePane; private RoleAdminPane m_rolePane;
private WorkflowAdminPane m_workflowPane; private WorkflowAdminPane m_workflowPane;
@ -240,11 +239,9 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
* Creates, and then caches, the search pane. Overriding this * Creates, and then caches, the search pane. Overriding this
* method to return null will prevent this tab from appearing. * method to return null will prevent this tab from appearing.
*/ */
protected LayoutPanel getSearchPane() { protected ItemSearch getSearchPane() {
if (m_searchPane == null) { if (m_searchPane == null) {
m_searchPane = new LayoutPanel(); m_searchPane = new ItemSearch(ContentItem.DRAFT, CMS.getConfig().limitToContentSection());
m_searchPane.setLeft(new SimpleComponent());
m_searchPane.setBody(new ItemSearch(ContentItem.DRAFT, CMS.getConfig().limitToContentSection()));
} }
return m_searchPane; return m_searchPane;
} }
@ -254,8 +251,8 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
m_imagesPane = new ImagesPane(); m_imagesPane = new ImagesPane();
} }
return m_imagesPane; return m_imagesPane;
} }
protected RoleAdminPane getRoleAdminPane() { protected RoleAdminPane getRoleAdminPane() {
if (m_rolePane == null) { if (m_rolePane == null) {
m_rolePane = new RoleAdminPane(); m_rolePane = new RoleAdminPane();

15
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSection.java
View File

@ -35,6 +35,7 @@ import com.arsdigita.cms.ui.search.ItemQueryComponent;
import com.arsdigita.search.ui.ResultsPane; import com.arsdigita.search.ui.ResultsPane;
import com.arsdigita.search.ui.QueryGenerator; import com.arsdigita.search.ui.QueryGenerator;
import com.arsdigita.search.QuerySpecification; import com.arsdigita.search.QuerySpecification;
import com.arsdigita.toolbox.ui.LayoutPanel;
/** /**
* Contains a form for specifying search parameters, as well as a * Contains a form for specifying search parameters, as well as a
@ -98,8 +99,14 @@ public class ItemSearchSection extends FormSection
} }
m_results = createResultsPane(m_query); m_results = createResultsPane(m_query);
addQueryGenerator(this);
addResultsPane(this); LayoutPanel searchPanel = new LayoutPanel();
searchPanel.setLeft(m_query);
searchPanel.setBody(m_results);
this.add(searchPanel);
// addQueryGenerator(this);
// addResultsPane(this);
addFormListener(); addFormListener();
setClassAttr("itemSearch"); setClassAttr("itemSearch");
@ -121,7 +128,7 @@ public class ItemSearchSection extends FormSection
boolean limitToContentSection) { boolean limitToContentSection) {
return new ItemQueryComponent(context, limitToContentSection); return new ItemQueryComponent(context, limitToContentSection);
} }
protected ItemQueryComponent createQueryGenerator(String context, protected ItemQueryComponent createQueryGenerator(String context,
boolean limitToContentSection, boolean limitToContentSection,
ContentType type) { ContentType type) {
@ -156,7 +163,7 @@ public class ItemSearchSection extends FormSection
p.setVisibleDefault(m_results, false); p.setVisibleDefault(m_results, false);
p.addGlobalStateParam(new BigDecimalParameter(SINGLE_TYPE_PARAM)); p.addGlobalStateParam(new BigDecimalParameter(SINGLE_TYPE_PARAM));
} }
/** /**
* Displays the "keywords" and "content types" widgets * Displays the "keywords" and "content types" widgets
*/ */