diff --git a/component/web/resources/src/test/resources/Stylesheet.css b/component/web/resources/src/test/resources/Stylesheet.css index 8ef5bbfdd..c0b410ec9 100644 --- a/component/web/resources/src/test/resources/Stylesheet.css +++ b/component/web/resources/src/test/resources/Stylesheet.css @@ -6358,6 +6358,13 @@ background: url('/eXoResources/skin/DefaultSkin/webui/component/UIPageIterator/b font-size: 11px; } +.UISearch .UISearchForm .QuickSet label { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: -9px 5px 0; + color: #333; +} + .UISearch .UISearchForm .QuickSet input { float: left; /* orientation=lt */ margin: 0px 5px 0px 10px; /* orientation=lt */ @@ -6374,6 +6381,13 @@ background: url('/eXoResources/skin/DefaultSkin/webui/component/UIPageIterator/b width: 120px; } +.UIFormTabPane .UISearch .UISearchForm .QuickSet label { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: -9px 5px 0; + color: #333; +} + .UIFormTabPane .UISearch .UISearchForm .QuickSet input { float: left; margin: 3px 5px 0px 0px; diff --git a/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css b/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css index a1016c9f2..8b492836f 100644 --- a/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css +++ b/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css @@ -57,6 +57,10 @@ height: 20px; } +.UISearch .UISearchForm .QuickSet label { + color: #333; +} + .UISearch .UISearchForm .QuickSet input { border: 1px solid #cccccc; } @@ -71,6 +75,13 @@ width: 120px; } +.UIFormTabPane .UISearch .UISearchForm .QuickSet label { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: -9px 5px 0; + color: #333; +} + .UIFormTabPane .UISearch .UISearchForm .QuickSet input { float: left; margin: 3px 5px 0px 0px; diff --git a/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java b/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java index ae0c29774..be22d2abb 100644 --- a/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java +++ b/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java @@ -57,6 +57,7 @@ import org.exoplatform.webui.form.UIFormInputSet; import org.exoplatform.webui.form.UIFormSelectBox; import org.exoplatform.webui.form.UIFormStringInput; +import org.exoplatform.webui.form.UISearchForm; import org.gatein.web.security.impersonation.ImpersonatedIdentity; import org.gatein.web.security.impersonation.ImpersonationUtils; @@ -120,6 +121,7 @@ public UIListUsers() throws Exception { if(showDisableUserFilterCheckbox) { UIFormSelectBox selectBox = new UIFormSelectBox("UIListUsers-" + USER_STATUS_FILTER, null, USER_STATUS_OPTIONS); selectBox.setValue(UserStatus.ENABLED.name()); + selectBox.setLabel("status"); selectBox.setId("UIListUsers-" + USER_STATUS_FILTER); inputSet.addChild(selectBox); } diff --git a/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties b/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties index f5b922cd7..030034aec 100644 --- a/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties +++ b/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties @@ -94,6 +94,7 @@ UIListUsers.msg.insufficient-permission-to-impersonate-user=Insufficient permiss UIListUsers.msg.already-impersonated=You are already impersonating another user. Please exit the present impersonation to be able to impersonate somebody else. UIListUsers.action.title.disableUser=Disable user UIListUsers.action.title.enableUser=Enable user +UISearchForm.label.status=Status: UIListMembershipType.deleteMemberShip=Are you sure you want to delete this membership? diff --git a/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_fr.properties b/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_fr.properties index 3b1149fc0..ee982bd60 100644 --- a/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_fr.properties +++ b/portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_fr.properties @@ -82,6 +82,7 @@ UIListUsers.msg.DeleteSuperUser={0} est un utilisateur syst\u00e8me, suppression UIListUsers.deleteUser=Confirmez-vous la suppression de cet utilisateur : {0} ? UIListUsers.action.title.disableUser=Désactiver l’utilisateur UIListUsers.action.title.enableUser=Activer l’utilisateur +UISearchForm.label.status=Statut: UIListMembershipType.deleteMemberShip=Confirmez-vous la suppression de ce r\u00f4le ? diff --git a/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css b/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css index e9995c724..50663ff83 100644 --- a/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css +++ b/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css @@ -102,6 +102,13 @@ margin-right: 5px; } +.UISearch .UISearchForm .QuickSet label { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: -9px 5px 0; + color: #333; +} + .UISearch .UISearchForm .QuickSet input { float: left; /* orientation=lt */ float: right; /* orientation=rt */ @@ -135,6 +142,13 @@ width: 120px; } +.UIFormTabPane .UISearch .UISearchForm .QuickSet label { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: -9px 5px 0; + color: #333; +} + .UIFormTabPane .UISearch .UISearchForm .QuickSet input { float: left; margin: 3px 5px 0px 0px; diff --git a/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl b/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl index 62b82bf48..c230d267e 100644 --- a/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl +++ b/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl @@ -26,7 +26,13 @@ <% QuickSearchInputSet = uiform.getQuickSearchInputSet(); for(field in QuickSearchInputSet.getChildren()) { - uiform.renderField(field) + def label = uiform.getLabel(field); + if(label != null && label != "") { + %> + + <% + } + uiform.renderField(field) } %> "> diff --git a/webui/core/src/main/java/org/exoplatform/webui/form/UISearchForm.java b/webui/core/src/main/java/org/exoplatform/webui/form/UISearchForm.java index 6353ab904..c7de20eaf 100644 --- a/webui/core/src/main/java/org/exoplatform/webui/form/UISearchForm.java +++ b/webui/core/src/main/java/org/exoplatform/webui/form/UISearchForm.java @@ -70,6 +70,19 @@ public void setOptions(List> options) { uiSelect.setOptions(options); } + public String getLabel(UIFormInput input) { + String label = input.getLabel(); + if(label == null) { + return null; + } else { + try { + return getLabel(label); + } catch (Exception ex) { + return label; + } + } + } + public UIFormInputSet getQuickSearchInputSet() { return (UIFormInputSet) getChild(0); }