diff --git portal-impl/impl/src/bundle/sitenav.properties portal-impl/impl/src/bundle/sitenav.properties index dba4e03..a2f82b7 100644 --- portal-impl/impl/src/bundle/sitenav.properties +++ portal-impl/impl/src/bundle/sitenav.properties @@ -60,6 +60,8 @@ moresite_other = OTHER timeout_dialog_warning_message = Your session will timeout in {0} minutes. timeout_dialog_keepalive = Keep Me Alive +sit_softly_deleted = This site is marked for deletion and will be purged as per the schedule set by your System Administrator + join_title = Joinable Site join_instr = You are not currently a member of the site: join_question = Would you like to join the site? diff --git portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java index c1132b6..3230079 100644 --- portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java +++ portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java @@ -694,6 +694,9 @@ public class PortalSiteHelperImpl implements PortalSiteHelper && loggedIn)); theMap.put("pageNavPresenceUrl", presenceUrl); + //add softly deleted status + theMap.put("softlyDeleted", site.isSoftlyDeleted()); + return theMap; } diff --git portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageNav.vm portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageNav.vm index 0770b5f..765de26 100644 --- portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageNav.vm +++ portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includePageNav.vm @@ -3,7 +3,9 @@