- Incorporated new sidebar which contains the shelf and navigator (tree) components

- Changed version number to 2.0.0 (dev)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-12-06 23:26:27 +00:00
parent 8f17798cde
commit 98c5a2071c
46 changed files with 3649 additions and 158 deletions

View File

@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.AuthenticationHelper;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.repository.User;
import org.alfresco.web.config.LanguagesConfigElement;
@@ -336,8 +337,16 @@ public class LoginBean
}
else
{
// special case to handle jump to My Alfresco page initially
// setup the current location with the NavigationBean
String location = this.preferences.getStartLocation();
NavigationBean navBean = (NavigationBean)FacesHelper.getManagedBean(
fc, "NavigationBean");
if (navBean != null)
{
navBean.setToolbarLocation(location);
}
// special case to handle jump to My Alfresco page initially
if (NavigationBean.LOCATION_MYALFRESCO.equals(location))
{
return "myalfresco";