Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java =================================================================== --- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (revision 34941) +++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (working copy) @@ -1670,6 +1670,7 @@ m.put("isPage", Boolean.valueOf(true)); m.put("current", Boolean.valueOf(current)); m.put("ispopup", Boolean.valueOf(p.isPopUp())); + m.put("ispopupwithbrowsertoolbar", Boolean.valueOf(p.isPopUpWithBrowserToolbar())); m.put("pagePopupUrl", pagePopupUrl); m.put("pageTitle", Web.escapeHtml(p.getTitle())); m.put("jsPageTitle", Web.escapeJavascript(p.getTitle())); Index: portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm =================================================================== --- portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm (revision 34941) +++ portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm (working copy) @@ -394,6 +394,7 @@ ## m.put("isPage",Boolean.valueOf(true)); ## m.put("current", Boolean.valueOf(current)); ## m.put("ispopup", Boolean.valueOf(p.isPopUp())); +## m.put("ispopupwithbrowsertoolbar", Boolean.valueOf(p.isPopUpWithBrowserToolbar())); ## m.put("pagePopupUrl", pagePopupUrl); ## m.put("pageTitle", Web.escapeHtml(p.getTitle())); ## m.put("jsPageTitle", Web.escapeJavascript(p.getTitle())); @@ -433,7 +434,11 @@ #else #if (${page.ispopup})
  • - + #if (${page.ispopupwithbrowsertoolbar}) + + #else + + #end ${page.pageTitle}