[gatein-commits] gatein SVN: r7634 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application.
Author: theute
Date: 2011-10-03 17:53:54 -0400 (Mon, 03 Oct 2011)
New Revision: 7634
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl
Log:
Fixing failed merge
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl 2011-10-03
21:47:01 UTC (rev 7633)
+++
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl 2011-10-03
21:53:54 UTC (rev 7634)
@@ -41,17 +41,8 @@
for (application in uicomponent.getApplications()) {
String applicationName = encoder.encode(application.getDisplayName());
String applicationDescription =
encoder.encode(application.getDescription());
- String applicationLabelFull = applicationLabel;
- if(applicationLabel.length() > 30) applicationLabel =
applicationLabel.substring(0, 27) + "...";
- applicationLabel =
encoder.encode(applicationLabel==null?"":applicationLabel);
- applicationLabelFull =
encoder.encode(applicationLabelFull==null?"":applicationLabelFull);
String srcBG = application.getIconURL();
String srcBGError =
"/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png";
-
- description = application.getDescription();
- if(description == null) displayName = "";
- description = encoder.encode(description);
-
%>
<div class="UIVTab VTabStyle3"
id="<%=application.getId();%>"
onmousedown="eXo.portal.PortalDragDrop.init.call(this, event);">
<div class="VTabContentBG">