From d52e92e141243168a5d8b6b65ca7f7213ed71729 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 26 Sep 2014 12:00:10 +0200
Subject: [PATCH] OO-1216: refactor the submit in standard FormLink
---
.../olat/repository/ui/author/AuthorSearchController.java | 8 +++++---
.../ui/list/RepositoryEntrySearchController.java | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
index 541da77b919..947986bfb90 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
+import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
import org.olat.core.gui.components.form.flexible.elements.TextElement;
@@ -33,8 +34,8 @@ import org.olat.core.gui.components.form.flexible.impl.Form;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
-import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit;
import org.olat.core.gui.components.form.flexible.impl.elements.table.ExtendedFlexiTableSearchController;
+import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
@@ -61,7 +62,7 @@ public class AuthorSearchController extends FormBasicController implements Exten
private TextElement description;
private SingleSelection types;
private MultipleSelectionElement ownedResourcesOnlyEl;
- private FormSubmit searchButton;
+ private FormLink searchButton;
private String[] typeKeys;
private String[] limitTypes;
@@ -118,7 +119,8 @@ public class AuthorSearchController extends FormBasicController implements Exten
FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("button_layout", getTranslator());
formLayout.add(buttonLayout);
- searchButton = uifactory.addFormSubmitButton("search", buttonLayout);
+ searchButton = uifactory.addFormLink("search", buttonLayout, Link.BUTTON);
+ searchButton.setCustomEnabledLinkCSS("btn btn-primary");
if(cancelAllowed) {
uifactory.addFormCancelButton("quick.search", buttonLayout, ureq, getWindowControl());
}
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
index 2409aef017c..3a9540f41cc 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntrySearchController.java
@@ -25,14 +25,15 @@ import java.util.List;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
+import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.Form;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
-import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit;
import org.olat.core.gui.components.form.flexible.impl.elements.table.ExtendedFlexiTableSearchController;
+import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
@@ -50,7 +51,7 @@ public class RepositoryEntrySearchController extends FormBasicController impleme
private TextElement id; // only for admins
private TextElement text;
private TextElement author;
- private FormSubmit searchButton;
+ private FormLink searchButton;
private MultipleSelectionElement membershipMandatoryEl;
private boolean cancelAllowed;
@@ -95,8 +96,9 @@ public class RepositoryEntrySearchController extends FormBasicController impleme
FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("button_layout", getTranslator());
formLayout.add(buttonLayout);
- searchButton = uifactory.addFormSubmitButton("search", buttonLayout);
+ searchButton = uifactory.addFormLink("search", buttonLayout, Link.BUTTON);
searchButton.setElementCssClass("o_sel_repo_search_button");
+ searchButton.setCustomEnabledLinkCSS("btn btn-primary");
if(cancelAllowed) {
uifactory.addFormCancelButton("quick.search", buttonLayout, ureq, getWindowControl());
}
--
GitLab