You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/08/15 16:52:58 UTC
svn commit: r232817 [1/2] - in /incubator/roller/branches/roller_2.0:
metadata/xdoclet/ src/org/roller/presentation/bookmarks/actions/
src/org/roller/presentation/tags/menu/
src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/websit...
Author: snoopdave
Date: Mon Aug 15 07:51:59 2005
New Revision: 232817
URL: http://svn.apache.org/viewcvs?rev=232817&view=rev
Log:
More tweaks to 2.0 pages, look and feel
Removed:
incubator/roller/branches/roller_2.0/web/error403.jsp
incubator/roller/branches/roller_2.0/web/error404.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp
Modified:
incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml
incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
incubator/roller/branches/roller_2.0/web/error.jsp
incubator/roller/branches/roller_2.0/web/local-banner.jspf
incubator/roller/branches/roller_2.0/web/login.jsp
incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
incubator/roller/branches/roller_2.0/web/main.jsp
incubator/roller/branches/roller_2.0/web/planet.jsp
incubator/roller/branches/roller_2.0/web/theme/images/menutab-sel.png
incubator/roller/branches/roller_2.0/web/theme/images/menutab-unsel.png
incubator/roller/branches/roller_2.0/web/theme/images/two-sidebarfade.png
incubator/roller/branches/roller_2.0/web/theme/images/two-togglegrey.png
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/menu.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/theme/status.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp
incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp
incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/referers.jsp
incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp
incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp
incubator/roller/branches/roller_2.0/web/website/upload-file.jsp
Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml Mon Aug 15 07:51:59 2005
@@ -6,12 +6,12 @@
<error-page>
<error-code>403</error-code>
- <location>/error403.jsp</location>
+ <location>/error.jsp</location>
</error-page>
<error-page>
<error-code>404</error-code>
- <location>/error404.jsp</location>
+ <location>/error.jsp</location>
</error-page>
<error-page>
Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml Mon Aug 15 07:51:59 2005
@@ -1,59 +1,64 @@
<global-forwards>
<forward name="access-denied" path=".denied"/>
<forward name="error" path=".error"/>
-<forward name="login-redirect" path="login-redirect.jsp"/>
-<forward name="logout-redirect" path="logout-redirect.jsp"/>
+<forward name="login-redirect" path="/login-redirect.jsp"/>
+<forward name="logout-redirect" path="/logout-redirect.jsp"/>
<!-- unprotected actions -->
<forward name="page" path="/page"/>
<forward name="main" path="/main.do"/>
<forward name="home.page" path="/main.do"/>
+<forward name="planet" path="/planet.do"/>
<forward name="createUser" path="/user.do?method=createUser"/>
<forward name="registerUser" path="/user.do?method=registerUser"/>
-<!-- editor and admin role actions -->
-<forward name="bookmarks" path="/editor/bookmarks.do?method=selectFolder"/>
-<forward name="comment" path="/editor/comment.do?method=edit" />
-<forward name="comments.delete" path="/editor/comment.do?method=delete"/>
-<forward name="categories" path="/editor/categories.do?method=selectCategory"/>
-<forward name="exportEntries" path="/editor/exportEntries.do?method=edit"/>
-<forward name="exportEntries.done" path="/editor/exportEntries.do?method=unspecified"/>
-<forward name="importBookmarks" path="/editor/importBookmarks.do"/>
-<forward name="importEntries" path="/editor/importEntries.do?method=edit"/>
-<forward name="inviteMember" path="/editor/inviteMember.do" />
-<forward name="memberPermissions" path="/editor/memberPermissions.do" />
-<forward name="maintenance" path="/editor/maintenance.do" />
+<!-- landing page actions -->
+
+<forward name="yourProfile" path="/editor/yourProfile.do?method=edit" />
+<forward name="yourWebsites" path="/editor/yourWebsites.do?method=edit" />
<forward name="createWebsite" path="/editor/createWebsite.do?method=create" />
-<forward name="editPages" path="/editor/page.do?method=editPages"/>
+
+<!-- editor/author actions -->
+
+<forward name="weblogEdit" path="/editor/weblog.do?method=edit&rmik=tabbedmenu.weblog.newEntry"/>
+<forward name="weblogCreate" path="/editor/weblog.do?method=create&rmik=tabbedmenu.weblog.newEntry"/>
+<forward name="weblogQuery" path="/editor/weblogQuery.do?method=query&rmik=tabbedmenu.weblog.archives"/>
+<forward name="categories" path="/editor/categories.do?method=selectCategory&rmik=tabbedmenu.weblog.categories"/>
+<forward name="bookmarks" path="/editor/bookmarks.do?method=selectFolder&rmik=tabbedmenu.bookmarks.allFolders"/>
+<forward name="importBookmarks" path="/editor/importBookmarks.do"/>
+<forward name="uploadFiles" path="/editor/uploadFiles.do?rmik=tabbedmenu.website.files"/>
+<forward name="referers" path="/editor/referers.do?rmik=tabbedmenu.weblog.referers"/>
+
+
+<!-- manage weblog actions -->
+
+<forward name="editWebsite" path="/editor/website.do?method=edit&rmik=tabbedmenu.website.settings"/>
+<forward name="editTheme" path="/editor/themeEditor.do?method=edit&rmik=tabbedmenu.website.themes"/>
+<forward name="editPages" path="/editor/page.do?method=editPages&rmik=tabbedmenu.website.pages"/>
<forward name="editPage" path="/editor/page.do?method=edit"/>
<forward name="removePage" path="/editor/page.do?method=remove"/>
<forward name="removePage.ok" path="/editor/page.do?method=removeOk"/>
-<forward name="referers" path="/editor/referers.do"/>
-<forward name="pingSetup" path="/editor/pingSetup.do" />
-<forward name="customPingTargets" path="/editor/customPingTargets.do" />
-<forward name="editTheme" path="/editor/themeEditor.do?method=edit"/>
+<forward name="memberPermissions" path="/editor/memberPermissions.do?rmik=tabbedmenu.website.members" />
+<forward name="inviteMember" path="/editor/inviteMember.do" />
+<forward name="pingSetup" path="/editor/pingSetup.do?rmik=tabbedmenu.weblog.pingSetup" />
+<forward name="customPingTargets" path="/editor/customPingTargets.do?rmik=tabbedmenu.weblog.customPingTargets" />
+
<forward name="trackback" path="/editor/trackback.do?method=send"/>
<forward name="toggleLinkback" path="/editor/toggleLinkback.do"/>
-<forward name="uploadFiles" path="/editor/uploadFiles.do"/>
-<forward name="weblogEdit" path="/editor/weblog.do?method=edit"/>
-<forward name="weblogCreate" path="/editor/weblog.do?method=create"/>
-<forward name="flushCache" path="/editor/weblog.do?method=flushCache"/>
-<forward name="weblogQuery" path="/editor/weblogQuery.do?method=query"/>
-<forward name="editWebsite" path="/editor/website.do?method=edit"/>
-<forward name="yourProfile" path="/editor/yourProfile.do?method=edit" />
-<forward name="yourWebsites" path="/editor/yourWebsites.do?method=edit" />
-<!-- admin role only actions -->
+<!-- global admin actions -->
+
+<forward name="rollerConfig" path="/admin/rollerConfig.do?method=edit&rmik=tabbedmenu.admin.config"/>
+<forward name="adminUser" path="/admin/user.do?method=edit&rmik=tabbedmenu.admin.userAdmin"/>
<forward name="addUser" path="/admin/user.do?method=add"/>
-<forward name="adminUser" path="/admin/user.do?method=edit"/>
-<forward name="rollerConfig" path="/admin/rollerConfig.do?method=edit"/>
-<forward name="commonPingTargets" path="/admin/commonPingTargets.do"/>
-
-<forward name="planet" path="/planet.do"/>
-<forward name="planetConfig" path="/admin/planetConfig.do?method=getConfig"/>
-<forward name="planetSubscriptions" path="/admin/planetSubscriptions.do?method=getSubscriptions"/>
-<forward name="planetGroups" path="/admin/planetGroups.do?method=getGroups"/>
-<forward name="planetGroupSubscriptions" path="/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions"/>
+<forward name="commonPingTargets" path="/admin/commonPingTargets.do?rmik=tabbedmenu.admin.pingTargets"/>
+
+<!-- planet admin actions -->
+
+<forward name="planetConfig" path="/admin/planetConfig.do?method=getConfig&rmik=tabbedmenu.admin.planetConfig"/>
+<forward name="planetSubscriptions" path="/admin/planetSubscriptions.do?method=getSubscriptions&rmik=tabbedmenu.admin.planetSubscriptions"/>
+<forward name="planetGroups" path="/admin/planetGroups.do?method=getGroups&rmik=tabbedmenu.admin.planetGroups"/>
+<forward name="planetGroupSubscriptions" path="/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions&rmik=tabbedmenu.admin.planetSubscriptions"/>
</global-forwards>
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Mon Aug 15 07:51:59 2005
@@ -28,6 +28,7 @@
import org.roller.pojos.BookmarkData;
import org.roller.pojos.FolderData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.bookmarks.formbeans.BookmarksForm;
@@ -64,7 +65,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor())
{
- addModelObjects(request, (BookmarksForm)actionForm);
+ addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
return mapping.findForward("BookmarksForm");
}
else
@@ -117,7 +118,7 @@
}
roller.commit();
- addModelObjects(request, (BookmarksForm)actionForm);
+ addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
return mapping.findForward("BookmarksForm");
}
else
@@ -192,7 +193,7 @@
}
roller.commit();
- addModelObjects(request, (BookmarksForm)actionForm);
+ addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
saveMessages(request, messages);
}
catch (RollerException e)
@@ -214,7 +215,9 @@
* @param request
* @throws RollerException
*/
- private void addModelObjects(HttpServletRequest request, BookmarksForm form)
+ private void addModelObjects(
+ HttpServletRequest request, HttpServletResponse response,
+ ActionMapping mapping, BookmarksForm form)
throws RollerException
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
@@ -225,6 +228,9 @@
TreeSet allFolders = new TreeSet(new FolderPathComparator());
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
// Find folderid wherever it may be
String folderId = (String)request.getAttribute(RollerRequest.FOLDERID_KEY);
if (null == folderId)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java Mon Aug 15 07:51:59 2005
@@ -118,10 +118,10 @@
{
menuKey = (String)req.getAttribute(RollerMenuModel.MENU_KEY);
}
- if (null == menuKey)
- {
- menuKey = (String)ses.getAttribute(mMenuId+"_"+RollerMenuModel.MENU_KEY);
- }
+ //if (null == menuKey)
+ //{
+ //menuKey = (String)ses.getAttribute(mMenuId+"_"+RollerMenuModel.MENU_KEY);
+ //}
if (menuKey != null && menuKey.equals(mName))
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java Mon Aug 15 07:51:59 2005
@@ -25,8 +25,10 @@
import org.roller.model.PingTargetManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.PingTargetData;
-import org.roller.presentation.RollerRequest;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.forms.PingTargetForm;
+import org.roller.presentation.RollerRequest;
+
/**
* Base class for both common and custom ping target operations. The methods here apply to
@@ -82,6 +84,8 @@
RollerRequest rreq = RollerRequest.getRollerRequest(req);
try
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
if (!hasRequiredRights(rreq))
{
return mapping.findForward(ACCESS_DENIED_PAGE);
@@ -117,6 +121,8 @@
PingTargetForm pingTargetForm = (PingTargetForm) form;
try
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
if (!hasRequiredRights(rreq))
{
return mapping.findForward(ACCESS_DENIED_PAGE);
@@ -169,6 +175,8 @@
HttpServletRequest req, HttpServletResponse res)
throws Exception
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
return mapping.findForward(PING_TARGET_EDIT_PAGE);
}
@@ -190,6 +198,8 @@
RollerRequest rreq = RollerRequest.getRollerRequest(req);
try
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
if (!hasRequiredRights(rreq))
{
return mapping.findForward(ACCESS_DENIED_PAGE);
@@ -223,6 +233,8 @@
RollerRequest rreq = RollerRequest.getRollerRequest(req);
try
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
if (!hasRequiredRights(rreq))
{
return mapping.findForward(ACCESS_DENIED_PAGE);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java Mon Aug 15 07:51:59 2005
@@ -26,6 +26,7 @@
import org.roller.model.WeblogManager;
import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.weblog.formbeans.CategoriesForm;
@@ -64,7 +65,7 @@
rreq.getRequest());
if (rollerSession.isUserAuthorizedToAuthor())
{
- addModelObjects(request, (CategoriesForm)actionForm);
+ addModelObjects(request, response, mapping, (CategoriesForm)actionForm);
return mapping.findForward("CategoriesForm");
}
else
@@ -132,7 +133,7 @@
RollerFactory.getRoller().commit();
- addModelObjects(request, (CategoriesForm)actionForm);
+ addModelObjects(request, response, mapping, (CategoriesForm)actionForm);
saveMessages(request, messages);
}
catch (RollerException e)
@@ -154,7 +155,9 @@
* @param request
* @throws RollerException
*/
- private void addModelObjects(HttpServletRequest request, CategoriesForm form)
+ private void addModelObjects(
+ HttpServletRequest request, HttpServletResponse response,
+ ActionMapping mapping, CategoriesForm form)
throws RollerException
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
@@ -162,6 +165,9 @@
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
TreeSet allCategories = new TreeSet(new CategoryPathComparator());
+
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
// Find catid wherever it may be
String catId = (String)request.getAttribute(RollerRequest.WEBLOGCATEGORYID_KEY);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java Mon Aug 15 07:51:59 2005
@@ -24,7 +24,6 @@
/**
* @struts.action path="/editor/categoryDelete" name="categoryDeleteForm"
- * @struts.action-forward name="Categories" path="/editor/categories.do?method=selectCategory"
* @struts.action-forward name="CategoryDeleteOK" path=.CategoryDeleteOK"
*
* @author Dave Johnson
@@ -90,7 +89,7 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("Categories");
+ forward = mapping.findForward("categories");
}
}
else if (form.isDelete().booleanValue())
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java Mon Aug 15 07:51:59 2005
@@ -12,17 +12,22 @@
import java.util.List;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+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.config.PingConfig;
import org.roller.model.PingTargetManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.PingTargetData;
+import org.roller.presentation.forms.PingTargetForm;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
-import org.roller.presentation.forms.PingTargetForm;
+
/**
* Administer custom ping targets.
@@ -86,5 +91,15 @@
{
RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
return (rollerSession.isUserAuthorizedToAdmin() && !PingConfig.getDisallowCustomTargets());
+ }
+
+ public ActionForward cancel(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return view(mapping, actionForm, request, response);
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java Mon Aug 15 07:51:59 2005
@@ -38,6 +38,7 @@
import org.roller.pojos.AutoPingData;
import org.roller.pojos.PingTargetData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
@@ -57,7 +58,10 @@
LogFactory.getFactory().getInstance(PingSetupAction.class);
private static final String PING_SETUP_PAGE = "pingSetup.page";
- private static final String PING_RESULT_PAGE = "pingResult.page";
+
+ // Changing this to take your back to the pings setup page instead of
+ // ping result page, no need for extra page.
+ private static final String PING_RESULT_PAGE = "pingSetup.page"; // "pingResult.page";
/* (non-Javadoc)
* @see org.apache.struts.actions.DispatchAction#unspecified(
@@ -93,6 +97,9 @@
return mapping.findForward("access-denied");
}
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model",pageModel);
+
List commonPingTargets = pingTargetMgr.getCommonPingTargets();
req.setAttribute("commonPingTargets", commonPingTargets);
@@ -206,7 +213,7 @@
autoPingMgr.removeAutoPing(pingTarget,
RollerSession.getRollerSession(req).getCurrentWebsite());
RollerFactory.getRoller().commit();
-
+
return view(mapping, form, req, res);
}
catch (Exception e)
@@ -249,8 +256,18 @@
{
if (mLogger.isDebugEnabled()) mLogger.debug("Ping Result: " + pingResult);
ActionMessages errors = new ActionMessages();
- errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("ping.transmittedButErrorReturned"));
- errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(pingResult.getMessage()));
+ if (pingResult.getMessage() != null && pingResult.getMessage().trim().length() > 0)
+ {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("ping.transmittedButError"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage(pingResult.getMessage()));
+ }
+ else
+ {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("ping.transmissionFailed"));
+ }
saveErrors(req, errors);
}
else
@@ -277,7 +294,7 @@
addSpecificMessages(ex, errors);
saveErrors(req, errors);
}
- return mapping.findForward(PING_RESULT_PAGE);
+ return view(mapping, form , req, res);
}
catch (Exception ex)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java Mon Aug 15 07:51:59 2005
@@ -20,6 +20,7 @@
import org.roller.model.RefererManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
@@ -61,6 +62,8 @@
{
if ( rollerSession.isUserAuthorizedToAuthor() )
{
+ BasePageModel pageModel = new BasePageModel(req, res, mapping);
+ req.setAttribute("model", pageModel);
req.setAttribute("pageHits",
new Integer(refmgr.getDayHits(RollerSession.getRollerSession(req).getCurrentWebsite())));
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java Mon Aug 15 07:51:59 2005
@@ -66,6 +66,17 @@
return save(mapping, actionForm, request, response);
}
+ /** If method param is not specified, use HTTP verb to pick method to call */
+ public ActionForward cancel(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return mapping.findForward("memberPermissions");
+ }
+
public ActionForward edit(
ActionMapping mapping,
ActionForm actionForm,
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Mon Aug 15 07:51:59 2005
@@ -52,6 +52,16 @@
return save(mapping, actionForm, request, response);
}
+ public ActionForward cancel(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return edit(mapping, actionForm, request, response);
+ }
+
public ActionForward edit(
ActionMapping mapping,
ActionForm actionForm,
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java Mon Aug 15 07:51:59 2005
@@ -28,6 +28,7 @@
import org.roller.model.UserManager;
import org.roller.pojos.Theme;
import org.roller.pojos.ThemeTemplate;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerSession;
import org.roller.presentation.pagecache.PageCacheFilter;
@@ -82,6 +83,10 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rses.isUserAuthorizedToAdmin() ) {
+ BasePageModel pageModel =
+ new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
// get users current theme and our themes list
Roller roller = RollerFactory.getRoller();
ThemeManager themeMgr = roller.getThemeManager();
@@ -139,6 +144,11 @@
Roller roller = RollerFactory.getRoller();
ThemeManager themeMgr = roller.getThemeManager();
+
+ BasePageModel pageModel =
+ new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
String username = rses.getAuthenticatedUser().getUserName();
WebsiteData website = rses.getCurrentWebsite();
String currentTheme = website.getEditorTheme();
@@ -214,6 +224,10 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rses.isUserAuthorizedToAdmin() ) {
+ BasePageModel pageModel =
+ new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
String newTheme = null;
// lookup what theme the user wants first
@@ -304,6 +318,10 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rses.isUserAuthorizedToAdmin() ) {
+ BasePageModel pageModel =
+ new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
// copy down current theme to weblog templates
Roller roller = RollerFactory.getRoller();
ThemeManager themeMgr = roller.getThemeManager();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java Mon Aug 15 07:51:59 2005
@@ -24,6 +24,7 @@
import org.roller.model.FileManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.website.formbeans.UploadFileForm;
@@ -55,6 +56,8 @@
RollerRequest rreq = null;
ActionForward fwd = mapping.findForward("uploadFiles.page");
WebsiteData website = null;
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model", pageModel);
RollerMessages msgs = new RollerMessages();
try
{
@@ -162,6 +165,8 @@
UploadFileForm theForm = (UploadFileForm)actionForm;
ActionForward fwd = mapping.findForward("uploadFiles.page");
RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model", pageModel);
try
{
FileManager fmgr = RollerFactory.getRoller().getFileManager();
@@ -205,6 +210,8 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rollerSession = RollerSession.getRollerSession(request);
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model", pageModel);
if ( !rollerSession.isUserAuthorizedToAuthor() )
{
return mapping.findForward("access-denied");
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Mon Aug 15 07:51:59 2005
@@ -25,10 +25,11 @@
import org.roller.pojos.WeblogTemplate;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
-import org.roller.presentation.forms.WeblogTemplateForm;
import org.roller.presentation.pagecache.PageCacheFilter;
+import org.roller.presentation.forms.WeblogTemplateForm;
import org.roller.util.StringUtils;
import org.roller.util.Utilities;
@@ -88,7 +89,7 @@
actionForm.reset(mapping,request);
- addModelObjects(rreq);
+ addModelObjects(request, response, mapping);
}
else
{
@@ -125,7 +126,7 @@
PageCacheFilter.removeFromCache( request, pd.getWebsite() );
- addModelObjects(rreq);
+ addModelObjects(request, response, mapping);
}
else
{
@@ -155,7 +156,7 @@
RollerSession rses = RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAdmin() )
{
- addModelObjects(rreq);
+ addModelObjects(request, response, mapping);
}
else
{
@@ -197,8 +198,8 @@
UserData user = rses.getAuthenticatedUser();
PageCacheFilter.removeFromCache(request, template.getWebsite());
- addModelObjects(rreq);
- actionForm.reset(mapping,request);
+ addModelObjects(request, response, mapping);
+ actionForm.reset(mapping, request);
}
else
{
@@ -360,13 +361,19 @@
}
//-----------------------------------------------------------------------
- private void addModelObjects( RollerRequest rreq )
- throws RollerException {
-
- HttpServletRequest request = rreq.getRequest();
+ private void addModelObjects(
+ HttpServletRequest request,
+ HttpServletResponse response,
+ ActionMapping mapping)
+ throws RollerException
+ {
UserManager mgr = RollerFactory.getRoller().getUserManager();
- RollerSession rses = RollerSession.getRollerSession(rreq.getRequest());
+ RollerSession rses = RollerSession.getRollerSession(request);
+ BasePageModel pageModel =
+ new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
UserData user = rses.getAuthenticatedUser();
request.setAttribute("user",user);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java Mon Aug 15 07:51:59 2005
@@ -30,6 +30,7 @@
import org.roller.model.WeblogManager;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.pagecache.PageCacheFilter;
@@ -103,6 +104,10 @@
StringUtils.deleteWhitespace(editorPages), ","));
request.setAttribute("editorPagesList", epages);
+
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
+
rses.setCurrentWebsite(website);
}
else
@@ -170,7 +175,10 @@
List epages = Arrays.asList(StringUtils.split(
org.apache.commons.lang.StringUtils.deleteWhitespace(editorPages), ","));
- request.setAttribute("editorPagesList", epages);
+ request.setAttribute("editorPagesList", epages);
+
+ BasePageModel pageModel = new BasePageModel(request, response, mapping);
+ request.setAttribute("model",pageModel);
/*
}
else
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java Mon Aug 15 07:51:59 2005
@@ -114,10 +114,10 @@
if (selectedWebsite.hasUserPermissions(user, PermissionsData.LIMITED))
{
rollerSession.setCurrentWebsite(selectedWebsite);
- ActionMessages msgs = new ActionMessages();
- msgs.add(null, new ActionMessage(
- "yourWebsites.selected", selectedWebsite.getHandle()));
- saveMessages(request, msgs);
+ //ActionMessages msgs = new ActionMessages();
+ //msgs.add(null, new ActionMessage(
+ //"yourWebsites.selected", selectedWebsite.getHandle()));
+ //saveMessages(request, msgs);
}
}
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Mon Aug 15 07:51:59 2005
@@ -1,5 +1,7 @@
application.none=None
+application.cancel=Cancel
+application.done=Done
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -19,18 +21,6 @@
# ----------------------------------------------------------- BookmarksForm.jsp
-bookmarksForm.addBookmark=Add Bookmark
-bookmarksForm.addFolder=Add Bookmark Folder
-bookmarksForm.checkAll=Select All
-bookmarksForm.checkNone=Select None
-bookmarksForm.delete=Delete selected
-bookmarksForm.description=Description
-bookmarksForm.edit=Edit
-bookmarksForm.edit.tip=Click to edit this folder or bookmark
-bookmarksForm.folder=Bookmark Folder
-bookmarksForm.move=Move selected
-bookmarksForm.name=Name
-bookmarksForm.path=Path
bookmarksForm.root=root
bookmarksForm.rootTitle=Bookmarks
bookmarksForm.rootPrompt=\
@@ -43,6 +33,21 @@
This is a bookmark. You can add bookmarks here and even bookmark \
folders, but they will not be displayed on your blog unless add the \
appropriate bookmark display macros to your weblog's templates.
+
+bookmarksForm.subtitle=Managing bookmarks in weblog [<b>{0}</b>]
+
+bookmarksForm.addBookmark=Add Bookmark
+bookmarksForm.addFolder=Add Bookmark Folder
+bookmarksForm.checkAll=Select All
+bookmarksForm.checkNone=Select None
+bookmarksForm.delete=Delete selected
+bookmarksForm.description=Description
+bookmarksForm.edit=Edit
+bookmarksForm.edit.tip=Click to edit this folder or bookmark
+bookmarksForm.folder=Bookmark Folder
+bookmarksForm.move=Move selected
+bookmarksForm.name=Name
+bookmarksForm.path=Path
bookmarksForm.visitLink=Visit
bookmarksForm.visitLink.tip=Click to visit this site
@@ -77,6 +82,7 @@
# ----------------------------------------------------------- CategoriesForm.jsp
categoriesForm.name=Name
+categoriesForm.subtitle=Managing categories in weblog [<b>{0}</b>]
categoriesForm.description=Description
categoriesForm.edit=Edit
categoriesForm.root=root
@@ -516,6 +522,7 @@
# -------------------------------------------------------------------- Main page
+mainPage.frontPage=Front Page
mainPage.recentEntries=Recent Weblog Entries
mainPage.pinnedEntries=Featured Weblog Entries
mainPage.category=Category
@@ -550,6 +557,7 @@
# ----------------------------------------------------------- Member permissions
memberPermissions.title=Website Member Permissions
+memberPermissions.subtitle=Manage permissions of users in weblog [<b>{0}</b>]
memberPermissions.description=You can change permissions of weblog members, \
or remove them from the weblog entire using the controls in the table below \
and clicking Save to commit your changes. Note that you are not allowed to \
@@ -571,24 +579,13 @@
memberPermissions.button.save=Save
-memberPermissions.whyInvite=<i>Why invite somebody to join your website?</i><p />\
-You should only invite somebody to join your weblog if you want help writing \
-or administering your weblog. When you do invite somebody, be sure to pick \
-the right permission for them.
-
-memberPermissions.permissionHelp=<i>What are the different types of permissions?</i>\
-<dl>\
-<dt>Admin</dt><dd>a weblog admin can post and edit blog entries, manage users, \
- change the theme and change the title and description of the blog. Think \
- carefully before giving somebody admin privileges on your blog; make sure \
- you trust them. A weblog must have at least one admin, so if you're the last\
- one, you're not allowed to resign.</dd> \
-<dt>Author</dt><dd>a weblog author can post and edit blog entries, change \
- categories and edit bookmarks but cannot perform any admin duties.</dd> \
-<dt>Limited</dt><dd>a limited weblog user can only edit draft blog entries and \
- submit them for review by the admin and authors that are members of the \
- weblog. A limited user cannot perform author or admin duties.</dd>\
-</dl>
+memberPermissions.whyInvite=Invite somebody to help you write your weblog.
+
+memberPermissions.permissionsHelpTitle=What are permissions?
+memberPermissions.permissionHelp=\
+<b>Admin</b> permission allows user to post entries, manage weblog and its users<br /> \
+<b>Author</b> permission allows user to post entries, but not to manage weblog<br /> \
+<b>Limited</b> permission allows user to save draft entries only
# --------------------------------------------------------- New user registation
@@ -616,7 +613,13 @@
# -------------------------------------------------------------- Page management
-pagesForm.title=Page Templates
+pagesForm.title=Templates
+pagesForm.subtitle=Manage templates that define weblog [<b>{0}</b>]
+pagesForm.tip=You can edit the templates that define the layout, colors and \
+fonts of your weblog. You can also create new templates to define entirely \
+new pages. This is for advanced users only, if you're not comfortable with \
+HTML, you might want to leave your templates alone.
+
pagesForm.name=Name
pagesForm.link=Link
pagesForm.description=Description
@@ -650,6 +653,7 @@
weblog update pings.
customPingTargets.customPingTargets=Custom Weblog Ping Targets
+customPingTargets.subtitle=Manage custom ping targets for weblog [<b>{0}</b>]
customPingTargets.explanation=Use this page to setup sites that you wish to ping \
that are not already available from the \
common sites. Sites will normally advertise a ping url that you should use. \
@@ -661,6 +665,7 @@
Please contact an administrator.
pings.title=Configure Automatic Weblog Pings
+pings.subtitle=Setup automatic pings for weblog [<b>{0}</b>]
pings.explanation=Pings allow you to notify sites that your weblog has changed \
so that the sites can read your feed to retrieve updates. \
You can enable automatic pings for sites that you wish to notify whenever \
@@ -681,9 +686,9 @@
yourself as custom ping targets. These are only available for your own use.
ping.successful=The ping was successful.
-ping.transmittedButErrorReturned=The ping was transmitted but the server \
+ping.transmittedButError=The ping was transmitted but the server \
responded with the following error message.
-ping.transmissionFailed=The ping transmission failed. Check to make sure the \
+ping.transmissionFailed=The ping transmission failed. Check to make sure the \
ping target URL is correct.
ping.unknownHost=The hostname in the ping target URL is unknown.
ping.networkConnectionFailed=There were network connection problems reaching the \
@@ -834,7 +839,14 @@
# ----------------------------------------------------------------- referers.jsp
-referers.todaysReferers=Today's Referer Rankings
+referers.todaysReferers=Referers
+referers.subtitle=Referer rankings for weblog [<b>{0}</b>]
+referers.tip=This page tells you where your weblog's hits are coming from \
+today. Hits with indeterminate referers, such as those from newsfeed readers \
+and bookmarks are counted as 'direct' hits. If you are getting referer spam, \
+use the Manage:Settings Spam Prevention feature to set ignore words (referers \
+that contain ignore words will be rejected).
+
referers.url=Referring URL
referers.hits=Day Hits
referers.deleteSelected=Delete Selected
@@ -885,7 +897,7 @@
tabbedmenu.admin.createUser=New User
tabbedmenu.admin.pingTargets=Ping Targets
-tabbedmenu.planet=Planet
+tabbedmenu.planet=Planet Admin
tabbedmenu.admin.planetConfig=Configuration
tabbedmenu.admin.planetSubscriptions=External Subscriptions
tabbedmenu.admin.planetGroups=Custom Groups
@@ -893,7 +905,14 @@
# ------------------------------------------------------------------------ Theme
themeEditor.title=Weblog Theme
+themeEditor.subtitle=Select theme for weblog [<b>{0}</b>]
+themeEditor.tip=You can select a new theme for this weblog. BEWARE: if you \
+have customized your current theme by editing the templates that define it, \
+then switching to a new theme may destroy your customizations.
themeEditor.selectTheme=Select a new theme to preview
+themeEditor.youMayCustomize=If you like you may customize a personal copy of \
+this theme.
+themeEditor.yourCurrentTheme=Your current theme is
themeEditor.preview=Preview
themeEditor.yourThemeIsShownBelow=Your current theme is shown below.
themeEditor.themeBelowIsCalled=The theme shown below is called:
@@ -907,6 +926,11 @@
# ---------------------------------------------------------------------- Uploads
uploadFiles.title=File Uploads
+uploadFiles.subtitle=Upload files for use in weblog [<b>{0}</b>]
+uploadFiles.tip=You can upload files for use in this weblog. If you've \
+uploaded a image you can include it in your weblog via an HTML \
+<img src="[IMAGE-URL]" /> tag. If you've uploaded a podcast, you can \
+include it in an entry be entering it's URL in the entry's MediaCast field.
uploadFiles.manageFiles=Manage Uploaded Files
uploadFiles.uploadDisabled=Upload has been disabled.
uploadFiles.exceededQuota=You have exceeded your file upload quota.
@@ -989,8 +1013,12 @@
# ------------------------------------------------------------------ Weblog edit
-weblogEdit.title.newEntry=New Weblog Entry
-weblogEdit.title.editEntry=Edit Weblog Entry
+weblogEdit.title.newEntry=New Entry
+weblogEdit.subtitle.newEntry=Creating new weblog entry in weblog [<b>{0}</b>]
+
+weblogEdit.title.editEntry=Edit Entry
+weblogEdit.subtitle.editEntry=Editing weblog entry in weblog [<b>{0}</b>]
+
weblogEdit.otherSettings=Other Settings
weblogEntry.pendingEntrySubject=\
@@ -1097,6 +1125,8 @@
weblogEntryRemove.yes=Yes
weblogEntryRemove.no=No
weblogEntryRemove.areYouSure=Are you sure you want to remove this Weblog Entry?
+weblogEntryRemove.entryTitle=Entry Title
+weblogEntryRemove.entryId=Entry ID
# --------------------------------------------------- Weblog Entry Export/Import
weblogEntryExport.title=Export Entries
@@ -1110,8 +1140,13 @@
# --------------------------------------------------- Weblog Entry Export/Import
-weblogEntryQuery.title=Weblog Entries
-weblogEntryQuery.description=
+weblogEntryQuery.title=Edit Entries
+weblogEntryQuery.subtitle=Finding and editing entries in weblog [<b>{0}</b>]
+weblogEntryQuery.tip=You can select an entry from the list below to edit \
+or use the Filter Entries control to look for entries in a specific category, \
+date range or status.
+
+weblogEntryQuery.queryResults=Weblog Entries
weblogEntryQuery.sidebarTitle=Filter Entries
weblogEntryQuery.sidebarDescription=\
@@ -1171,6 +1206,9 @@
# ---------------------------------------------------------------------- Website
websiteSettings.title=Weblog Settings
+websiteSettings.subtitle=Managing website settings for website [<b>{0}</b>]
+websiteSettings.tip=Change website title, description, comment and referer \
+spam prevention settings.
websiteSettings.websiteTitle=Title
websiteSettings.websiteDescription=Description
websiteSettings.templateSettings=Template Settings
@@ -1184,8 +1222,8 @@
websiteSettings.emailAddress=Email address of weblog owner
websiteSettings.emailFromAddress=Default <em>from</em> e-mail address for notifications
websiteSettings.autoformat=Autoformat new entries?
-websiteSettings.bloggerApi=Blogger API
-websiteSettings.enableBloggerApi=Enable Blogger API for your weblog?
+websiteSettings.bloggerApi=Weblog Client API
+websiteSettings.enableBloggerApi=Enable Blogger and MetaWeblog APIs for your weblog?
websiteSettings.bloggerApiCategory=Category for posts received via Blogger API
websiteSettings.spamPrevention=Spam Prevention
websiteSettings.ignoreUrls=Ignore referering URLs that<br />contain any of \
@@ -1212,7 +1250,8 @@
# ----------------------------------------------------------------- Your profile
yourProfile.title=Your Profile
-yourProfile.description=You can change your full name, email and password here.
+yourProfile.tip.userName=You can't change your username.
+yourProfile.description=Change your password, default locale, timezone and other settings.
yourProfile.saved=Changes to your profile have been saved.
yourProfile.unsaved=Unsaved changes, must press Save button to persist.
@@ -1226,6 +1265,8 @@
yourWebsites.prompt=Your existing weblogs. You may \
add entries, manage templates, set configurations, etc.
+
+yourWebsites.existingWebsites=Your Existing Weblogs
yourWebsites.invited=You've been invited to join the weblog
yourWebsites.accept=accept
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm Mon Aug 15 07:51:59 2005
@@ -22,26 +22,26 @@
</table>
<table class="menuItemTable" cellspacing="0">
-<tr>
- <td class="menuItem">
- #set( $count = 0 )
- #set( $currentMenu = $menuModel.getSelectedMenu( $req ) )
- #if( $currentMenu.isPermitted( $req ) )
- #foreach( $item in $currentMenu.getMenuItems() )
- #if ($item.isPermitted($req))
- #if ( $count > 0 )
- |
- #end
- #if ( $item.isSelected( $req ) )
- <a class="menuItemSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
- #else
- <a class="menuItemUnselected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
- #end
- #set( $count = $count + 1 )
- #end
- #end
- #end
- </td>
-</tr>
+ <tr>
+ <td>
+ #set( $count = 0 )
+ #set( $currentMenu = $menuModel.getSelectedMenu( $req ) )
+ #if( $currentMenu.isPermitted( $req ) )
+ #foreach( $item in $currentMenu.getMenuItems() )
+ #if ($item.isPermitted($req))
+ #if ( $count > 0 )
+ |
+ #end
+ #if ( $item.isSelected( $req ) )
+ <a class="menuItemSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
+ #else
+ <a class="menuItemUnselected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a>
+ #end
+ #set( $count = $count + 1 )
+ #end
+ #end
+ #end
+ </td>
+ </tr>
</table>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Mon Aug 15 07:51:59 2005
@@ -62,6 +62,7 @@
<put name="content" value="/website/YourWebsites.jsp" />
<put name="sidebar" value="/website/YourWebsitesSidebar.jsp" />
</definition>
+
<definition name=".YourProfile" extends=".tiles-simplepage" >
<put name="content" value="/website/YourProfile.jsp" />
</definition>
@@ -82,93 +83,88 @@
<put name="content" value="/weblog/WeblogEdit.jsp" />
<put name="sidebar" value="/weblog/WeblogEditSidebar.jsp" />
</definition>
-<definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
- <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
-</definition>
-
<definition name=".WeblogQuery" extends=".tiles-editorpage" >
<put name="content" value="/weblog/WeblogQuery.jsp" />
<put name="sidebar" value="/weblog/WeblogQuerySidebar.jsp" />
</definition>
-
<definition name=".CategoriesForm" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CategoriesForm.jsp" />
<put name="sidebar" value="/weblog/CategoriesSidebar.jsp" />
</definition>
-<definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
- <put name="content" value="/weblog/CategoryDeleteOK.jsp" />
-</definition>
-<definition name=".CategoryForm" extends=".tiles-editorpage" >
- <put name="content" value="/weblog/CategoryForm.jsp" />
-</definition>
-
<definition name=".referers" extends=".tiles-editorpage" >
<put name="content" value="/weblog/referers.jsp" />
</definition>
+<definition name=".BookmarksForm" extends=".tiles-editorpage" >
+ <put name="content" value="/bookmarks/BookmarksForm.jsp" />
+ <put name="sidebar" value="/bookmarks/BookmarksSidebar.jsp" />
+</definition>
+<definition name=".upload-file" extends=".tiles-editorpage" >
+ <put name="content" value="/website/upload-file.jsp" />
+</definition>
+<definition name=".WeblogEntryRemove" extends=".tiles-simplepage" >
+ <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
+</definition>
+<definition name=".CategoryForm" extends=".tiles-simplepage" >
+ <put name="content" value="/weblog/CategoryForm.jsp" />
+</definition>
+<definition name=".CategoryDeleteOK" extends=".tiles-simplepage" >
+ <put name="content" value="/weblog/CategoryDeleteOK.jsp" />
+</definition>
+<definition name=".BookmarkForm" extends=".tiles-simplepage" >
+ <put name="content" value="/bookmarks/BookmarkForm.jsp" />
+</definition>
+<definition name=".FolderForm" extends=".tiles-simplepage" >
+ <put name="content" value="/bookmarks/FolderForm.jsp" />
+</definition>
+<definition name=".import" extends=".tiles-simplepage" >
+ <put name="content" value="/bookmarks/import.jsp" />
+</definition>
<!-- weblog admin pages (and associates) -->
+<definition name=".edit-website" extends=".tiles-editorpage" >
+ <put name="content" value="/website/edit-website.jsp" />
+</definition>
+<definition name=".theme-editor" extends=".tiles-editorpage" >
+ <put name="content" value="/website/theme-editor.jsp" />
+</definition>
+<definition name=".edit-pages" extends=".tiles-editorpage" >
+ <put name="content" value="/website/edit-pages.jsp" />
+ <put name="sidebar" value="/website/edit-pages-sidebar.jsp" />
+</definition>
+<definition name=".MemberPermissions" extends=".tiles-editorpage" >
+ <put name="content" value="/website/MemberPermissions.jsp" />
+ <put name="sidebar" value="/website/MemberPermissionsSidebar.jsp" />
+</definition>
<definition name=".CustomPingTargets" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CustomPingTargets.jsp" />
</definition>
-<definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
- <put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
-</definition>
<definition name=".PingResult" extends=".tiles-editorpage" >
<put name="content" value="/weblog/PingResult.jsp" />
</definition>
<definition name=".Pings" extends=".tiles-editorpage" >
<put name="content" value="/weblog/Pings.jsp" />
</definition>
-<definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
- <put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
-</definition>
-<definition name=".BookmarksForm" extends=".tiles-editorpage" >
- <put name="content" value="/bookmarks/BookmarksForm.jsp" />
- <put name="sidebar" value="/bookmarks/BookmarksSidebar.jsp" />
-</definition>
-<definition name=".BookmarkForm" extends=".tiles-editorpage" >
- <put name="content" value="/bookmarks/BookmarkForm.jsp" />
-</definition>
-<definition name=".import" extends=".tiles-editorpage" >
- <put name="content" value="/bookmarks/import.jsp" />
-</definition>
-<definition name=".FolderForm" extends=".tiles-editorpage" >
- <put name="content" value="/bookmarks/FolderForm.jsp" />
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-simplepage" >
+ <put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
</definition>
-
-<definition name=".edit-website" extends=".tiles-editorpage" >
- <put name="content" value="/website/edit-website.jsp" />
+<definition name=".CustomPingTargetEdit" extends=".tiles-simplepage" >
+ <put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
</definition>
-<definition name=".InviteMember" extends=".tiles-editorpage" >
+<definition name=".InviteMember" extends=".tiles-simplepage" >
<put name="content" value="/website/InviteMember.jsp" />
</definition>
-<definition name=".InviteMemberDone" extends=".tiles-editorpage" >
+<definition name=".InviteMemberDone" extends=".tiles-simplepage" >
<put name="content" value="/website/InviteMemberDone.jsp" />
</definition>
-<definition name=".theme-editor" extends=".tiles-editorpage" >
- <put name="content" value="/website/theme-editor.jsp" />
-</definition>
-<definition name=".edit-page" extends=".tiles-editorpage" >
+<definition name=".edit-page" extends=".tiles-simplepage" >
<put name="content" value="/website/edit-page.jsp" />
</definition>
-<definition name=".upload-file" extends=".tiles-editorpage" >
- <put name="content" value="/website/upload-file.jsp" />
-</definition>
-<definition name=".MemberPermissions" extends=".tiles-editorpage" >
- <put name="content" value="/website/MemberPermissions.jsp" />
-</definition>
-<definition name=".remove-page" extends=".tiles-editorpage" >
+<definition name=".remove-page" extends=".tiles-simplepage" >
<put name="content" value="/website/remove-page.jsp" />
</definition>
-<definition name=".edit-pages" extends=".tiles-editorpage" >
- <put name="content" value="/website/edit-pages.jsp" />
-</definition>
-<definition name=".Maintenance" extends=".tiles-editorpage" >
- <put name="content" value="/website/Maintenance.jsp" />
-</definition>
<!-- global admin pages (and associates) -->
@@ -179,9 +175,6 @@
<definition name=".UserAdmin" extends=".tiles-adminpage" >
<put name="content" value="/website/UserAdmin.jsp" />
</definition>
-<definition name=".UserNew" extends=".tiles-adminpage" >
- <put name="content" value="/website/UserNew.jsp" />
-</definition>
<definition name=".CommonPingTargets" extends=".tiles-adminpage" >
<put name="content" value="/website/CommonPingTargets.jsp" />
</definition>
@@ -192,6 +185,9 @@
<put name="content" value="/website/CommonPingTargetEdit.jsp" />
</definition>
+<definition name=".UserNew" extends=".tiles-simplepage" >
+ <put name="content" value="/website/UserNew.jsp" />
+</definition>
<definition name=".PlanetSubscriptions" extends=".tiles-adminpage" >
<put name="content" value="/planet/PlanetSubscriptions.jsp" />
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp Mon Aug 15 07:51:59 2005
@@ -36,7 +36,14 @@
<c:choose>
<c:when test="${empty folderPath}">
<h1><fmt:message key="bookmarksForm.rootTitle" /></h1>
- <p><fmt:message key="bookmarksForm.rootPrompt" /></p>
+ <p class="subtitle">
+ <fmt:message key="bookmarksForm.subtitle" >
+ <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+ </fmt:message>
+ </p>
+ <p class="pagetip">
+ <fmt:message key="bookmarksForm.rootPrompt" />
+ </p>
</c:when>
<c:when test="${!(empty folderPath)}">
@@ -62,15 +69,12 @@
</c:choose>
</p>
-<br />
-
<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
<html:form action="/editor/bookmarks" method="post">
<input type="hidden" name="method" />
<html:hidden property="folderId" />
-<p>
<%-- Select-all button --%>
<input type="button" value="<fmt:message key='bookmarksForm.checkAll' />"
onclick="setChecked(1)" /></input>
@@ -92,7 +96,8 @@
<html:options collection="allFolders"
property="id" labelProperty="path"/>
</html:select>
-</p>
+
+<p />
<table class="rollertable">
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp Mon Aug 15 07:51:59 2005
@@ -28,7 +28,7 @@
<fmt:message key="bookmarksForm.addFolder" />
</roller:link>
</p>
- <br />
+
<br />
<br />
Modified: incubator/roller/branches/roller_2.0/web/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Mon Aug 15 07:51:59 2005
@@ -1,97 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%@ page import="org.roller.model.Roller" %>
-<%@ page import="org.roller.pojos.UserData" %>
-<%@ page import="org.roller.presentation.RollerRequest" %>
<%@ include file="/taglibs.jsp" %>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Roller ERROR</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <script type="text/javascript"
- src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
- <link rel="stylesheet" type="text/css" title="The Original"
- href="<%= request.getContextPath() %>/theme/roller.css" />
- <link rel="stylesheet" type="text/css" title="The Original"
- href="<%= request.getContextPath() %>/theme/layout.css" />
- </head>
-<body>
-<div id="content">
-
<% try { %>
- <roller:NavigationBar/>
-<% }
-catch (Throwable e)
-{
- System.err.println("ERROR: while displaying error page error page");
- e.printStackTrace();
-} %>
-
-<%@ page import="java.io.*,org.roller.util.Utilities" isErrorPage="true" %>
-
-<%
-java.util.Locale locale = request.getLocale();
-java.util.ResourceBundle bundle =
- java.util.ResourceBundle.getBundle("ApplicationResources",locale);
-
-final Object codeObj, messageObj, typeObj, exceptionObj;
-codeObj = request.getAttribute("javax.servlet.error.status_code");
-messageObj = request.getAttribute("javax.servlet.error.message");
-typeObj = request.getAttribute("javax.servlet.error.type");
-
-String code=null, message=null, type=null;
-if ( null != codeObj ) code = codeObj.toString();
-if ( null != messageObj ) message = messageObj.toString();
-if ( null != typeObj ) type = typeObj.toString();
-String reason = null != code ? code : type;
-
-exception = (Throwable)request.getAttribute("javax.servlet.error.exception");
-%>
-<br />
-<h2 class="error"><fmt:message key="errorPage.title" /></h2>
-<p><fmt:message key="errorPage.message" /></p>
-<p><%= message %></p>
-<p><b><fmt:message key="errorPage.reason" /></b>: <%= reason %></p>
-<% if ( null != exception )
-{ %>
- <form><textarea rows="30" style="font-size:8pt;width:95%">
- <% exception.printStackTrace(new java.io.PrintWriter(out)); %>
- </textarea></form>
-<% } %>
-
-
-
-
-<br />
-<br />
-
- <div id="footer" class="clearfix">
- <a href="http://www.rollerweblogger.org">
- Powered by Roller Weblogger</a> |
-
- <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
- <fmt:message key="footer.reportIssue" /></a> |
-
- <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
- <fmt:message key="footer.userGuide" /></a> |
-
- <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
- <fmt:message key="footer.macros" /></a> |
-
- <a href="http://sourceforge.net/mail/?group_id=47722">
- <fmt:message key="footer.mailingLists" /></a>
- </div><!-- end footer -->
-
-</div> <!-- end centercontent -->
-
-<div id="rightcontent">
-</div>
-
-</div> <!-- end wrapper -->
-
-</body>
-</html>
-
-<% } catch (Throwable e) { e.printStackTrace(); } %>
-
-
+<tiles:insert page="/theme/tiles-simplepage.jsp">
+ <tiles:put name="content" value="/errorBody.jsp" />
+ <tiles:put name="status" value="/theme/status.jsp" />
+ <tiles:put name="footer" value="/theme/tiles-footer.jsp" />
+ <tiles:put name="head" value="/theme/tiles-head.jsp" />
+ <tiles:put name="messages" value="/theme/messages.jsp" />
+</tiles:insert>
+<% } catch (Throwable t) { t.printStackTrace() );
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/web/local-banner.jspf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/local-banner.jspf?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/local-banner.jspf (original)
+++ incubator/roller/branches/roller_2.0/web/local-banner.jspf Mon Aug 15 07:51:59 2005
@@ -1,6 +1,6 @@
<h1><%= RollerRuntimeConfig.getProperty("site.name") %></h1>
-<p class="websiteDescription">
+<p class="subtitle">
<%= RollerRuntimeConfig.getProperty("site.description") %>
</p>
Modified: incubator/roller/branches/roller_2.0/web/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Mon Aug 15 07:51:59 2005
@@ -1,136 +1,8 @@
-<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ include file="/taglibs.jsp" %>
-<% request.setAttribute("secure_login",
- org.roller.config.RollerConfig.getProperty("securelogin.enabled")); %>
-<c:if test='${secure_login == "true"}' >
- <roller:secure mode="secured" />
-</c:if>
-<% try { %><html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
- <%-- this is included so cached pages can still set contentType --%>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <script type="text/javascript"
- src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
- <link rel="stylesheet" type="text/css" media="all"
- href="<%= request.getContextPath() %>/theme/layout.css" />
- <link rel="stylesheet" type="text/css" media="all"
- href="<%= request.getContextPath() %>/theme/roller.css" />
- <link rel="stylesheet" type="text/css" media="all"
- href="<%= request.getContextPath() %>/theme/menu.css" />
- <link rel="stylesheet" type="text/css" media="all"
- href="<%= request.getContextPath() %>/theme/calendar.css" />
- <script type="text/javascript"
- src="<%= request.getContextPath() %>/tags/calendar.js"></script>
- <script type="text/javascript"
- src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
- ><!-- overLIB (c) Erik Bosrup --></script>
-<style type="text/css">
-#banner {
- height: 30px;
-}
-#centercontent {
- margin:0px 0px 50px 10px;
- padding:10px;
-}
-</style>
-</head>
-<body>
-<div id="wrapper">
-
- <div id="banner">
- </div>
-
- <div id="leftcontent">
- </div>
-
- <div id="centercontent">
- <h1><fmt:message key="loginPage.title" /></h1>
- <p><fmt:message key="loginPage.prompt" /></p>
- <form method="post"
- id="loginForm"
- action="<c:url value="/auth/"/>"
- onsubmit="saveUsername(this)">
- <table width="100%">
- <tr>
- <td colspan="2">
- <logic:present parameter="error">
- <div class="error">
- <bean:message key="error.password.mismatch"/>
- </div>
- </logic:present>
- </td>
- </tr>
- <tr>
- <th><fmt:message key="loginPage.userName" />:</th>
- <td>
- <input type="text" name="j_username" id="j_username" size="25" />
- </td>
- </tr>
- <tr>
- <th><fmt:message key="loginPage.password" />:</th>
- <td>
- <input type="password" name="j_password" id="j_password" size="20" />
- <!-- for Resin -->
- <input type="hidden" name="j_uri" id="j_uri" value="" />
- </td>
- </tr>
- <c:if test="${rememberMeEnabled}">
- <tr>
- <td></td>
- <td>
- <input type="checkbox" name="rememberMe" id="rememberMe" />
- <label for="rememberMe">
- <fmt:message key="loginPage.rememberMe" />
- </label>
- </td>
- </tr>
- </c:if>
- <tr>
- <td></td>
- <td>
- <input type="submit" name="login" id="login" value="<fmt:message key="loginPage.login" />" />
- <input type="reset" name="reset" id="reset" value="<fmt:message key="loginPage.reset" />"
- onclick="document.getElementById('j_username').focus()" />
- </td>
- </tr>
- </table>
- </form>
-
- <script type="text/javascript">
- <!--
-
- if (document.getElementById) {
- if (getCookie("username") != null) {
- if (document.getElementById) {
- document.getElementById("j_username").value = getCookie("username");
- document.getElementById("j_password").focus();
- }
- } else {
- document.getElementById("j_username").focus();
- }
- }
-
- function saveUsername(theForm) {
- var expires = new Date();
- expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
- setCookie("username",theForm.j_username.value,expires);
- }
- //-->
- </script>
-
- </div>
-
- <div id="rightcontent">
- </div>
-
- <div id="footer">
- <tiles:insert attribute="footer" />
- </div>
-
-</div>
-</body>
-</html>
-
-<% } catch (Exception e) { e.printStackTrace(); } %>
-
+<tiles:insert page="/theme/tiles-simplepage.jsp">
+ <tiles:put name="content" value="/loginBody.jsp" />
+ <tiles:put name="status" value="/theme/status.jsp" />
+ <tiles:put name="footer" value="/theme/tiles-footer.jsp" />
+ <tiles:put name="head" value="/theme/tiles-head.jsp" />
+ <tiles:put name="messages" value="/theme/messages.jsp" />
+</tiles:insert>
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main-sidebar.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Mon Aug 15 07:51:59 2005
@@ -5,8 +5,9 @@
<div class="menu-tl">
<div class="sidebarBody">
- <fmt:message key="mainPage.searchWeblogs" />
-
+ <h3><fmt:message key="mainPage.searchWeblogs" /></h3>
+ <hr />
+
<form id="searchForm" method="get"
action="<c:out value="${baseURL}" />/search"
style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
@@ -28,8 +29,6 @@
</script>
<br />
- <br />
- <br />
</div>
</div>
@@ -43,7 +42,8 @@
<div class="menu-tl">
<div class="sidebarBody">
- <fmt:message key="mainPage.hotWeblogs" />
+ <h3><fmt:message key="mainPage.hotWeblogs" /></h3>
+ <hr />
<c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
<ul style="list-style-type:none; padding-left:2px; margin: 0px">
@@ -60,8 +60,6 @@
</ul>
</c:if>
- <br />
- <br />
<br />
</div>
Modified: incubator/roller/branches/roller_2.0/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Mon Aug 15 07:51:59 2005
@@ -12,7 +12,7 @@
request.setAttribute("popularWebsites",
((MainPageAction.MainPageData)request.getAttribute("data")).getPopularWebsites(65));
%>
- <div class="bannerBox">
+ <div>
<%@ include file="local-banner.jspf" %>
</div>
Modified: incubator/roller/branches/roller_2.0/web/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet.jsp Mon Aug 15 07:51:59 2005
@@ -28,7 +28,7 @@
%>
<td width="70%" valign="top">
- <div class="bannerBox">
+ <div>
<%@ include file="local-banner-planet.jspf" %>
</div>
Modified: incubator/roller/branches/roller_2.0/web/theme/images/menutab-sel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/menutab-sel.png?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/images/menutab-unsel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/menutab-unsel.png?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/images/two-sidebarfade.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/two-sidebarfade.png?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/images/two-togglegrey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/two-togglegrey.png?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/layout.css?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Mon Aug 15 07:51:59 2005
@@ -1,42 +1,36 @@
+/* ======================================================================
+layout.css: Base CSS layout for Roller's web UI (position and sizing only)
+====================================================================== */
#wrapper {
- height: 100%;
-}
-
-#banner {
- height: 90px;
-}
-
-#menu {
- padding: 0px 10px 0px 10px;
+ width: 100%;
}
-
-#footer {
+#header {
+ height: 105px;
margin: 0px;
- width: 100%;
+ padding: 0px;
}
-
-.bannerBox td, table.bannerBox {
- height: 15px;
+#menu {
+ padding: 0px 0px 0px 0px;
}
-
#centercontent {
- margin: 0px 220px 15px 15px;
- padding: 0px 50px 0px 0px;
+ margin: 15px 260px 0px 15px;
+ padding: 0px;
}
-
#rightcontent {
position: absolute;
- top: 100px;
- right: 10px;
+ top: 120px;
+ right: 15px;
width: 230px;
}
-
-div#loginTable {
- margin: 20px;
- border: 1px solid #C0C0C0;
- color: inherit;
- padding: 10px 5px 0px 5px;
- width: 350px;
+.prop {
+ height: 300px;
+ float: right;
+ width: 1px;
+}
+.clear {
+ clear: both;
+ height: 1px;
+ overflow: hidden;
}