diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/StaticFlexiCellRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/StaticFlexiCellRenderer.java
index 5e9359a00429dc5b0f2553b343bf9652a457e2cc..93801e732c88f2a30c30725f3b0ec2f021ab1864 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/StaticFlexiCellRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/StaticFlexiCellRenderer.java
@@ -81,13 +81,13 @@ public class StaticFlexiCellRenderer implements FlexiCellRenderer {
if(labelDelegate == null) {
target.append(getLabel());
} else {
- labelDelegate.render(null, target, cellValue, row, source, ubu, translator);
+ labelDelegate.render(renderer, target, cellValue, row, source, ubu, translator);
}
target.append("</a>");
} else if(labelDelegate == null) {
target.append(getLabel());
} else {
- labelDelegate.render(null, target, cellValue, row, source, ubu, translator);
+ labelDelegate.render(renderer, target, cellValue, row, source, ubu, translator);
}
}
diff --git a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
index 0e540a1286fd6613c65fb7f17505c07ce0f33b0f..115c2f63d5484c2dd4233191dc9ce7d98ad9cf38 100644
--- a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
+++ b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
@@ -80,7 +80,7 @@ public class CourseBusinessGroupListController extends AbstractBusinessGroupList
private SelectBusinessGroupController selectController;
public CourseBusinessGroupListController(UserRequest ureq, WindowControl wControl, RepositoryEntry re) {
- super(ureq, wControl, "group_list", false, re);
+ super(ureq, wControl, "group_list", false, false, re);
this.re = re;
}
diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
index c619845073574ba7e02ed1222b91c24062e754b4..1ab9d88a5fb0bd5e06fda6d00a122159dab07f40 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java
@@ -152,6 +152,7 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
private final boolean admin;
private final boolean showAdminTools;
+ private final boolean startExtendedSearch;
@Autowired
protected MarkManager markManager;
@Autowired
@@ -173,11 +174,11 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
private Object userObject;
public AbstractBusinessGroupListController(UserRequest ureq, WindowControl wControl, String page) {
- this(ureq, wControl, page, false, null);
+ this(ureq, wControl, page, false, false, null);
}
public AbstractBusinessGroupListController(UserRequest ureq, WindowControl wControl, String page,
- boolean showAdminTools, Object userObject) {
+ boolean showAdminTools, boolean startExtendedSearch, Object userObject) {
super(ureq, wControl, page);
setTranslator(Util.createPackageTranslator(AbstractBusinessGroupListController.class, ureq.getLocale(), getTranslator()));
@@ -185,6 +186,7 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
admin = roles.isOLATAdmin() || roles.isGroupManager();
this.showAdminTools = showAdminTools && admin;
this.userObject = userObject;
+ this.startExtendedSearch = startExtendedSearch;
initForm(ureq);
}
@@ -206,6 +208,9 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
tableEl.setSearchEnabled(true);
tableEl.setExtendedSearch(searchCtrl);
+ if(startExtendedSearch) {
+ tableEl.expandExtendedSearch(ureq);
+ }
initButtons(formLayout, ureq);
}
diff --git a/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java
index 13f4873e02c49a74fd71b19a1662aef9006f8a9f..dd9c02504508d3ff4e1e07d4a04cfd678fd20884 100644
--- a/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java
+++ b/src/main/java/org/olat/group/ui/main/SearchBusinessGroupListController.java
@@ -32,7 +32,7 @@ import org.olat.group.model.SearchBusinessGroupParams;
public class SearchBusinessGroupListController extends AbstractBusinessGroupListController {
public SearchBusinessGroupListController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl, "group_list", true, null);
+ super(ureq, wControl, "group_list", true, true, null);
}
@Override
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
index f726b0a8e29144c4663a0c4edf8cf648cd334bc2..f70e05eb99581c996bbb9d3ea6809af2c88fdc7f 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
@@ -48,7 +48,7 @@ open.intro=In dieser Liste finden Sie alle ver\u00F6ffentlichten Gruppen denen S
open.nogroup=Es wurden keine Gruppe gefunden die Ihren Kriterien entsprechen.
opengroups.all=Alle Gruppen
opengroups.search=Suche
-opengroups.search.admin=Admin. Suche
+opengroups.search.admin=Gruppenverwaltung
marked.groups=Favoriten
owned.groups=Betreuer
owned.groups.2=Betreute
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
index 764bae652e7cf0fd5d0d620a606b9f8ac2599cee..2682c91a0a54dc34bdaa5dda2aed78a4cfa165e2 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
@@ -84,7 +84,7 @@ open.intro=In this list you will find all published groups you can participate i
open.nogroup=There are no groups matching your criteria.
opengroups.all=All groups
opengroups.search=Search
-opengroups.search.admin=Admin. search
+opengroups.search.admin=Group management
owned.groups=Coach
owned.groups.2=Coached
pending.reservations=<h4>Accept group and course memberships</h4>You have been invited to the following groups and courses. For each listed groups and courses select the button "$\:accept" or "$\:reject" and finally save your choice with the button "$org.olat.core\:ok". You can safely skip this question now using the button "$org.olat.core\:cancel" and answer them on your next login.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
index a71c4b247524af773c3026aa35e3ccb10a8715e4..6fc00afb14ff38f041ec65efd7f57972fdeb825b 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
@@ -83,7 +83,7 @@ open.intro=Dans cette liste, vous trouverez tous les groupes qui ont \u00E9t\u00
open.nogroup=Aucun groupe correspondant \u00E0 vos crit\u00E8res n'a \u00E9t\u00E9 trouv\u00E9.
opengroups.all=Tous les groupes
opengroups.search=Recherche
-opengroups.search.admin=Recherche admin.
+opengroups.search.admin=Gestion des groupes
owned.groups=Coach
owned.groups.2=Supervis\u00E9
pending.reservations=<h4>Confirmer la participation \u00E0 des groupes et des classes</ h4>Vous avez \u00E9t\u00E9 invit\u00E9 dans les groupes ou classes suivants. Pour tous les cours et groupes r\u00E9pertori\u00E9s, vous pouvez choisir "$\: accept" ou "$\:reject" puis terminer par "$org.olat.core\:ok". Vous pouvez \u00E9galement effectuer votre choix \u00E0 une date ult\u00E9rieure, auquel cas s\u00E9lectionnez "$org.olat.core\:cancel".
diff --git a/src/main/java/org/olat/social/shareLink/_content/shareLink.html b/src/main/java/org/olat/social/shareLink/_content/shareLink.html
index 657804b0d1cca0b98a92330f7403c11e38bb967e..ba8a091e99e1c63e78440b02d886b8f30c8f914a 100644
--- a/src/main/java/org/olat/social/shareLink/_content/shareLink.html
+++ b/src/main/java/org/olat/social/shareLink/_content/shareLink.html
@@ -14,7 +14,7 @@
return document.title;
}
function o_shareCallout() {
- return '<p><span>$r.translate("share.link")</span>:<br/><input id="callout_share_link_in" type="text" name="cl_share_link" value="' + o_shareSocialUrl() + '" size="64" /></p>';
+ return '<p><input id="callout_share_link_in" type="text" name="cl_share_link" value="' + o_shareSocialUrl() + '" size="64" /></p>';
}
/* ]]> */
</script>
@@ -47,7 +47,7 @@
<i class="o_icon o_icon_mailto o_icon-lg"></i>
</a>
#elseif ($link == "link")
- <a id="o_link" href="javascript:;">
+ <a id="o_link" href="javascript:;" title="$r.translateInAttribute("share.link")">
<i class="o_icon o_icon_link o_icon-lg"></i>
</a>
<a id="o_qrcode" href="javascript:;">
@@ -57,8 +57,6 @@
/* <![CDATA[ */
jQuery(function() {
o_shareLinkPopup('o_link', o_shareCallout);
- });
- jQuery(function() {
o_QRCodePopup('o_qrcode', o_shareSocialUrl);
});
/* ]]> */
diff --git a/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_de.properties
index 0a3bddf4bcc80213de7dd2240512daa8f9980cfd..432344cef7b702e71146fb6137476597be4e6901 100644
--- a/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_de.properties
@@ -4,4 +4,5 @@ share.google=Link auf google bookmarken
share.delicious=Link auf delicous bookmarken
share.digg=Link auf digg teilen
share.mail=Link per Mail versenden
-share.link=Link kopieren
\ No newline at end of file
+share.link=Link kopieren
+share.qrcode=QR-Code kopieren
\ No newline at end of file
diff --git a/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_en.properties
index 08f087aecf7c374b1b6d6be234d4e279db41463a..2538a1fcc77386526cf5d33cabbd95703a1ea955 100644
--- a/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/social/shareLink/_i18n/LocalStrings_en.properties
@@ -4,4 +4,5 @@ share.google=Bookmark link on google
share.delicious=Bookmark link on delicous
share.digg=Share link on digg
share.mail=Share link with mail
-share.link=Copy link
\ No newline at end of file
+share.link=Copy link
+share.qrcode=Copy QR code
\ No newline at end of file