Update of /cvsroot/roller/roller/src/org/roller/presentation
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28378/src/org/roller/presentation
Modified Files:
MainPageAction.java
Log Message:
Add support for roles to Roller's menu tag.
Added Roller's tabbed menu to the main page.
Index: MainPageAction.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/MainPageAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MainPageAction.java 9 Feb 2004 02:40:03 -0000 1.9
--- MainPageAction.java 27 Feb 2004 05:01:37 -0000 1.10
***************
*** 1,87 ****
! package org.roller.presentation;
!
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
! import org.apache.struts.action.Action;
! import org.apache.struts.action.ActionForm;
! import org.apache.struts.action.ActionForward;
! import org.apache.struts.action.ActionMapping;
! import org.roller.RollerException;
! import org.roller.model.Roller;
!
! import java.util.List;
!
! import javax.servlet.http.HttpServletRequest;
! import javax.servlet.http.HttpServletResponse;
!
!
! /**
! * Main page action for Roller.
! * @struts.action name="main" path="/main" scope="request"
! */
! public class MainPageAction extends Action
! {
! private static Log mLogger =
! LogFactory.getFactory().getInstance(MainPageAction.class);
!
! /**
! * Loads model and forwards to main.page.
! */
! public ActionForward execute(
! ActionMapping mapping, ActionForm form,
! HttpServletRequest req, HttpServletResponse res)
! throws Exception
! {
! RollerContext rctx = RollerContext.getRollerContext(req);
!
! req.setAttribute("version",rctx.getRollerVersion());
! req.setAttribute("buildTime",rctx.getRollerBuildTime());
! req.setAttribute("baseURL", rctx.getContextUrl(req));
! req.setAttribute("data",new Data(req));
!
! boolean allowNewUsers =
rctx.getRollerConfig().getNewUserAllowed().booleanValue();
! java.security.Principal prince = req.getUserPrincipal();
! if (prince != null)
! {
! req.setAttribute("loggedIn",Boolean.TRUE);
! req.setAttribute("userName",prince.getName());
! }
! else if (allowNewUsers)
! {
! req.setAttribute("allowNewUsers",Boolean.TRUE);
! }
!
! return mapping.findForward("main.page");
! }
!
! /**
! * Kludge that allows page to retrieve data from within OSCache tags.
! */
! public class Data
! {
! private HttpServletRequest mRequest = null;
!
! public Data(HttpServletRequest req)
! {
! mRequest = req;
! }
!
! /** Get list of most popular websites in terms of day hits */
! public List getPopularWebsites() throws RollerException
! {
! Roller roller=
RollerRequest.getRollerRequest(mRequest).getRoller();
!
! return roller.getRefererManager().getDaysPopularWebsites(15);
! }
!
! /** Get list of recent weblog entries */
! public List getRecentWeblogEntries() throws RollerException
! {
! Roller roller =
RollerRequest.getRollerRequest(mRequest).getRoller();
!
! return roller.getWeblogManager().getAllRecentWeblogEntries(
! new java.util.Date(), 15, mRequest.getParameter("cat") );
! }
! }
! }
!
--- 1,88 ----
! package org.roller.presentation;
!
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
! import org.apache.struts.action.Action;
! import org.apache.struts.action.ActionForm;
! import org.apache.struts.action.ActionForward;
! import org.apache.struts.action.ActionMapping;
! import org.roller.RollerException;
! import org.roller.model.Roller;
!
! import java.util.List;
!
! import javax.servlet.http.HttpServletRequest;
! import javax.servlet.http.HttpServletResponse;
!
!
! /**
! * Main page action for Roller.
! * @struts.action name="main" path="/main" scope="request"
! */
! public class MainPageAction extends Action
! {
! private static Log mLogger =
! LogFactory.getFactory().getInstance(MainPageAction.class);
!
! /**
! * Loads model and forwards to main.page.
! */
! public ActionForward execute(
! ActionMapping mapping, ActionForm form,
! HttpServletRequest req, HttpServletResponse res)
! throws Exception
! {
! RollerContext rctx = RollerContext.getRollerContext(req);
!
! req.setAttribute("version",rctx.getRollerVersion());
! req.setAttribute("buildTime",rctx.getRollerBuildTime());
! req.setAttribute("baseURL", rctx.getContextUrl(req));
! req.setAttribute("data",new Data(req));
!
! boolean allowNewUsers =
rctx.getRollerConfig().getNewUserAllowed().booleanValue();
! java.security.Principal prince = req.getUserPrincipal();
! if (prince != null)
! {
! req.setAttribute("loggedIn",Boolean.TRUE);
! req.setAttribute("userName",prince.getName());
! }
! else if (allowNewUsers)
! {
! req.setAttribute("allowNewUsers",Boolean.TRUE);
! }
! req.setAttribute("leftPage","/theme/status.jsp");
!
! return mapping.findForward("main.page");
! }
!
! /**
! * Kludge that allows page to retrieve data from within OSCache tags.
! */
! public class Data
! {
! private HttpServletRequest mRequest = null;
!
! public Data(HttpServletRequest req)
! {
! mRequest = req;
! }
!
! /** Get list of most popular websites in terms of day hits */
! public List getPopularWebsites() throws RollerException
! {
! Roller roller=
RollerRequest.getRollerRequest(mRequest).getRoller();
!
! return roller.getRefererManager().getDaysPopularWebsites(15);
! }
!
! /** Get list of recent weblog entries */
! public List getRecentWeblogEntries() throws RollerException
! {
! Roller roller =
RollerRequest.getRollerRequest(mRequest).getRoller();
!
! return roller.getWeblogManager().getAllRecentWeblogEntries(
! new java.util.Date(), 15, mRequest.getParameter("cat") );
! }
! }
! }
!
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
|
