[gatein-commits] gatein SVN: r6106 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/pom/config and 15 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Mar 22 02:41:30 EDT 2011
Author: kien_nguyen
Date: 2011-03-22 02:41:29 -0400 (Tue, 22 Mar 2011)
New Revision: 6106
Modified:
portal/trunk/
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java
portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
Log:
merge branche-GTNPORTAL-1832 to trunk
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/wsrp-extraction:5828-6031
+ /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -244,7 +244,15 @@
{
this.save();
//
- String ownerIdChunk = ownerId != null ? new MOPFormatter().encodeNodeName(null, ownerId) : "%";
+ String ownerIdChunk = "%";
+ if (ownerId != null)
+ {
+ ownerId = ownerId.trim();
+ if (!ownerId.isEmpty())
+ {
+ ownerIdChunk = new MOPFormatter().encodeNodeName(null, ownerId);
+ }
+ }
//
String ownerTypeChunk;
@@ -314,7 +322,7 @@
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
+ "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND " +
"(" +
- "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%' ESCAPE '\\')";
+ "LOWER(gtn:name) LIKE '%" + title.trim().toLowerCase() + "%' ESCAPE '\\')";
}
else
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -73,7 +73,7 @@
ObjectType<? extends Site> siteType = null;
if (ownerType != null)
{
- siteType = Mapper.parseSiteType(ownerType);
+ siteType = Mapper.parseSiteType(ownerType.trim());
}
ite = findW(session, siteType, q.getOwnerId(), q.getTitle());
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/application/ResourceRequestFilter.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -94,7 +94,8 @@
httpResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
}
-
+ response.setContentType("text/css; charset=UTF-8");
+
final OutputStream out = response.getOutputStream();
final BinaryOutput output = new BinaryOutput()
{
Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
===================================================================
--- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -27,6 +27,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.security.ConversationState;
+import org.exoplatform.services.security.web.SetCurrentIdentityFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -44,7 +45,7 @@
/**
* Logger.
*/
- private static Log log = ExoLogger.getLogger("core.security.SetCurrentIdentityFilter");
+ private static Log log = ExoLogger.getLogger(SetCurrentIdentityFilter.class);
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws ServletException
{
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -245,36 +245,24 @@
background: #dddddd;
color: #2e2e2e;
text-decoration: none;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
/* Selected menu item. */
.portlet-menu-item-selected {
background: #dddddd;
color: #058bb6;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
.portlet-menu-item-hover {
background: #dddddd;
color: #058bb6;
text-decoration: none;
- margin-bottom: 1px;
- line-height: 22px;
- padding: 0px 5px;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
background: #dddddd;
color: #058bb6;
- line-height: 22px;
- margin-bottom: 1px;
- padding: 0px 5px;
}
/* Normal, unselected menu item that has sub-menus. */
@@ -282,9 +270,6 @@
background: #e9e8ed;
color: #636363;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
/* Selected sub-menu item that has sub-menus */
@@ -292,36 +277,24 @@
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.porlet-menu-cascade {
background: #e9e8ed;
color: #636363;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-cascade-item-hover {
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-cascade-item-hover-selected {
background: #e9e8ed;
color: #252525;
text-decoration: none;
- line-height: 22px;
- padding: 0px 20px;
- border-bottom: 1px solid #dddddd;
}
.portlet-menu-separator {
@@ -333,64 +306,40 @@
background: #f6f6f6;
color: #717171;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-selected {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-hover {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-content-hover-selected {
background: #f6f6f6;
color: #272727;
text-decoration: none;
- line-height: 22px;
- padding: 0px 30px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator {
color: #8b8b8b;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-selected {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-hover {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-indicator-hover-selected {
color: #606060;
- line-height: 22px;
- padding: 0px 40px;
- border-bottom: 1px solid #e9e8ed;
}
.portlet-menu-description {}
Modified: portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-22 06:41:29 UTC (rev 6106)
@@ -110,8 +110,8 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
"home" : {
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -130,7 +130,7 @@
UIFormStringInput input = (UIFormStringInput)quickSearchInput.getChild(0);
UIFormSelectBox select = (UIFormSelectBox)quickSearchInput.getChild(1);
String name = input.getValue();
- if (name != null && !name.equals(""))
+ if (name != null && !(name = name.trim()).equals(""))
{
if (name.indexOf("*") < 0)
{
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -33,26 +33,26 @@
<div class="UIAdminToolbarPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer" >
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="EditorIcon TBIcon" href="#">$editorLabel</a>
</div>
- <div class="MenuItemContainer" style="display:none;">
+ <div class="MenuItemContainer portlet-menu-cascade" style="display:none;">
<div class="SubBlock">
<% if(userCouldEditNavigation){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a>
</div>
<% } %>
<% if(userCouldEditPage){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
</div>
<% } %>
<% if(userCouldEditPortal){ %>
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
</div>
<% } %>
@@ -61,4 +61,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,20 +13,20 @@
<div class="UIStarToolBarPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab" style="width: 62px">
+ <div class="UITab portlet-menu-item" style="width: 62px">
<div class=""></div>
- <div class="MenuItemContainer" style="display:none;">
- <div class="MenuItem" onclick="$changeLanguageAction">
+ <div class="MenuItemContainer portlet-menu-cascade" style="display:none;">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="$changeLanguageAction">
<a href="#" class="ChangeLanguageIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeLanguage")%></a>
</div>
- <div class="MenuItem" onclick="$changeSkinAction">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="$changeSkinAction">
<a href="#" class="ChangeSkinIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeSkin")%></a>
</div>
- <div class="MenuItem" onclick="eXo.portal.logout();">
+ <div class="MenuItem portlet-menu-cascade-item" onclick="eXo.portal.logout();">
<a href="#" class="SignOutIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.Logout")%></a>
</div>
</div>
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -20,7 +20,7 @@
String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar") ;
navTitle = navTitle.replace("{0}", OrganizationUtils.getGroupLabel(navigation.ownerId));
print """
- <div class="TitleBar"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
+ <div class="TitleBar portlet-menu-description"><div style="width: 99%" title="$navigation.ownerId">$navTitle</div></div>
<div class="SubBlock">
""" ;
for(int i = 0; i < nodes.size(); i++) {
@@ -35,7 +35,7 @@
PageNode selectedNode = uicomponent.getSelectedPageNode();
String tabStyleNavigation = "";
if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
- tabStyleNavigation = "SelectedItem";
+ tabStyleNavigation = "SelectedItem portlet-menu-item-selected";
}
boolean hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
@@ -52,7 +52,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
- <div class="MenuItem $tabStyleNavigation">
+ <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item">
<div class="$clazz">
""";
if(node.pageReference != null) {
@@ -65,7 +65,7 @@
""" ;
if(hasChild) {
print """
- <div class="MenuItemContainer" style="position: absolute; display:none">
+ <div class="MenuItemContainer portlet-menu-cascade-separator" style="position: absolute; display:none">
<div class="SubBlock">
""" ;
for(int j = 0; j < node.getChildren().size(); j++) {
@@ -85,12 +85,12 @@
<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="GroupIcon TBIcon" href="<%= portalURI + "groupnavigation" %>"><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a>
</div>
<% if (!groupNavigations.isEmpty()) { %>
- <div style="display:none" class="MenuItemContainer">
+ <div style="display:none" class="MenuItemContainer portlet-menu-cascade">
<% for(navigation in groupNavigations) {
renderGroupPageNavigation(navigation);
} %>
@@ -99,4 +99,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -16,7 +16,7 @@
void renderPortalNavigations() {
print """
- <div style="position: absolute; display:none" class="MenuItemContainer">
+ <div style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade">
<div class="SubBlock">
""";
boolean isCurrent = false;
@@ -38,7 +38,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
portal = entityEncoder.encode(portal);
print """
- <div class="MenuItem">
+ <div class="MenuItem portlet-menu-cascade-item">
<div $clazz>
<a href="$href" class="ItemIcon SiteIcon">$portal</a>
</div>
@@ -60,7 +60,7 @@
navigation = uicomponent.getCurrentPortalNavigation();
nodes = navigation.getNodes();
print """
- <div style="position: absolute; display:none" class="MenuItemContainer">
+ <div style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade">
<div class="SubBlock">
""";
for(int i = 0; i < nodes.size(); i++) {
@@ -76,7 +76,7 @@
PageNode selectedNode = uicomponent.getSelectedPageNode();
String tabStyleNavigation = "";
if(selectedNode != null && node.getUri() == selectedNode.getUri()) {
- tabStyleNavigation = "SelectedItem";
+ tabStyleNavigation = "SelectedItem portlet-menu-cascade-item-selected";
}
boolean hasChild = (node.getChildren() != null && node.getChildren().size() > 0);
@@ -93,7 +93,7 @@
EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
- <div class="MenuItem $tabStyleNavigation">
+ <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item">
<div class="$clazz">
""";
if(node.pageReference != null) {
@@ -106,7 +106,7 @@
""" ;
if(hasChild) {
print """
- <div class="MenuItemContainer" style="position: absolute; display:none">
+ <div class="MenuItemContainer portlet-menu-indicator" style="position: absolute; display:none">
<div class="SubBlock">
""" ;
for(int j = 0; j < node.getChildren().size(); j++) {
@@ -127,7 +127,7 @@
<div class="UIUserToolBarSitePortlet" id="$uicomponent.id" >
<div class="UIHorizontalTabs">
<div class="TabsContainer">
- <div class="UITab NormalToolbarTab">
+ <div class="UITab NormalToolbarTab portlet-menu-item">
<div class="">
<a class="SitesIcon TBIcon" href="<%= portalURI + "portalnavigation" %>">
<%=_ctx.appRes("UIUserToolBarSitePortlet.header.site")%>
@@ -137,4 +137,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIFormTableIteratorInputSet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,11 +13,11 @@
String [] columns = uicomponent.getColumns();
for(col in columns){
%>
- <th><%=_ctx.appRes(name + ".header."+col)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header."+col)%></th>
<%}%>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<%
String rowClass = null;
boolean even = true;
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -24,7 +24,7 @@
<div class="Refresh16x16Icon ControlIcon" title="<%=_ctx.appRes("UIGadgetInfo.title.refresh")%>" onclick="<%= uicomponent.event("Refresh") %>"><span></span></div>
<div class="ClearBoth"><span></span></div>
</div>
- <div class="Application">
+ <div class="Application ClearFix">
<div class="PortletIcons">
<img src="$gadgetThumbnail" onError="src='$srcBGError'" alt=""/>
</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -484,9 +484,15 @@
/******************************** UIGadgetManagement ******************************/
.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons {
width: 150px;
- padding-top: 20px; text-align: center;
+ padding: 10px 0px;
+ text-align: center;
+ height: auto;
}
+.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons img {
+ width: 150px;
+}
+
.UIApplicationRegistryPortlet .UIGadgetManagement .ApplicationContent {
margin-left: 150px; /* orientation=lt */
margin-right: 150px; /* orientation=rt */
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2011-03-22 06:41:29 UTC (rev 6106)
@@ -812,7 +812,7 @@
*/
gadgets.Container = function() {
this.gadgets_ = {};
- this.parentUrl_ = 'http://' + document.location.host;
+ this.parentUrl_ = document.location.href + '://' + document.location.host;
this.country_ = 'ALL';
this.language_ = 'ALL';
this.view_ = 'default';
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-03-22 06:41:29 UTC (rev 6106)
@@ -238,14 +238,10 @@
color: #242424;
text-decoration: none;
background: #F5F9FA;
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
}
/* Selected menu item. */
.portlet-menu-item-selected {
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
color: #058ee6;
}
@@ -253,110 +249,77 @@
.portlet-menu-item-hover {
color: #058ee6;
text-decoration: none;
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
- padding: 5px 10px;
- border-bottom: 1px solid #cee0e4;
background: #F5F9FA;
color: #058ee6;
}
/* Normal, unselected menu item that has sub-menus. */
.portlet-menu-cascade-item {
- line-height: 18px;
color: #585858;
}
/* Selected sub-menu item that has sub-menus */
.portlet-menu-cascade-item-selected {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.porlet-menu-cascade {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
}
.portlet-menu-cascade-item-hover {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.portlet-menu-cascade-item-hover-selected {
- border-bottom: 1px solid #d8e7ea;
- padding: 5px 20px;
color: #058ee6;
}
.portlet-menu-separator {
- line-height: 18px;
}
.portlet-menu-cascade-separator {
- line-height: 18px;
}
.portlet-menu-content {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #878787;
}
.portlet-menu-content-selected {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-content-hover {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-content-hover-selected {
- border-bottom: 1px solid #e4eff2;
- padding: 5px 30px;
color: #058ee6;
}
.portlet-menu-indicator {
- padding: 5px 40px;
color: #bebebe;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-selected {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-indicator-hover-selected {
- padding: 5px 40px;
color: #058ee6;
- border-bottom: 1px solid #f4f8f9;
}
.portlet-menu-description {
- line-height: 18px;
}
.portlet-menu-caption {
- line-height: 18px;
}
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -24,27 +24,27 @@
<% if (name != null)
{ for (field in beanFields)
{ %>
- <th><%=_ctx.appRes(name + ".header." + field)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header." + field)%></th>
<% }
if (beanActions != null)
{ %>
- <th><%=_ctx.appRes(name + ".header.action")%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header.action")%></th>
<% }
}
if (name == null)
{
for (field in beanFields)
{ %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
<% }
if (beanActions != null && beanActions.length > 0)
{ %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
<% }
} %>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<% if (uicomponent.getUIPageIterator().getAvailable() < 1)
{ %>
<tr>
@@ -60,7 +60,7 @@
for (bean in uicomponent.getBeans())
{
if (even) rowClass = "EvenRow";
- else rowClass = "OddRow";
+ else rowClass = "OddRow portlet-table-alternate";
even = !even;
%>
<tr class="$rowClass">
@@ -127,4 +127,4 @@
_ctx.renderUIComponent(uicomponent.getUIPageIterator());
}
%>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -13,12 +13,12 @@
<%
if(fieldName != null && fieldName.length() > 0 && !fieldName.equals(uicomponent.getId()) && !fieldName.equals(field.getName())) {
%>
- <td class="FieldLabel">
+ <td class="FieldLabel portlet-form-label">
<%=uicomponent.getLabel(field.getName()) %>
</td>
- <td class="FieldComponent"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field"><% uiform.renderField(field) %></td>
<%} else {%>
- <td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field" colspan="2"><% uiform.renderField(field) %></td>
<%}%>
</tr>
<%
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormTableInputSet.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -8,11 +8,11 @@
String [] columns = uicomponent.getColumns();
for(col in columns){
%>
- <th><%=_ctx.appRes(name + ".header."+col)%></th>
+ <th class="portlet-table-header"><%=_ctx.appRes(name + ".header."+col)%></th>
<%}%>
</tr>
</thead>
- <tbody>
+ <tbody class="portlet-table-body">
<%
String rowClass = null;
boolean even = true;
@@ -32,4 +32,4 @@
<%}%>
</tbody>
</table>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormUploadInput.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -28,8 +28,8 @@
</div>
<div class="SelectFileFrame" style="display: none;">
<div class="FileName">
- <div class="FileNameLabel"><span></span></div>
+ <div class="FileNameLabel portlet-form-label"><span></span></div>
</div>
<div class="RemoveFile" title="Remove Uploaded" onclick="eXo.webui.UIUpload.deleteUpload($uploadId);"></div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -15,15 +15,15 @@
<tr>
<%fieldName = uicomponent.getLabel(field.getName());%>
<%if(field instanceof UIFormInputBase && !fieldName.equals(uicomponent.getId())) { %>
- <td class="FieldLabel">
+ <td class="FieldLabel portlet-form-label">
<%if(fieldName != null && fieldName.length() > 0) {%>
<%=uicomponent.getLabel(field.getName()) %>
<%}%>
</td>
<% if(field instanceof UIFormInputBase && field.isEditable()) { %>
- <td class="FieldComponent"><% uiform.renderField(field) %></td>
+ <td class="FieldComponent portlet-input-field"><% uiform.renderField(field) %></td>
<% }else { %>
- <td class="NonEditableField"><% uiform.renderField(field) %></td>
+ <td class="NonEditableField portlet-input-field"><% uiform.renderField(field) %></td>
<% } %>
<%} else {%>
<td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td>
@@ -73,4 +73,4 @@
this.onsubmit = function(){ return false; }
}
}
-</script>
\ No newline at end of file
+</script>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-03-22 06:41:29 UTC (rev 6106)
@@ -30,9 +30,9 @@
String label = _ctx.appRes(formName + ".label." + inputEntry.getId());
if(!label.equals(inputEntry.getId())) {
%>
- <td class="FieldLabel"><%=label%></td>
+ <td class="FieldLabel portlet-form-label"><%=label%></td>
<%}%>
- <td class="FieldComponent">
+ <td class="FieldComponent portlet-input-field">
<%
if(inputEntry instanceof UIFormRadioBoxInput) {
println "<div class=\"MultiRadioInput\">";
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-21 22:17:27 UTC (rev 6105)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-22 06:41:29 UTC (rev 6106)
@@ -260,7 +260,7 @@
{
OrganizationService service = getApplicationComponent(OrganizationService.class);
Query q = new Query();
- if (keyword != null && keyword.trim().length() != 0)
+ if (keyword != null && (keyword = keyword.trim()).length() != 0)
{
if (keyword.indexOf("*") < 0)
{
@@ -292,7 +292,7 @@
// remove if user doesn't exist in selected group
MembershipHandler memberShipHandler = service.getMembershipHandler();
- if (groupId != null && groupId.trim().length() != 0)
+ if (groupId != null && (groupId = groupId.trim()).length() != 0)
{
for (Object user : results)
{
More information about the gatein-commits
mailing list