You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2007/12/18 20:16:24 UTC
svn commit: r605302 -
/portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Author: smilek
Date: Tue Dec 18 11:16:23 2007
New Revision: 605302
URL: http://svn.apache.org/viewvc?rev=605302&view=rev
Log:
changed return page code when used from /desktop to return to page mode (edit or view) which was active when add-portlet was initiated
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm?rev=605302&r1=605301&r2=605302&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm Tue Dec 18 11:16:23 2007
@@ -228,11 +228,16 @@
var a2 = document.createElement("a");
a2.innerHTML = "[$messages.getString("goback")]"; // TODO: localize
// TODO: determine if JETSPEED or DESKTOP
- a2.href = getReturnURL();
+ var retHref = null;
+ if ( jetspeed.url.isDesktop() && jetspeed.page )
+ retHref = "javascript: jetspeed.page.addPortletTerminate( '" + getReturnURL() + "', '" + getReturnPagePath() + "' )";
+ else
+ retHref = getReturnURL();
+ a2.href = retHref;
a2.setAttribute("style", "font-weight:normal");
c2.appendChild(a2);
var prevButton = document.getElementById("previousButton");
- prevButton.setAttribute('href', getReturnURL());
+ prevButton.setAttribute('href', retHref);
}
function displayGridPortlet()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org