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/12 22:06:55 UTC
svn commit: r232367 [1/2] - in /incubator/roller/branches/roller_2.0:
nbproject/ src/org/roller/presentation/
src/org/roller/presentation/website/actions/ web/ web/WEB-INF/
web/WEB-INF/classes/ web/bookmarks/ web/theme/ web/theme/images/
web/theme/scri...
Author: snoopdave
Date: Fri Aug 12 13:06:04 2005
New Revision: 232367
URL: http://svn.apache.org/viewcvs?rev=232367&view=rev
Log:
first cut at new landing page UI, still a bit more to do
Added:
incubator/roller/branches/roller_2.0/web/WEB-INF/admin-menu.xml
incubator/roller/branches/roller_2.0/web/theme/images/two-bottomgrey.png (with props)
incubator/roller/branches/roller_2.0/web/theme/images/two-sidebarfade.png (with props)
incubator/roller/branches/roller_2.0/web/theme/images/two-togglegrey.png (with props)
incubator/roller/branches/roller_2.0/web/theme/images/two-topgrey.png (with props)
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-head.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
Removed:
incubator/roller/branches/roller_2.0/web/theme/images/menubar.png
incubator/roller/branches/roller_2.0/web/theme/images/menutab-sel-tr.png
incubator/roller/branches/roller_2.0/web/theme/images/menutab-unsel-tr.png
Modified:
incubator/roller/branches/roller_2.0/nbproject/project.xml
incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.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/editor-menu.xml
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
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/error403.jsp
incubator/roller/branches/roller_2.0/web/error404.jsp
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/theme/footer.jsp
incubator/roller/branches/roller_2.0/web/theme/header.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/layout.css
incubator/roller/branches/roller_2.0/web/theme/menu.css
incubator/roller/branches/roller_2.0/web/theme/messages.jsp
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js
incubator/roller/branches/roller_2.0/web/theme/status.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.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/WeblogQuery.jsp
incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp
incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
incubator/roller/branches/roller_2.0/web/website/UserNew.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
Modified: incubator/roller/branches/roller_2.0/nbproject/project.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/nbproject/project.xml?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_2.0/nbproject/project.xml Fri Aug 12 13:06:04 2005
@@ -34,14 +34,14 @@
<location>sandbox/standalone/src</location>
</source-folder>
<source-folder>
- <label>build/generated/src.business</label>
+ <label>build/generated/src.presentation</label>
<type>java</type>
- <location>build/generated/src.business</location>
+ <location>build/generated/src.presentation</location>
</source-folder>
<source-folder>
- <label>build/generated/src.presentation</label>
+ <label>build/generated/src.business</label>
<type>java</type>
- <location>build/generated/src.presentation</location>
+ <location>build/generated/src.business</location>
</source-folder>
</folders>
<ide-actions>
@@ -107,12 +107,12 @@
<location>sandbox/standalone/src</location>
</source-folder>
<source-folder style="packages">
- <label>build/generated/src.business</label>
- <location>build/generated/src.business</location>
- </source-folder>
- <source-folder style="packages">
<label>build/generated/src.presentation</label>
<location>build/generated/src.presentation</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>build/generated/src.business</label>
+ <location>build/generated/src.business</location>
</source-folder>
<source-file>
<location>build.xml</location>
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java Fri Aug 12 13:06:04 2005
@@ -38,7 +38,8 @@
public String getBaseURL()
{
- return request.getContextPath();
+ RollerContext rctx = RollerContext.getRollerContext(request);
+ return rctx.getAbsoluteContextUrl(request);
}
public String getShortDateFormat()
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Fri Aug 12 13:06:04 2005
@@ -29,6 +29,7 @@
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerSession;
import org.roller.presentation.website.formbeans.CreateWebsiteForm;
+import org.roller.util.Utilities;
/**
* Allows user to create a new website.
@@ -57,6 +58,16 @@
return save(mapping, actionForm, request, response);
}
+ public ActionForward cancel(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return mapping.findForward("yourWebsites");
+ }
+
/** Present new website form to user */
public ActionForward create(
ActionMapping mapping,
@@ -82,7 +93,7 @@
ActionForm actionForm,
HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException
+ throws Exception
{
CreateWebsiteForm form = (CreateWebsiteForm)actionForm;
ActionMessages msgs = new ActionMessages();
@@ -126,13 +137,45 @@
saveErrors(request,errors);
mLogger.error("ERROR in createWebsite", e);
}
- ActionForward forward = mapping.findForward("createWebsiteDone.page");
- return forward;
+ if (errors.size() == 0)
+ {
+ return mapping.findForward("createWebsiteDone.page");
+ }
+ else
+ {
+ return mapping.findForward("createWebsite.page");
+ }
}
private ActionMessages validate(CreateWebsiteForm form, ActionErrors errors)
+ throws RollerException
{
- return new ActionMessages();
+ ActionMessages messages = new ActionMessages();
+ String safeHandle = Utilities.replaceNonAlphanumeric(form.getHandle());
+ if (form.getHandle() == null || "".equals(form.getHandle().trim()))
+ {
+ errors.add( ActionErrors.GLOBAL_ERROR,
+ new ActionError("createWeblog.error.missingHandle"));
+ }
+ else if (!safeHandle.equals(form.getHandle()) )
+ {
+ errors.add( ActionErrors.GLOBAL_ERROR,
+ new ActionError("createWeblog.error.invalidHandle"));
+ }
+
+ if (form.getEmailAddress() == null || "".equals(form.getEmailAddress().trim()))
+ {
+ errors.add( ActionErrors.GLOBAL_ERROR,
+ new ActionError("createWeblog.error.missingEmailAddress"));
+ }
+
+ Roller roller = RollerFactory.getRoller();
+ if (roller.getUserManager().getWebsiteByHandle(form.getHandle()) != null)
+ {
+ messages.add(ActionErrors.GLOBAL_ERROR,
+ new ActionError("createWeblog.error.handleExists"));
+ }
+ return messages;
}
public static class CreateWebsitePageModel extends BasePageModel
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java Fri Aug 12 13:06:04 2005
@@ -60,6 +60,16 @@
return registerUser(mapping, actionForm, request, response);
}
+ public ActionForward cancel(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return mapping.findForward("user");
+ }
+
//------------------------------------------------------------------------
/** Process GET of user registration page (allows users to register themselves. */
public ActionForward registerUser(
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java Fri Aug 12 13:06:04 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 mapping.findForward("yourWebsites");
+ }
+
/** Load form with authenticated user and forward to your-profile page */
public ActionForward edit(
ActionMapping mapping,
@@ -146,14 +156,14 @@
request.setAttribute(
"model", new BasePageModel(request, response, mapping));
- msgs.add(null, new ActionMessage("yourProfile.saved"));
+ //msgs.add(null, new ActionMessage("yourProfile.saved"));
saveMessages(request, msgs);
}
else
{
saveErrors(request, errors);
}
- return edit(mapping, actionForm, request, response);
+ return mapping.findForward("yourWebsites");
}
catch (Exception e)
{
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=232367&r1=232366&r2=232367&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 Fri Aug 12 13:06:04 2005
@@ -48,7 +48,7 @@
{
return edit(mapping, actionForm, request, response);
}
- return select(mapping, actionForm, request, response);
+ return edit(mapping, actionForm, request, response);
}
public ActionForward edit(
@@ -65,7 +65,40 @@
return forward;
}
- public ActionForward select(
+ public ActionForward newEntry(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ selectWebsite(mapping, actionForm, request, response);
+ return mapping.findForward("weblogCreate");
+ }
+
+ public ActionForward editEntries(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ selectWebsite(mapping, actionForm, request, response);
+ return mapping.findForward("weblogQuery");
+ }
+
+ public ActionForward manageWeblog(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ selectWebsite(mapping, actionForm, request, response);
+ return mapping.findForward("editWebsite");
+ }
+
+ public void selectWebsite(
ActionMapping mapping,
ActionForm actionForm,
HttpServletRequest request,
@@ -86,10 +119,6 @@
"yourWebsites.selected", selectedWebsite.getHandle()));
saveMessages(request, msgs);
}
- request.setAttribute("model",
- new YourWebsitesPageModel(request, response, mapping));
- ActionForward forward = mapping.findForward("yourWebsites.page");
- return forward;
}
public ActionForward accept(
Added: incubator/roller/branches/roller_2.0/web/WEB-INF/admin-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/admin-menu.xml?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/admin-menu.xml (added)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/admin-menu.xml Fri Aug 12 13:06:04 2005
@@ -0,0 +1,34 @@
+<!--
+Defines the Roller Global Admin UI menu and roles allowed to use each menu.
+Each menu or menu item is governed by four attrbibutes:
+
+See comments in editor-menu.xml for info about attributes.
+-->
+<menu-bar>
+
+ <menu name="tabbedmenu.admin" roles="admin" perms="any">
+ <menu-item forward="rollerConfig" name="tabbedmenu.admin.config"
+ roles="admin" perms="any"/>
+ <menu-item forward="adminUser" name="tabbedmenu.admin.userAdmin"
+ roles="admin" perms="any"/>
+ <menu-item forward="createUser" name="tabbedmenu.admin.createUser"
+ roles="admin" perms="any"/>
+ <menu-item forward="commonPingTargets" name="tabbedmenu.admin.pingTargets"
+ roles="admin" perms="any"/>
+ </menu>
+
+ <menu name="tabbedmenu.planet" roles="admin" perms="any"
+ enabledProperty="planet.aggregator.enabled">
+ <menu-item forward="planetConfig" name="tabbedmenu.admin.planetConfig"
+ roles="admin" perms="any" />
+ <menu-item forward="planetSubscriptions" name="tabbedmenu.admin.planetSubscriptions"
+ roles="admin" perms="any" />
+ <menu-item forward="planetGroups" name="tabbedmenu.admin.planetGroups"
+ roles="admin" perms="any" />
+ </menu>
+
+</menu-bar>
+
+
+
+
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=232367&r1=232366&r2=232367&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 Fri Aug 12 13:06:04 2005
@@ -202,15 +202,28 @@
createWebsite.title=Create Weblog
-createWebsite.description=This page allows you to create a new weblog.
+createWebsite.prompt=Use this form to create a new weblog for you or for \
+you and a group of your friends.
-createWebsite.whyCreateMore=\
-<i>Why would you want to create an additional weblog?</i><p /> \
-Good question! Think carefully before creating additional blogs. You don't \
-need multiple blogs to write about multiple topics, you can use categories \
-for that. And you don't need multiple blogs to add new pages to your blog, \
-you can use templates for that. Generally, you should only create an \
-additional blog if you want to cover a completely different set of topics.
+createWebsite.tip.name=The name is the title of your weblog, it will be \
+displayed at the top of your weblog page, and in the title field of your \
+weblog's newsfeed. This field should not include HTML.
+createWebsite.tip.description=The description of your weblog may be displayed \
+at the top of your weblog (depending on the theme you choose) and it will be \
+used in desription or subtitle field of your newsfeed. This field should not \
+include HTML.
+createWebsite.tip.handle=The handle is a short one word name for your \
+weblog. It will be used in your URL, so please limit it to simple ASCII \
+alphanumeric characters (a-z, A-Z and 0-9) and do not use HTML.
+createWebsite.tip.email=Your email address or the email address of the person \
+responsible for the website that you are creating.
+createWebsite.tip.timezone=The timezone to be used for entry and display \
+of this weblog.
+createWebsite.tip.locale=The default locale to be used for the display of this \
+weblog when the browser does not specify a locale.
+createWebsite.tip.theme=The theme to be used to display this weblog. Later, \
+you can easily switch to another theme or edit the themes templates to \
+customize it to your liking.
createWebsite.handle=Handle
createWebsite.name=Name
@@ -220,7 +233,8 @@
createWebsite.timeZone=Timezone
createWebsite.theme=Theme
-createWebsite.button.save=Create
+createWebsite.button.save=Create Weblog
+createWebsite.button.cancel=Cancel
createWebsiteDone.title=Weblog Created
createWebsiteDone.message=The following new weblog has been created:
@@ -230,6 +244,10 @@
createWebsiteDone.weblogURL=Weblog URL
createWebsiteDone.rssURL=Newsfeed URL
+createWeblog.error.missingHandle=You must enter a valid handle
+createWeblog.error.invalidHandle=The handle you specified is not valid
+createWeblog.error.missingEmailAddress=You must enter a valid email address
+createWeblog.error.handleExists=A weblog with that handle already exists
# --------------------------------------------------------------- Comment emails
@@ -409,6 +427,8 @@
# ------------------------------------------------------------------------ Login
+loginPage.title=Welcome to Roller
+loginPage.prompt=Please enter your username and password to login.
loginPage.userName=Username
loginPage.password=Password
loginPage.rememberMe=Remember Me
@@ -513,6 +533,8 @@
mainPage.currentWebsite=Editing weblog
mainPage.sidebarHelpTitle=What is this?
+mainPage.mainMenu=Main Menu
+
# ------------------------------------------------------------------ Maintenance
maintenance.title=Weblog Maintenance
@@ -837,15 +859,14 @@
tabbedmenu.weblog=Weblog
tabbedmenu.weblog.newEntry=New Entry
-tabbedmenu.weblog.archives=Archives
+tabbedmenu.weblog.archives=Edit Entries
tabbedmenu.weblog.categories=Categories
tabbedmenu.bookmarks.allFolders=Bookmarks
tabbedmenu.bookmarks.import=Import
tabbedmenu.weblog.referers=Referers
-tabbedmenu.website.files=Uploads
-
+tabbedmenu.website.files=File Uploads
-tabbedmenu.website=Weblog Admin
+tabbedmenu.website=Manage
tabbedmenu.website.settings=Settings
tabbedmenu.website.themes=Theme
tabbedmenu.website.pages=Templates
@@ -925,8 +946,30 @@
userAdmin.userAdmin=Administrator
userAdmin.warning=NOTE: This operation cannot be undone !!
+# --------------------------------------------------------------- User register
+
+userRegister.prompt=Use this form to register a new Roller user, please \
+create only one user account per person.
+
+userRegister.button.save=Register User
+userRegister.button.cancel=Cancel
+
+userRegister.tip.fullName=Your full name (with no HTML).
+userRegister.tip.userName=A short one word name for your user account.\
+Please limit it to simple ASCII alphanumeric characters (a-z, A-Z and 0-9) \
+and do not use HTML.
+userRegister.tip.email=Please enter valid email address, the site adminstrator \
+may disable your account if he/she cannot reach you via email.
+userRegister.tip.timeZone=Your prefered timezone.
+userRegister.tip.locale=Your prefered locale.
+userRegister.tip.password=Your password.
+userRegister.tip.passwordConfirm=Confirm your password.
+
# ---------------------------------------------------------------- User settings
+userSettings.button.save=Save Profile
+userSettings.button.cancel=Cancel
+
userSettings.userSettings=User Settings
userSettings.username=Username
userSettings.fullname=Full Name
@@ -946,6 +989,10 @@
# ------------------------------------------------------------------ Weblog edit
+weblogEdit.title.newEntry=New Weblog Entry
+weblogEdit.title.editEntry=Edit Weblog Entry
+weblogEdit.otherSettings=Other Settings
+
weblogEntry.pendingEntrySubject=\
Roller: new post pending review in weblog "{0}" ({1})
@@ -1063,9 +1110,14 @@
# --------------------------------------------------- Weblog Entry Export/Import
-weblogEntryQuery.title=Weblog Entry Archive
-weblogEntryQuery.description=Search weblog entry archives by category, date, and \
-status.
+weblogEntryQuery.title=Weblog Entries
+weblogEntryQuery.description=
+
+weblogEntryQuery.sidebarTitle=Filter Entries
+weblogEntryQuery.sidebarDescription=\
+Filter weblog entries by category, date, and status.
+
+weblogEntryQuery.noneFound=No entries found that match filter criteria.
weblogEntryQuery.filterByCategory=Filter By Category
weblogEntryQuery.filterByPublishTime=Filter By Publish Time
@@ -1087,6 +1139,7 @@
weblogEntryQuery.label.allEntries=All Entries
weblogEntryQuery.label.draftOnly=Draft Only
weblogEntryQuery.label.publishedOnly=Published Only
+weblogEntryQuery.label.pendingOnly=Pending Only
weblogEntryQuery.section.format=Format to be used
@@ -1102,7 +1155,7 @@
weblogEntryQuery.section.searchResults=Search Results
-weblogEntryQuery.button.query=Search
+weblogEntryQuery.button.query=Filter
weblogEntryQuery.button.export=Export
# ------------------------------------------------------------------ Weblog Main
@@ -1159,47 +1212,56 @@
# ----------------------------------------------------------------- Your profile
yourProfile.title=Your Profile
-yourProfile.description=You can change your username, email and password here.
-yourProfile.saved=Changes to your profile have been saved
-yourProfile.unsaved=Unsaved changes, must press Save button to persist
+yourProfile.description=You can change your full name, email and password here.
+yourProfile.saved=Changes to your profile have been saved.
+yourProfile.unsaved=Unsaved changes, must press Save button to persist.
yourProfile.button.save=Save
# ---------------------------------------------------------------- Your Weblogs
-yourWebsites.title=Your Weblogs
+yourWebsites.title=Roller Main Menu: Manage Weblogs
+yourWebsites.shortCuts=Shortcuts
+yourWebsites.actions=Actions
-yourWebsites.noBlogs=You're registered as a user in this Roller blog server, \
-but you don't yet have a blog. Would you like to
-yourWebsites.createAWeblog=create a weblog?
-
-yourWebsites.groupBloggingDisabled=If group blogging was enabled you could \
-use this page to create new weblogs, accept invitations to join other weblogs \
-and pick which weblog you'd like to use. But group blogging is disabled on \
-this server, so you can safely ignore this page.
-
-yourWebsites.groupBloggingEnabled=This page allows you to select which of your \
-weblogs you'd like to work in, accept/decline invitations to join other \
-user's weblogs and create new weblogs.
+yourWebsites.prompt=Your existing weblogs. You may \
+add entries, manage templates, set configurations, etc.
yourWebsites.invited=You've been invited to join the weblog
yourWebsites.accept=accept
yourWebsites.decline=decline
-yourWebsites.websiteTablesPrompt=Click weblog title to select it as your current \
-weblog.
yourWebsites.tableTitle=Title
yourWebsites.tableDescription=Description
yourWebsites.select=Select
yourWebsites.resign=Resign
-yourWebsites.permissions=Permissions
+yourWebsites.permission=Your permission
yourWebsites.confirmResignation=Are you sure you wish to resign from weblog
yourWebsites.youHaveNone=You have no weblogs, would you like to
yourWebsites.youCanCreateOne=create one
yourWebsites.youCannot=Ask your administrator to create one for you.
yourWebsites.notAllowed=Not allowed
+yourWebsites.weblog=Weblog
+yourWebsites.description=Description
+
+yourWebsites.newEntry=New Entry
+yourWebsites.editEntries=Edit Entries
+yourWebsites.manage=Manage
+
+yourWebsites.createWeblog=Create new weblog
+yourWebsites.createWeblog.desc=\
+Feel like you've got more to say? Maybe another weblog is what you need.
+
+yourWebsites.editProfile=Edit user profile
+yourWebsites.editProfile.desc=Change password, contact info, select language.
+
+yourWebsites.globalAdmin=Server administration
+yourWebsites.globalAdmin.desc=Make site-wide administration changes.
+
+yourWebsites.planetAdmin=Planet administration
+yourWebsites.planetAdmin.desc=\
+Manage the planet aggregator. Add feeds, organize groups, set configs.
-yourWebsites.createWebsite=Create new weblog
yourWebsites.invitations=Weblog Invitations
yourWebsites.invitationsPrompt=You have one or more invitations to accept or \
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=232367&r1=232366&r2=232367&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 Fri Aug 12 13:06:04 2005
@@ -12,7 +12,7 @@
#end
<div class="menu-tr">
<div class="menu-tl">
- <a href="$menu.getUrl( $ctx )">$text.get( $menu.getName() )</a>
+ <a href="$menu.getUrl( $ctx )">$text.get( $menu.getName() )</a>
</div>
</div>
</td>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml Fri Aug 12 13:06:04 2005
@@ -1,5 +1,6 @@
<!--
-Defines the Roller Editor GUI menu and roles allowed to use each menu.
+Defines the Roller Weblog Editor/Admin UI menu and roles allowed to use each
+menu. See also, admin-menu.xml, which defines the Global Admin menu.
Each menu or menu item is governed by four attrbibutes:
1) roles: these are the global roles the are allowed to view item
@@ -20,20 +21,6 @@
4) disable property: if true, don't show this menu
-->
<menu-bar>
-
- <menu name="tabbedmenu.main" roles="any" perms="any">
- <menu-item forward="main" name="tabbedmenu.main"
- perms="any" roles="any" />
- <menu-item forward="planet" name="tabbedmenu.planet"
- perms="any" roles="any"
- enabledProperty="planet.aggregator.enabled" />
- <menu-item forward="yourProfile" name="tabbedmenu.website.user"
- perms="any"
- roles="editor,admin" />
- <menu-item forward="yourWebsites" name="tabbedmenu.user.websites"
- perms="any"
- roles="editor,admin" />
- </menu>
<menu name="tabbedmenu.weblog" perms="admin,author,limited">
<menu-item forward="weblogCreate" name="tabbedmenu.weblog.newEntry"
@@ -62,27 +49,6 @@
<menu-item forward="customPingTargets" name="tabbedmenu.weblog.customPingTargets"
disabledProperty="pings.disallowCustomTargets"
perms="admin" />
- </menu>
-
- <menu name="tabbedmenu.admin" roles="admin" perms="any">
- <menu-item forward="rollerConfig" name="tabbedmenu.admin.config"
- roles="admin" perms="any"/>
- <menu-item forward="adminUser" name="tabbedmenu.admin.userAdmin"
- roles="admin" perms="any"/>
- <menu-item forward="createUser" name="tabbedmenu.admin.createUser"
- roles="admin" perms="any"/>
- <menu-item forward="commonPingTargets" name="tabbedmenu.admin.pingTargets"
- roles="admin" perms="any"/>
- </menu>
-
- <menu name="tabbedmenu.planet" roles="admin" perms="any"
- enabledProperty="planet.aggregator.enabled">
- <menu-item forward="planetConfig" name="tabbedmenu.admin.planetConfig"
- roles="admin" perms="any" />
- <menu-item forward="planetSubscriptions" name="tabbedmenu.admin.planetSubscriptions"
- roles="admin" perms="any" />
- <menu-item forward="planetGroups" name="tabbedmenu.admin.planetGroups"
- roles="admin" perms="any" />
</menu>
</menu-bar>
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=232367&r1=232366&r2=232367&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 Fri Aug 12 13:06:04 2005
@@ -4,195 +4,224 @@
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
<tiles-definitions>
-<definition name=".tiles-mainpage" path="/theme/tiles-mainpage.jsp">
+<definition name=".tiles-frontpage" path="/theme/tiles-frontpage.jsp">
<put name="content" value="${content}" />
<put name="sidebar" value="/theme/status.jsp" />
+ <put name="footer" value="/theme/tiles-footer.jsp" />
+ <put name="head" value="/theme/tiles-head.jsp" />
+ <put name="status" value="/theme/status.jsp" />
</definition>
-<!-- for example
-<definition name=".tiles-editorpage" path="/tiles/tiles-mainpage.jsp">
-</definition>
-<definition name=".tiles-adminpage" path="/tiles/tiles-mainpage.jsp">
-</definition>
-<definition name=".tiles-basicpage" path="/tiles/tiles-basicpage.jsp">
+<definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.jsp">
+ <put name="content" value="${content}" />
+ <put name="status" value="/theme/status.jsp" />
+ <put name="sidebar" value="/theme/tiles-sidebar.jsp" />
+ <put name="footer" value="/theme/tiles-footer.jsp" />
+ <put name="head" value="/theme/tiles-head.jsp" />
+</definition>
+
+<definition name=".tiles-editorpage" path="/theme/tiles-editorpage.jsp">
+ <put name="content" value="${content}" />
+ <put name="status" value="/theme/status.jsp" />
+ <put name="sidebar" value="/theme/tiles-sidebar.jsp" />
+ <put name="footer" value="/theme/tiles-footer.jsp" />
+ <put name="head" value="/theme/tiles-head.jsp" />
+ <put name="messages" value="/theme/messages.jsp" />
+</definition>
+
+<definition name=".tiles-adminpage" path="/theme/tiles-adminpage.jsp">
+ <put name="content" value="${content}" />
+ <put name="status" value="/theme/status.jsp" />
+ <put name="sidebar" value="/theme/tiles-sidebar.jsp" />
+ <put name="footer" value="/theme/tiles-footer.jsp" />
+ <put name="head" value="/theme/tiles-head.jsp" />
+ <put name="messages" value="/theme/messages.jsp" />
+</definition>
+
+<definition name=".tiles-simplepage" path="/theme/tiles-simplepage.jsp">
+ <put name="content" value="${content}" />
+ <put name="status" value="/theme/status.jsp" />
+ <put name="footer" value="/theme/tiles-footer.jsp" />
+ <put name="head" value="/theme/tiles-head.jsp" />
+ <put name="messages" value="/theme/messages.jsp" />
</definition>
--->
-<definition name=".main" extends=".tiles-mainpage" >
+<definition name=".main" extends=".tiles-frontpage" >
<put name="content" value="/main.jsp" />
<put name="sidebar" value="/main-sidebar.jsp" />
</definition>
-<definition name=".planet" extends=".tiles-mainpage" >
+<definition name=".planet" extends=".tiles-frontpage" >
<put name="content" value="/planet.jsp" />
</definition>
-<definition name=".WeblogEdit" extends=".tiles-mainpage" >
+<!-- main menu pages (and associates) -->
+
+<definition name=".YourWebsites" extends=".tiles-mainmenupage" >
+ <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>
+<definition name=".CreateWebsite" extends=".tiles-simplepage" >
+ <put name="content" value="/website/CreateWebsite.jsp" />
+</definition>
+<definition name=".CreateWebsiteDone" extends=".tiles-simplepage" >
+ <put name="content" value="/website/CreateWebsiteDone.jsp" />
+</definition>
+<definition name=".welcome" extends=".tiles-simplepage" >
+ <put name="content" value="/website/welcome.jsp" />
+</definition>
+
+
+<!-- weblog editor pages (and associates) -->
+
+<definition name=".WeblogEdit" extends=".tiles-editorpage" >
<put name="content" value="/weblog/WeblogEdit.jsp" />
<put name="sidebar" value="/weblog/WeblogEditSidebar.jsp" />
</definition>
-<definition name=".WeblogQuery" extends=".tiles-mainpage" >
+<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-mainpage" >
+
+<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-mainpage" >
+<definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CategoryDeleteOK.jsp" />
</definition>
-<definition name=".CategoryForm" extends=".tiles-mainpage" >
+<definition name=".CategoryForm" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CategoryForm.jsp" />
</definition>
-<definition name=".export-entries" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/export-entries.jsp" />
+
+<definition name=".referers" extends=".tiles-editorpage" >
+ <put name="content" value="/weblog/referers.jsp" />
+</definition>
+
+
+<!-- weblog admin pages (and associates) -->
+
+<definition name=".CustomPingTargets" extends=".tiles-editorpage" >
+ <put name="content" value="/weblog/CustomPingTargets.jsp" />
</definition>
-<definition name=".CustomPingTargetEdit" extends=".tiles-mainpage" >
+<definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
</definition>
-<definition name=".PingResult" extends=".tiles-mainpage" >
+<definition name=".PingResult" extends=".tiles-editorpage" >
<put name="content" value="/weblog/PingResult.jsp" />
</definition>
-<definition name=".spellcheck-entry" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/spellcheck-entry.jsp" />
-</definition>
-<definition name=".Pings" extends=".tiles-mainpage" >
+<definition name=".Pings" extends=".tiles-editorpage" >
<put name="content" value="/weblog/Pings.jsp" />
</definition>
-<definition name=".CustomPingTargetDeleteOK" extends=".tiles-mainpage" >
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
</definition>
-<definition name=".referers" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/referers.jsp" />
-</definition>
-<definition name=".bake-weblog" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/bake-weblog.jsp" />
-</definition>
-<definition name=".WeblogEntryRemove" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
-</definition>
-<definition name=".CustomPingTargets" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/CustomPingTargets.jsp" />
-</definition>
-<definition name=".import-entries" extends=".tiles-mainpage" >
- <put name="content" value="/weblog/import-entries.jsp" />
-</definition>
-
-
-<definition name=".PlanetSubscriptions" extends=".tiles-mainpage" >
- <put name="content" value="/planet/PlanetSubscriptions.jsp" />
-</definition>
-<definition name=".PlanetConfig" extends=".tiles-mainpage" >
- <put name="content" value="/planet/PlanetConfig.jsp" />
-</definition>
-<definition name=".PlanetGroups" extends=".tiles-mainpage" >
- <put name="content" value="/planet/PlanetGroups.jsp" />
-</definition>
-
-<definition name=".BookmarksForm" extends=".tiles-mainpage" >
+<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-mainpage" >
+<definition name=".BookmarkForm" extends=".tiles-editorpage" >
<put name="content" value="/bookmarks/BookmarkForm.jsp" />
</definition>
-<definition name=".import" extends=".tiles-mainpage" >
+<definition name=".import" extends=".tiles-editorpage" >
<put name="content" value="/bookmarks/import.jsp" />
</definition>
-<definition name=".FolderForm" extends=".tiles-mainpage" >
+<definition name=".FolderForm" extends=".tiles-editorpage" >
<put name="content" value="/bookmarks/FolderForm.jsp" />
</definition>
-
-<definition name=".InviteMemberDone" extends=".tiles-mainpage" >
- <put name="content" value="/website/InviteMemberDone.jsp" />
-</definition>
-<definition name=".edit-website" extends=".tiles-mainpage" >
+<definition name=".edit-website" extends=".tiles-editorpage" >
<put name="content" value="/website/edit-website.jsp" />
</definition>
-<definition name=".InviteMember" extends=".tiles-mainpage" >
+<definition name=".InviteMember" extends=".tiles-editorpage" >
<put name="content" value="/website/InviteMember.jsp" />
</definition>
-<definition name=".CreateWebsite" extends=".tiles-mainpage" >
- <put name="content" value="/website/CreateWebsite.jsp" />
+<definition name=".InviteMemberDone" extends=".tiles-editorpage" >
+ <put name="content" value="/website/InviteMemberDone.jsp" />
</definition>
-<definition name=".theme-editor" extends=".tiles-mainpage" >
+<definition name=".theme-editor" extends=".tiles-editorpage" >
<put name="content" value="/website/theme-editor.jsp" />
</definition>
-<definition name=".UserAdmin" extends=".tiles-mainpage" >
- <put name="content" value="/website/UserAdmin.jsp" />
-</definition>
-<definition name=".UserNew" extends=".tiles-mainpage" >
- <put name="content" value="/website/UserNew.jsp" />
-</definition>
-<definition name=".welcome" extends=".tiles-mainpage" >
- <put name="content" value="/website/welcome.jsp" />
-</definition>
-<definition name=".edit-page" extends=".tiles-mainpage" >
+<definition name=".edit-page" extends=".tiles-editorpage" >
<put name="content" value="/website/edit-page.jsp" />
</definition>
-<definition name=".CommonPingTargetDeleteOK" extends=".tiles-mainpage" >
- <put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
+<definition name=".upload-file" extends=".tiles-editorpage" >
+ <put name="content" value="/website/upload-file.jsp" />
</definition>
-<definition name=".CommonPingTargetEdit" extends=".tiles-mainpage" >
- <put name="content" value="/website/CommonPingTargetEdit.jsp" />
+<definition name=".MemberPermissions" extends=".tiles-editorpage" >
+ <put name="content" value="/website/MemberPermissions.jsp" />
</definition>
-<definition name=".CreateWebsiteDone" extends=".tiles-mainpage" >
- <put name="content" value="/website/CreateWebsiteDone.jsp" />
+<definition name=".remove-page" extends=".tiles-editorpage" >
+ <put name="content" value="/website/remove-page.jsp" />
</definition>
-<definition name=".YourWebsitesSidebar" extends=".tiles-mainpage" >
- <put name="content" value="/website/YourWebsitesSidebar.jsp" />
+<definition name=".edit-pages" extends=".tiles-editorpage" >
+ <put name="content" value="/website/edit-pages.jsp" />
</definition>
-<definition name=".CommonPingTargets" extends=".tiles-mainpage" >
- <put name="content" value="/website/CommonPingTargets.jsp" />
+<definition name=".Maintenance" extends=".tiles-editorpage" >
+ <put name="content" value="/website/Maintenance.jsp" />
</definition>
-<definition name=".upload-file" extends=".tiles-mainpage" >
- <put name="content" value="/website/upload-file.jsp" />
+
+
+<!-- global admin pages (and associates) -->
+
+<definition name=".rollerProperties" extends=".tiles-adminpage" >
+ <put name="content" value="/website/rollerProperties.jsp" />
</definition>
-<definition name=".MemberPermissions" extends=".tiles-mainpage" >
- <put name="content" value="/website/MemberPermissions.jsp" />
+<definition name=".UserAdmin" extends=".tiles-adminpage" >
+ <put name="content" value="/website/UserAdmin.jsp" />
</definition>
-<definition name=".YourWebsites" extends=".tiles-mainpage" >
- <put name="content" value="/website/YourWebsites.jsp" />
+<definition name=".UserNew" extends=".tiles-adminpage" >
+ <put name="content" value="/website/UserNew.jsp" />
</definition>
-<definition name=".remove-page" extends=".tiles-mainpage" >
- <put name="content" value="/website/remove-page.jsp" />
+<definition name=".CommonPingTargets" extends=".tiles-adminpage" >
+ <put name="content" value="/website/CommonPingTargets.jsp" />
</definition>
-<definition name=".rollerProperties" extends=".tiles-mainpage" >
- <put name="content" value="/website/rollerProperties.jsp" />
+<definition name=".CommonPingTargetDeleteOK" extends=".tiles-adminpage" >
+ <put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
</definition>
-<definition name=".YourProfile" extends=".tiles-mainpage" >
- <put name="content" value="/website/YourProfile.jsp" />
+<definition name=".CommonPingTargetEdit" extends=".tiles-adminpage" >
+ <put name="content" value="/website/CommonPingTargetEdit.jsp" />
</definition>
-<definition name=".edit-pages" extends=".tiles-mainpage" >
- <put name="content" value="/website/edit-pages.jsp" />
+
+
+<definition name=".PlanetSubscriptions" extends=".tiles-adminpage" >
+ <put name="content" value="/planet/PlanetSubscriptions.jsp" />
</definition>
-<definition name=".Maintenance" extends=".tiles-mainpage" >
- <put name="content" value="/website/Maintenance.jsp" />
+<definition name=".PlanetConfig" extends=".tiles-adminpage" >
+ <put name="content" value="/planet/PlanetConfig.jsp" />
+</definition>
+<definition name=".PlanetGroups" extends=".tiles-adminpage" >
+ <put name="content" value="/planet/PlanetGroups.jsp" />
</definition>
-<definition name=".taglibs" extends=".tiles-mainpage" >
- <put name="content" value="/taglibs.jsp" />
-</definition>
-<definition name=".denied" extends=".tiles-mainpage" >
+<!-- Misc login and error pages -->
+
+<definition name=".denied" extends=".tiles-simplepage" >
<put name="content" value="/denied.jsp" />
</definition>
-<definition name=".error" extends=".tiles-mainpage" >
+<definition name=".error" extends=".tiles-simplepage" >
<put name="content" value="/error.jsp" />
</definition>
-<definition name=".login" extends=".tiles-mainpage" >
+<definition name=".login" extends=".tiles-simplepage" >
<put name="content" value="/login.jsp" />
</definition>
-<definition name=".error403" extends=".tiles-mainpage" >
+<definition name=".error403" extends=".tiles-simplepage" >
<put name="content" value="/error403.jsp" />
</definition>
-<definition name=".error404" extends=".tiles-mainpage" >
+<definition name=".error404" extends=".tiles-simplepage" >
<put name="content" value="/error404.jsp" />
</definition>
-<definition name=".loginerror" extends=".tiles-mainpage" >
+<definition name=".loginerror" extends=".tiles-simplepage" >
<put name="content" value="/loginerror.jsp" />
</definition>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp Fri Aug 12 13:06:04 2005
@@ -1,16 +1,13 @@
<%@ include file="/taglibs.jsp" %>
-<%@ include file="/theme/status.jsp" %>
-<table class="sidebarBox" >
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="mainPage.actions" />
- </div></div>
- </td>
- </tr>
- <tr>
- <td>
-
+
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
+
+ <h3><fmt:message key="mainPage.actions" /></h3>
+ <hr />
+
<p>
<%-- Add Bookmark link --%>
<img src='<c:url value="/images/BookmarkNew16.png"/>' border="0"alt="icon" />
@@ -31,9 +28,11 @@
<fmt:message key="bookmarksForm.addFolder" />
</roller:link>
</p>
+ <br />
+ <br />
+ <br />
- </td>
- </tr>
-</table>
-
-<br />
+ </div>
+ </div>
+ </div>
+</div>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Fri Aug 12 13:06:04 2005
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<% try { %><%@ page import="org.roller.model.Roller" %>
+<%@ page import="org.roller.model.Roller" %>
<%@ page import="org.roller.pojos.UserData" %>
<%@ page import="org.roller.presentation.RollerRequest" %>
<%@ include file="/taglibs.jsp" %>
Modified: incubator/roller/branches/roller_2.0/web/error403.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error403.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error403.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error403.jsp Fri Aug 12 13:06:04 2005
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<% try { %><%@ page import="org.roller.model.Roller" %>
+<%@ page import="org.roller.model.Roller" %>
<%@ page import="org.roller.pojos.UserData" %>
<%@ page import="org.roller.presentation.RollerRequest" %>
<%@ include file="/taglibs.jsp" %>
Modified: incubator/roller/branches/roller_2.0/web/error404.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error404.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error404.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error404.jsp Fri Aug 12 13:06:04 2005
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<% try { %><%@ page import="org.roller.model.Roller" %>
+<%@ page import="org.roller.model.Roller" %>
<%@ page import="org.roller.pojos.UserData" %>
<%@ page import="org.roller.presentation.RollerRequest" %>
<%@ include file="/taglibs.jsp" %>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Fri Aug 12 13:06:04 2005
@@ -25,97 +25,110 @@
<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="wrapper">
+
+ <div id="banner">
+ </div>
-<div id="banner">
-</div>
-
-<div id="loginTable">
-
-<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>
+ <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">
-<!--
+ <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();
+ 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();
+ }
}
- } 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> <!-- end centercontent -->
-
-</div>
+ 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 id="rightcontent">
+ </div>
+
+ <div id="rightcontent">
+ </div>
+
+ <div id="footer">
+ <tiles:insert attribute="footer" />
+ </div>
+
</div>
-
-</div> <!-- end wrapper -->
-
</body>
</html>
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Fri Aug 12 13:06:04 2005
@@ -1,19 +1,11 @@
<%@ include file="/taglibs.jsp" %>
-<%@ include file="/theme/status.jsp" %>
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
-<table class="sidebarBox">
-
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
<fmt:message key="mainPage.searchWeblogs" />
- </div></div>
- </td>
- </tr>
-
- <tr>
- <td>
<form id="searchForm" method="get"
action="<c:out value="${baseURL}" />/search"
@@ -32,28 +24,26 @@
}
return true;
}
- // --!>
+ // -->
</script>
- </td>
- </tr>
-
-</table>
+ <br />
+ <br />
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>
<br />
-<table class="sidebarBox">
+<div class="sidebarfade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <div class="sidebarBody">
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
<fmt:message key="mainPage.hotWeblogs" />
- </div></div>
- </td>
- </tr>
-
- <tr>
- <td>
<c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
<ul style="list-style-type:none; padding-left:2px; margin: 0px">
@@ -70,12 +60,14 @@
</ul>
</c:if>
- </td>
- </tr>
-
-</table>
-
-<br />
+ <br />
+ <br />
+ <br />
+
+ </div>
+ </div>
+ </div>
+</div>
Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Fri Aug 12 13:06:04 2005
@@ -1,5 +1,7 @@
-
-<%-- replaced by tiles --%>
+<%--
+we now use Tiles, but for now the header.jsp and footer.jsp
+includes have been left in place in the JSP files.
+--%>
Modified: incubator/roller/branches/roller_2.0/web/theme/header.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/header.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/header.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/header.jsp Fri Aug 12 13:06:04 2005
@@ -1,3 +1,4 @@
-
-<%-- replaced by tiles --%>
-
+<%--
+we now use Tiles, but for now the header.jsp and footer.jsp
+includes have been left in place in the JSP files.
+--%>
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=232367&r1=232366&r2=232367&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=232367&r1=232366&r2=232367&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/roller/branches/roller_2.0/web/theme/images/two-bottomgrey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/two-bottomgrey.png?rev=232367&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_2.0/web/theme/images/two-bottomgrey.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 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=232367&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_2.0/web/theme/images/two-sidebarfade.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 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=232367&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_2.0/web/theme/images/two-togglegrey.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/branches/roller_2.0/web/theme/images/two-topgrey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/images/two-topgrey.png?rev=232367&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/branches/roller_2.0/web/theme/images/two-topgrey.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Fri Aug 12 13:06:04 2005
@@ -1,53 +1,34 @@
-/* ======================================================================
-layout.css: CSS styles for layout of Roller editor/admin UI
-Uses blue robot layout - http://bluerobot.com/web/layouts/layout2.html
-====================================================================== */
+
+#wrapper {
+ margin: 20px;
+ height: 100%;
+}
#banner {
- margin:0px 0px 10px 0px;
- padding:17px 0px 0px 20px;
- /* For IE5/Win's benefit height = [correct height] + [top padding] + [top and bottom border widths] */
- height:33px; /* 14px + 17px + 2px = 33px */
- border-style:solid;
- border-color:black;
- border-width:1px 0px; /* top and bottom borders: 1px; left and right borders: 0px */
- line-height:11px;
- background-color:#eee;
-
-/* Here is the ugly brilliant hack that protects IE5/Win from its own stupidity.
-Thanks to Tantek Celik for the hack and to Eric Costello for publicizing it.
-IE5/Win incorrectly parses the "\"}"" value, prematurely closing the style
-declaration. The incorrect IE5/Win value is above, while the correct value is
-below. See http://glish.com/css/hacks.asp for details. */
- voice-family: "\"}\"";
- voice-family:inherit;
- height:14px; /* the correct height */
- }
-/* I've heard this called the "be nice to Opera 5" rule. Basically, it feeds correct
-length values to user agents that exhibit the parsing error exploited above yet get
-the CSS box model right and understand the CSS2 parent-child selector. ALWAYS include
-a "be nice to Opera 5" rule every time you use the Tantek Celik hack (above). */
-body>#banner {height:14px;}
+ height: 90px;
+}
+
+#footer {
+ margin: 0px;
+ width: 100%;
+}
+
+.bannerBox td, table.bannerBox {
+ height: 15px;
+}
#centercontent {
- margin:0px 210px 50px 10px;
- padding:10px;
- }
+ margin: 0px 220px 15px 15px;
+ padding: 0px 50px 0px 0px;
+}
#rightcontent {
- position:absolute;
- top:50px;
- right:20px;
- width:185px;
- padding:5px;
- line-height:17px;
-/* Again, the ugly brilliant hack. */
- voice-family: "\"}\"";
- voice-family:inherit;
- width:185px;
- }
-/* Again, "be nice to Opera 5". */
-body>#Menu {width:150px;}
+ position: absolute;
+ top: 106px;
+ right: 15px;
+ width: 230px;
+ padding: 20px;
+}
div#loginTable {
margin: 20px;
@@ -57,42 +38,3 @@
width: 350px;
}
-/*
-div#header {
- border-top: 1px solid white;
- background: white;
-}
-
-div#content {
- margin: 0 0 0 0px;
- padding: 10px;
- padding-top: 0;
-}
-
-div#sidebar {
- position: absolute;
- right: 0px;
- width: 136px;
- padding: 10px;
-}
-
-div#footer {
- margin-top:40px;
- border-top: 1px gray dotted;
- width: 100%;
- text-align: left;
-}
-
-div#separator {
- background: transparent;
- border-top: 1px solid #C0C0C0;
- color: #666666;
- font-size: 0.9em;
- margin-top: 30px;
- padding: 5px 0px 10px 5px;
- text-align: left;
-}
-
-*/
-
-
Modified: incubator/roller/branches/roller_2.0/web/theme/menu.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu.css?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Fri Aug 12 13:06:04 2005
@@ -1,63 +1,58 @@
.menuTabTable {
- height: 25px;
+ height: 25px;
}
td.menuTabSeparator {
width: 10px;
}
td.menuTabSelected {
- padding: 0px; margin: 0px;
- background-color: #CCCC99;
- /* background-image: url(images/menutab-sel.png);
- background-repeat: no-repeat; */
+ padding: 0px;
+ margin: 0px;
+ font-weight: bold;
+ background: url("images/menutab-sel.png");
}
td.menuTabUnselected {
- padding: 0px; margin: 0px;
- background-color: #AAAA77;
- /* background-image: url(images/menutab-unsel.png);
- background-repeat: no-repeat; */
+ padding: 0px;
+ margin: 0px;
+ background: url("images/menutab-unsel.png");
}
div.menu-tl {
padding: 5px 5px 0px 5px; margin: 0px; height:100%;
- background:url("images/menutab-tl.png") no-repeat left top;
+ background: url("images/menutab-tl.png") no-repeat left top;
background-repeat: no-repeat;
}
div.menu-tr {
margin: 0px; height:100%;
- background:url("images/menutab-tr.png") no-repeat right top;
+ background: url("images/menutab-tr.png") no-repeat right top;
background-repeat: no-repeat;
}
-
-
.menuItemTable {
width: 100%;
height: 25px;
- background-color: #CCCC99;
- /* background-image: url(images/menubar.png);
- background-repeat: repeat-x; */
+ background-color: #5241b5;
}
.menuItem {
padding: 0px 5px 0px 5px; /* TRBL */
- }
-.menuItemTable a:link, .menuTabTable a:link {
- color: black;
- text-decoration: none;
+}
+.menuItemSelected {
font-weight: bold;
}
-.menuItemTable a:visited, .menuTabTable a:visited {
- color: black;
+
+.menuItemTable a:link, .menuItemTable a:visited, .menuItemTable a:hover, .menuItemTable a:active {
+ color: white;
text-decoration: none;
- font-weight: bold;
}
-.menuItemTable a:hover, .menuTabTable a:hover {
- color: black;
- text-decoration: underline;
- font-weight: bold;
+
+.menuTabTable a:link, .menuTabTable a:visited, .menuTabTable a:hover, .menuTabTable a:active {
+ color: white;
+ text-decoration: none;
}
-.menuItemTable a:active, .menuTabTable a:active {
+
+.menuTabUnselected a:link, .menuTabUnselected a:visited, .menuTabUnselected a:hover, .menuTabUnselected a:active {
color: black;
text-decoration: none;
- font-weight: bold;
}
+
+
Modified: incubator/roller/branches/roller_2.0/web/theme/messages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/messages.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/messages.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/messages.jsp Fri Aug 12 13:06:04 2005
@@ -1,18 +1,17 @@
-
-<% try { %>
-<script type="text/javascript">
-<!--
-function dirty() {
- messages = document.getElementById("messages");
- if (messages != null) {
- messages.className = "warnings";
- var n1 = messages.childNodes[0];
- var n2 = document.createTextNode("Unsaved changes");
- messages.replaceChild(n2, n1);
- }
-}
--->
-</script>
+<%@ include file="/taglibs.jsp" %>
+<script type="text/javascript">
+<!--
+function dirty() {
+ messages = document.getElementById("messages");
+ if (messages != null) {
+ messages.className = "warnings";
+ var n1 = messages.childNodes[0];
+ var n2 = document.createTextNode("Unsaved changes");
+ messages.replaceChild(n2, n1);
+ }
+}
+-->
+</script>
<%-- Error Messages --%>
<logic:messagesPresent>
@@ -32,4 +31,3 @@
</div>
</logic:messagesPresent>
-<% } catch (Throwable e) { e.printStackTrace(); } %>
Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Fri Aug 12 13:06:04 2005
@@ -6,18 +6,26 @@
Editor look and feel styles
---------------------------------------------------------------------- */
-#banner {
- background-color: #CCCC99;
+#wrapper {
+ background: white;
}
-
-td.sidebarBox {
- height:25px;
- padding: 0px; margin: 0px;
- background-color: #CCCC99;
+
+table.bannerBox {
+ width: 100%;
+ background: url("images/two-topgrey.png") repeat-x top;
}
-table.sidebarBox {
- width:100%;
+#footer {
+ padding: 4px;
+}
+
+.sidebarfade {
+ padding: 0px;
+ width: 100%;
+ background: url("images/two-sidebarfade.png") repeat-x top;
+}
+.sidebarfadeBody {
+ padding: 0px 5px 0px 5px;
}
/* ----------------------------------------------------------------------
@@ -25,20 +33,19 @@
---------------------------------------------------------------------- */
body {
- height:100%;
- background: white;
+ height: 100%;
+ background: grey;
margin: 0;
padding: 0;
- font:small Verdana,Arial,Sans-serif;
- color:black;
- font:x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
+ font: small Verdana,Arial,Sans-serif;
+ font: x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
font-size: 69%;
}
input, select, option {
- font:small Verdana,Arial,Sans-serif;
- color:black;
- font:small/1.5em Verdana, Arial, Helvetica, sans-serif;
+ font: small Verdana,Arial,Sans-serif;
+ color: black;
+ font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
font-size: 100%;
}
@@ -49,7 +56,7 @@
h1 {
background: transparent;
- color: #A0A060;
+ color: #e93e3e;
letter-spacing: 0.2em;
font-size: x-large;
font-weight: bold;
@@ -57,7 +64,7 @@
h2 {
background: transparent;
- color: #A0A060;
+ color: #e93e3e;
letter-spacing: 0.2em;
font-size: large;
font-weight: bold;
@@ -65,11 +72,15 @@
h3 {
background: transparent;
- color: #A0A060;
+ color: #e93e3e;
letter-spacing: 0.2em;
font-weight: bold;
}
+div.sidebarfade h3 {
+ margin: 0px; padding: 0px;
+}
+
img {
border: 0px;
}
@@ -88,25 +99,21 @@
a:link {
background: transparent;
- font-weight: bold;
- color: #A0A060;
+ color: #5241b5;
text-decoration: underline;
}
a:visited {
background: transparent;
- font-weight: bold;
- color: #A0A060;
+ color: #5241b5;
text-decoration: underline;
}
a:hover {
- font-weight: bold;
text-decoration: none;
}
a:active {
- font-weight: bold;
text-decoration: underline overline;
}
@@ -134,8 +141,7 @@
div.entryTitleBox {
padding: 3px;
margin: 3px;
- border: 1px #A0A060 solid;
- background: #c0c080;
+ background: #5241b5;
color: white;
font-size: medium;
}
@@ -154,6 +160,7 @@
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+ color: #e93e3e;
font-size: medium;
font-weight: bold;
}
@@ -185,16 +192,17 @@
table.rollertable {
border-collapse: collapse;
- width: 90%;
+ width: 100%;
}
-table.rollertable th, table.rollertable thead th {
+table.rollertable th, table.rollertable th {
border: 1px solid #ccc;
- background: #CCCC99;
+ background: #5241b5;
}
-table.rollertable thead th {
- font-size: 1em;
+table.rollertable th {
+ font-size: 1.5em;
+ color: white;
}
table.rollertable td, table.rollertable tbody td {
@@ -213,7 +221,7 @@
.rollertable_even td {
border: 1px solid #ccc;
background: #EEEEEE;
- color: inherit;
+ color: white;
vertical-align: top;
}
@@ -221,6 +229,7 @@
border: 1px solid #ccc;
background: inherit;
vertical-align: top;
+ color: white;
}
td.rollertable_entry, div.rollertable_entry {
@@ -441,6 +450,18 @@
padding-right: 1em;
}
+div.sideformrow {
+ float: left:
+ width: 80%;
+}
+
+label.formrow {
+ float: left;
+ text-align: right;
+ width: 30%;
+ padding-right: 1em;
+}
+
div.buttonBox {
width: 98%;
border: 1px solid black;
@@ -475,7 +496,7 @@
div.centerTitle {
border: 1px solid #ccc;
- background: #CCCC99;
+ background: #5a86a5;
color: black;
font-weight: bolder;
font-size: large;
@@ -483,19 +504,17 @@
}
div.control {
- width: 90%;
- background: #CCCC99;
+ width: 100%;
+ background: #5241b5;
padding: 4px;
margin: 5px 5px 5px 0px;
}
div.controlToggle {
- width: 90%;
- color: black;
- background: #CCCC99;
+ width: 100%;
padding: 4px;
- margin: 5px 5px 5px 0px;
- border: 1px solid #c0c0c0;
+ margin: 5px 5px 5px 0px;
+ background: url("images/two-togglegrey.png") repeat-x top;
}
a.controlToggle {
Modified: incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js (original)
+++ incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js Fri Aug 12 13:06:04 2005
@@ -136,12 +136,10 @@
toggle = document.getElementById(toggleId);
if (target.style.display == "none") {
target.style.display = "";
- toggle.style.background = "#CCCC99";
expanded = true;
} else {
- target.style.display = "none";
- toggle.style.background = "#CCCC99";
+ target.style.display = "none";
expanded = false;
}
togglePlusMinus("i" + targetId);
Modified: incubator/roller/branches/roller_2.0/web/theme/status.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/status.jsp?rev=232367&r1=232366&r2=232367&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/status.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/status.jsp Fri Aug 12 13:06:04 2005
@@ -7,40 +7,37 @@
String absURL = rctx.getAbsoluteContextUrl(request);
boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
%>
-<br />
-
-<table class="sidebarBox">
- <tr>
- <td class="sidebarBox">
- <div class="menu-tr"><div class="menu-tl">
- <fmt:message key="mainPage.status" />
- </div></div>
- </td>
- </tr>
+<table class="bannerBox">
<tr>
- <td>
+
+ <td align="left">
<% if (user != null) { %>
- <fmt:message key="mainPage.loggedInAs" />:<br />
- [<b><%= user.getUserName() %></b>].<br />
+ <fmt:message key="mainPage.loggedInAs" />:
+ [<b><%= user.getUserName() %></b>].
<% if (website != null) { %>
- <fmt:message key="mainPage.currentWebsite" />:<br />
- [<b><a href='<%= absURL + "/page/" + website.getHandle() %>'><%= website.getHandle() %></a></b>]<br />
+ <fmt:message key="mainPage.currentWebsite" />:
+ [<b><a href='<%= absURL + "/page/" + website.getHandle() %>'><%= website.getHandle() %></a></b>]
<% } %>
- <fmt:message key="navigationBar.youMay" />
- <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
+ <% } %>
+ </td>
+
+ <td align="right">
+ <roller:link forward="yourWebsites">
+ <fmt:message key="mainPage.mainMenu" />
+ </roller:link>
+ <% if (user != null) { %>
+ | <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
<% } else if (allowNewUsers) { %>
- <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
- <br /><br />
- <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
+ | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+ | <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
<% } else { %>
- <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+ | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
<% } %>
</td>
+
</tr>
</table>
-
-<br />
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,35 @@
+<% 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" %><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" />
+ <tiles:insert attribute="head" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+</head>
+<body>
+
+<div id="wrapper">
+
+ <div id="banner">
+ <tiles:insert attribute="status" /><br />
+ <roller:Menu model="admin-menu.xml" view="/menu-tabbed.vm" />
+ </div>
+
+ <div id="centercontent">
+ <tiles:insert attribute="messages" />
+ <tiles:insert attribute="content" />
+ </div>
+
+ <div id="rightcontent">
+ <tiles:insert attribute="sidebar" />
+ </div>
+
+ <div id="footer" class="clearfix">
+ <tiles:insert attribute="footer" />
+ </div>
+
+</div>
+</body>
+</html>
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,37 @@
+<% 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" %><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" />
+ <tiles:insert attribute="head" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+</head>
+<body>
+<div id="wrapper">
+
+ <div id="banner">
+ <tiles:insert attribute="status" /><br />
+ <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
+ </div>
+
+ <div id="leftcontent">
+ </div>
+
+ <div id="centercontent">
+ <tiles:insert attribute="messages" />
+ <tiles:insert attribute="content" />
+ </div>
+
+ <div id="rightcontent">
+ <tiles:insert attribute="sidebar" />
+ </div>
+
+ <div id="footer">
+ <tiles:insert attribute="footer" />
+ </div>
+
+</div>
+</body>
+</html>
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,21 @@
+<%@ include file="/taglibs.jsp" %>
+<br />
+<br />
+<br />
+<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>
+
+
+
Added: incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp?rev=232367&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp Fri Aug 12 13:06:04 2005
@@ -0,0 +1,53 @@
+<% 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" %><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" />
+ <tiles:insert attribute="head" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+<style type="text/css">
+#banner {
+ height: 30px;
+}
+#centercontent {
+ margin: 0px 240px 15px 15px;
+ padding: 0px 25px 0px 0px;
+}
+#rightcontent {
+ position: absolute;
+ top: 50px;
+ right: 15px;
+ width: 230px;
+ padding: 20px;
+}
+</style>
+</head>
+<body>
+
+<div id="wrapper">
+
+ <div id="banner">
+ <tiles:insert attribute="status" /><br />
+ </div>
+
+ <div id="leftcontent">
+ </div>
+
+ <div id="centercontent">
+ <tiles:insert attribute="content" />
+ </div>
+
+ <div id="rightcontent">
+ <tiles:insert attribute="sidebar" />
+ </div>
+
+ <div id="footer">
+ <tiles:insert attribute="footer" />
+ </div>
+
+</div>
+
+</body>
+</html>