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/04 21:01:38 UTC
svn commit: r227447 - in /incubator/roller/branches/roller_2.0:
src/org/roller/pojos/ src/org/roller/presentation/
src/org/roller/presentation/website/actions/ web/ web/WEB-INF/
web/WEB-INF/classes/ web/planet/ web/theme/ web/website/
Author: snoopdave
Date: Thu Aug 4 12:01:27 2005
New Revision: 227447
URL: http://svn.apache.org/viewcvs?rev=227447&view=rev
Log:
Further refinements to group blogging UI and it's now possible to disable group blogging features
Added:
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
Removed:
incubator/roller/branches/roller_2.0/web/WEB-INF/roller-config.xml
incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.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/roller.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
incubator/roller/branches/roller_2.0/web/taglibs.jsp
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/website/InviteMember.jsp
incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp
incubator/roller/branches/roller_2.0/web/website/MemberPermissions.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/src/org/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java Thu Aug 4 12:01:27 2005
@@ -734,5 +734,39 @@
}
return false;
}
+
+ /** Get number of users associated with website */
+ public int getUserCount()
+ {
+ return getPermissions().size();
+ }
+
+ /** No-op needed to please XDoclet generated code */
+ public void setUserCount()
+ {
+ // no-op
+ }
+
+ public int getAdminUserCount()
+ {
+ int count = 0;
+ PermissionsData userPerms = null;
+ Iterator iter = getPermissions().iterator();
+ while (iter.hasNext())
+ {
+ PermissionsData perms = (PermissionsData) iter.next();
+ if (perms.getPermissionMask() == PermissionsData.ADMIN)
+ {
+ count++;
+ }
+ }
+ return count;
+ }
+
+ /** No-op needed to please XDoclet generated code */
+ public void setAdminUserCount()
+ {
+ // no-op
+ }
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.java?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.java Thu Aug 4 12:01:27 2005
@@ -485,115 +485,6 @@
}
//-----------------------------------------------------------------------
- /**
- * Read Roller configuration parameters from roller-config.xml.
- */
- /* no longer needed now that we have a new config system -- Allen G.
- private void setupRollerConfig() throws RollerException
- {
- mConfig = getRoller(null).getConfigManager().getRollerConfig();
- if (mConfig == null)
- {
- // No entry in the rollerconfig table means that we are upgading to
- // Roller 0.9.9. To upgrade, we need to read the values from the
- // existing roller-config.xml and write them to the rollerconfig table.
- String configPath = getConfigPath();
- mConfig = getRoller(null).getConfigManager().readFromFile(configPath);
-
- // Roller 0.9.9 uses roles for security, so create an admin role for
- // each of the admin users listed in the roller-config.xml file.
- String adminUsers[] = mConfig.adminUsersArray();
- for (int i=0; i<adminUsers.length; i++)
- {
- UserData user =
- getRoller(null).getUserManager().getUser(adminUsers[i]);
- if (user != null)
- {
- RoleData role = new RoleData(null, user, "admin");
- role.save();
- }
- }
-
- // By setting the database version to null here, we ensure that the
- // rest of the database tables will be upgraded to 0.9.9.
- mConfig.setDatabaseVersion(null);
-
- saveRollerConfig(mConfig);
- }
- }
- */
-
- //-----------------------------------------------------------------------
- /* Unused method ... this is the wrong place for this anyways -- Allen G.
- public void saveRollerConfig(RollerConfigData rConfig) throws RollerException
- {
- mConfig = rConfig;
-
- // save database copy
- //getRoller(null).begin(); // begin already called by RequestFilter
- getRoller(null).getConfigManager().storeRollerConfig(rConfig);
- getRoller(null).commit();
-
- // save file copy
- OldRollerConfig rConfigFile = new OldRollerConfig(rConfig);
- rConfigFile.writeConfig(getConfigPath());
- }
- */
-
- //-----------------------------------------------------------------------
-
- /**
- * Determine where we should read/write roller-config.xml to.
- * A file in ${user.home} overrides one in WEB-INF.
- */
- /* Unused old method -- Allen G.
- public String getConfigPath()
- {
- String configPath =
- System.getProperty("user.home")
- + File.separator
- + "roller-config.xml";
-
- if (mLogger.isDebugEnabled())
- {
- mLogger.debug(
- "Looking for roller-config.xml at '" + configPath + "'");
- }
-
- boolean configFoundInHomeDir;
- try
- {
- configFoundInHomeDir = new File(configPath).exists();
- }
- catch (SecurityException se)
- {
- configFoundInHomeDir = false;
- mLogger.info("Permission denied at '" + configPath + "'");
- }
- if (!configFoundInHomeDir)
- {
- // No config found in user.home, store it in WEB-INF instead.
- if (mLogger.isDebugEnabled())
- {
- mLogger.debug("File not found: '" + configPath);
- }
-
- String root = mContext.getRealPath("/");
- configPath =
- root
- + File.separator
- + "WEB-INF"
- + File.separator
- + "roller-config.xml";
- }
-
- mLogger.info("Using roller-config.xml at '" + configPath + "'");
-
- return configPath;
- }
- */
-
- //-----------------------------------------------------------------------
/**
* RollerSpellCheck must be initialized with a dictionary file
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=227447&r1=227446&r2=227447&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 Thu Aug 4 12:01:27 2005
@@ -15,6 +15,7 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.roller.RollerException;
+import org.roller.config.RollerConfig;
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
import org.roller.pojos.PermissionsData;
@@ -180,6 +181,7 @@
public static class YourWebsitesPageModel extends BasePageModel
{
+ private boolean groupBloggingEnabled = true;
private List permissions = new ArrayList();
private List pendings = new ArrayList();
public YourWebsitesPageModel(HttpServletRequest request,
@@ -190,7 +192,9 @@
RollerSession rollerSession = RollerSession.getRollerSession(request);
UserData user = rollerSession.getAuthenticatedUser();
permissions = roller.getUserManager().getAllPermissions(user);
- pendings = roller.getUserManager().getPendingPermissions(user);
+ pendings = roller.getUserManager().getPendingPermissions(user);
+ groupBloggingEnabled =
+ RollerConfig.getBooleanProperty("groupblogging.enabled");
}
public List getPermissions()
{
@@ -207,6 +211,14 @@
public void setPendings(List pendings)
{
this.pendings = pendings;
+ }
+
+ public boolean isGroupBloggingEnabled() {
+ return groupBloggingEnabled;
+ }
+
+ public void setGroupBloggingEnabled(boolean groupBloggingEnabled) {
+ this.groupBloggingEnabled = groupBloggingEnabled;
}
}
}
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=227447&r1=227446&r2=227447&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 Thu Aug 4 12:01:27 2005
@@ -1,7 +1,7 @@
application.none=None
-# ----------------------------------------------------------------- BookmarkForm.jsp
+# ------------------------------------------------------------- BookmarkForm.jsp
bookmarkForm.addBookmark=Add a New Bookmark
bookmarkForm.cancel=Cancel
@@ -17,7 +17,7 @@
bookmarkForm.url=Bookmark URL
bookmarkForm.weight=Display Weight
-# --------------------------------------------------------------- BookmarksForm.jsp
+# ----------------------------------------------------------- BookmarksForm.jsp
bookmarksForm.addBookmark=Add Bookmark
bookmarksForm.addFolder=Add Folder
@@ -35,22 +35,24 @@
bookmarksForm.visitLink=Visit
bookmarksForm.visitLink.tip=Click to visit this site
-bookmarksForm.warn.notMoving=Can't move parent folder [{0}] into one of it's children
+bookmarksForm.warn.notMoving=Can't move parent folder [{0}] into one of it's \
+children
bookmarksForm.error.move=Error performing move, parent to child moves not allowed
-# ------------------------------------------------------------- Bookmarks import.jsp
+# --------------------------------------------------------- Bookmarks import.jsp
bookmarksImport.title=Import OPML Bookmarks
-bookmarksImport.prompt=Import your OPML format bookmarks or newreader subscription file:
+bookmarksImport.prompt=Import your OPML format bookmarks or newreader \
+subscription file:
-# ------------------------------------------------------------------------ Calendars
+# -------------------------------------------------------------------- Calendars
calendar.summary=Blog Archive Calendar
calendar.prev=Prev
calendar.today=Today
calendar.next=Next
-# ----------------------------------------------------------------- CategoryForm.jsp
+# ------------------------------------------------------------- CategoryForm.jsp
categoryForm.name=Name
categoryForm.description=Description
@@ -61,7 +63,7 @@
categoryForm.addCategory=Add Category
categoryForm.correctCategory=Correct Category
-# --------------------------------------------------------------- CategoriesForm.jsp
+# ----------------------------------------------------------- CategoriesForm.jsp
categoriesForm.name=Name
categoriesForm.description=Description
@@ -76,19 +78,23 @@
categoriesForm.parent=Category
categoriesForm.remove=Remove
-categoriesForm.warn.notMoving=Can't move parent category [{0}] into one of it's children
+categoriesForm.warn.notMoving=Can't move parent category [{0}] into one of it's \
+children
categoriesForm.error.move=Error performing move, parent to child moves not allowed
-# ------------------------------------------------------------- CategoryDeleteOK.jsp
+# --------------------------------------------------------- CategoryDeleteOK.jsp
categoryDeleteOK.removeCategory=Remove Weblog Category
categoryDeleteOK.warningCatInUse=WARNING: This category is in use!
-categoryDeleteOK.youMustMoveEntries=You must move the weblog entries in the category to another category, use the combo-box to select which category should receive the entries.</p>
+categoryDeleteOK.youMustMoveEntries=You must move the weblog entries in the \
+category to another category, use the combo-box to select which category \
+should receive the entries.</p>
categoryDeleteOK.moveToWhere=Move the contents to another category:
-categoryDeleteOK.noEntriesInCat=There are no weblog entries in this category, OK to delete.
+categoryDeleteOK.noEntriesInCat=There are no weblog entries in this category, \
+OK to delete.
categoryDeleteOK.areYouSure=Are you sure you want to delete this weblog category?
-# --------------------------------------------------------------------- comments.jsp
+# ----------------------------------------------------------------- comments.jsp
comments.title=Comment
comments.header=Post a comment
@@ -109,18 +115,18 @@
comments.mathAuthenticatorQuestion=Please answer this simple math question
error.commentAuthFailed=Comment authentication failed!
-# ------------------------------------------------------------ comments-preview.jsp
+# --------------------------------------------------------- comments-preview.jsp
comments.preview.title=Comment
comments.preview=PREVIEW
comments.preview.edit=Edit your comment
-# ------------------------------------------------------------ comments-display.jsp
+# --------------------------------------------------------- comments-display.jsp
comments.postedBy=Posted by
comments.at=at
-# ------------------------------------------------------------------- Configuration
+# ---------------------------------------------------------------- Configuration
configForm.title=Roller Configuration
@@ -130,7 +136,8 @@
configForm.siteAdminEmail=Site Administrator's email address
configForm.absoluteUrl=Absolute URL to site (if required)
configForm.enableLinkback=Enable Linkback extraction?
-configForm.searchIndexDir=Search Index Directory<br />(use ${user.home} for system property)
+configForm.searchIndexDir=Search Index Directory<br />(use ${user.home} for \
+system property)
configForm.suspendPingProcessing=Suspend all ping processing?
configForm.userSettings=User Settings
@@ -166,10 +173,20 @@
configForm.saved=Configuration settings saved
-# ------------------------------------------------------------------- Create weblog
+# ---------------------------------------------------------------- Create weblog
createWebsite.title=Create Weblog
-createWebsite.description=Create a new weblog by specifying handle, name, title, timezone/locale information and theme to be used.
+
+createWebsite.description=This page allows you to create a new weblog.
+
+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.handle=Handle
createWebsite.name=Name
createWebsite.description=Description
@@ -188,14 +205,15 @@
createWebsiteDone.weblogURL=Weblog URL
createWebsiteDone.rssURL=Newsfeed URL
-# ------------------------------------------------------------------- Comment emails
+
+# --------------------------------------------------------------- Comment emails
email.comment.wrote=wrote
email.comment.anonymous=An anonymous user wrote
email.comment.respond=Respond to this comment at
email.comment.title=Comment
-#-------------------------------------------------------------------- Error messages
+#---------------------------------------------------------------- Error messages
error.add.blogcat=Error adding Weblog Category
error.add.blogentry=Error adding Weblog Entry
@@ -258,13 +276,14 @@
error.bake.weblog=Error baking your Weblog
-error.trackback=Error sending trackback. Possible cause: incorrect trackback URL. {0}
+error.trackback=Error sending trackback. Possible cause: incorrect \
+trackback URL. {0}
errorPage.title=Unexpected Exception
errorPage.message=Roller has encountered and logged an unexpected exception.
errorPage.reason=Reason
-#----------------------------------------------------------------- Struts Validator
+#-------------------------------------------------------------- Struts Validator
errors.header=<div class="error"><ul>
errors.footer=</ul></div>
@@ -289,7 +308,8 @@
error.noTrackbackUrlSpecified=You did not specify a Trackback URL
error.title.403=Access Denied (403)
-error.text.403=You do not have the privilege necessary to access the page you requested.
+error.text.403=You do not have the privilege necessary to access the page you \
+requested.
error.title.404=Sorry! We couldn't find your document (404)
error.text.404=The file that you requested could not be found on this server.
@@ -298,18 +318,22 @@
error.permissionDenied.title=Permission Denied
error.permissionDenied.prompt=Possible causes:
-error.permissionDenied.reason1=You tried to save an object from "stale" web page, left by an earlier login under a different user account.
-error.permissionDenied.reason2=You logged in using incorrect capitalization of your username. To resolve this problem, logout and login again with your correct username.
-error.permissionDenied.reason3=Your blog server's database connection is misconfigured. To resolve this problem, see your system adminstrator.
+error.permissionDenied.reason1=You tried to save an object from "stale" web page, \
+left by an earlier login under a different user account.
+error.permissionDenied.reason2=You logged in using incorrect capitalization of \
+your username. To resolve this problem, logout and login again with your \
+correct username.
+error.permissionDenied.reason3=Your blog server's database connection is \
+misconfigured. To resolve this problem, see your system adminstrator.
-# ----------------------------------------------------------------------- error.jsp
+# -------------------------------------------------------------------- error.jsp
errorPage.title=Unexpected Exception
errorPage.message=Roller has encountered and logged an unexpected exception.
errorPage.reason=Reason
errorPage.noException=No stack trace.
-# ------------------------------------------------------------------- FolderForm.jsp
+# --------------------------------------------------------------- FolderForm.jsp
folderForm.name=Name
folderForm.save=Save
@@ -319,16 +343,17 @@
folderForm.editFolder=Edit Bookmark Folder
folderForm.correctFolder=Correct Bookmark Folder edits
-folderForm.save.exception=ERROR saving folder, perhaps name is not unique? The error message is: {0}
+folderForm.save.exception=ERROR saving folder, perhaps name is not unique? \
+The error message is: {0}
-# -------------------------------------------------------------------------- Footer
+# ----------------------------------------------------------------------- Footer
footer.reportIssue=Report an Issue
footer.userGuide=User Guide
footer.macros=Macros
footer.mailingLists=Mailing Lists
-# ------------------------------------------------------------------- Invite member
+# ----------------------------------------------------------------- Invite member
inviteMember.title=Invite New Member
inviteMember.description=You can invite any user to join this weblog
@@ -348,7 +373,7 @@
inviteMemberDone.message=User [{0}] has been invited to join this weblog
inviteMemberDone.inviteAnother=Invite another
-# --------------------------------------------------------------------------- Login
+# ------------------------------------------------------------------------ Login
loginPage.userName=Username
loginPage.password=Password
@@ -356,37 +381,38 @@
loginPage.login=Login
loginPage.reset=Reset
-# ------------------------------------------------------------------ Bookmark Macro
+# --------------------------------------------------------------- Bookmark Macro
macro.bookmark.urlFeed=URL of site's RSS feed
macro.bookmark.error=The requested Bookmark Folder does not exist: {0}
-# ------------------------------------------------------------------ Referer Macro
+# --------------------------------------------------------------- Referer Macro
macro.referer.furtherReading=For further reading on today's posts:
macro.referer.todaysHits=Today's Page Hits:
-# ----------------------------------------------------------------------- RSS Macro
+# -------------------------------------------------------------------- RSS Macro
macro.rss.all=All
macro.rss.excerpts=excerpts
-# ------------------------------------------------------------- Search Results Macro
+# --------------------------------------------------------- Search Results Macro
macro.searchresults.results=Search Results
macro.searchresults.title=Define '{0}' on Dictionary.com
macro.searchresults.searchFor=You searched {0} for
macro.searchresults.hits_1=<strong>{0}</strong> entries found.<br /><em>You can also
-macro.searchresults.hits_2=try this same search</a> on <a href="http://google.com">Google</a>.</em>
+macro.searchresults.hits_2=try this same search</a> on \
+<a href="http://google.com">Google</a>.</em>
macro.searchresults.again=Search Again
-# -------------------------------------------------------- Search Results Day Macro
+# ----------------------------------------------------- Search Results Day Macro
macro.searchresultsday.entrypermalink.title=Permanent link to this weblog entry
macro.searchresultsday.userpermalink.title=Link to user's home page
macro.searchresultsday.categorypermalink.title=Show entries for this category
-# -------------------------------------------------------------------- Weblog Macro
+# ----------------------------------------------------------------- Weblog Macro
macro.weblog.daypermalink.title=Permanent link to this day
macro.weblog.entrypermalink.title=Permanent link to this weblog entry
@@ -419,17 +445,22 @@
macro.weblog.clear=Clear Info
macro.weblog.searchalert=Please enter a search term to continue.
macro.weblog.searchbutton=Search
-macro.weblog.searchdictionary=You searched this site for "<a href="http://dictionary.com/search?q={0}" title="Define '{1}' on Dictionary.com" class="dictionary">{2}</a>".
+macro.weblog.searchdictionary=You searched this site for \
+"<a href="http://dictionary.com/search?q={0}" title="Define '{1}' \
+on Dictionary.com" class="dictionary">{2}</a>".
macro.weblog.searchhits=<strong>{0}</strong> entries found.
macro.weblog.searchagain=Search Again
-macro.weblog.searchgoogle=<em>You can also <a href="http://google.com/search?q={0}%20site:{1}/page/{3}" class="google">try this same search</a> on <a href="http://google.com">Google</a>.</em>
+macro.weblog.searchgoogle=<em>You can also \
+<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
+class="google">try this same search</a> on \
+<a href="http://google.com">Google</a>.</em>
macro.weblog.trackback=Trackback URL:
macro.weblog.editentry=Edit
macro.weblog.allcategories=All
macro.weblog.nolanguages=This site does not support multiple langauges.
macro.weblog.notifyMeOfComments=Notify me by email of new comments
-# ----------------------------------------------------------------------- Main page
+# -------------------------------------------------------------------- Main page
mainPage.recentEntries=Recent Weblog Entries
mainPage.pinnedEntries=Featured Weblog Entries
@@ -446,21 +477,28 @@
mainPage.status=Status
mainPage.loggedInAs=Logged in as
mainPage.currentWebsite=Editing weblog
+mainPage.sidebarHelpTitle=What is this?
-# --------------------------------------------------------------------- Maintenance
+# ------------------------------------------------------------------ Maintenance
maintenance.title=Weblog Maintenance
maintenance.prompt.index=Rebuild the search index for your Roller weblog.
maintenance.button.index=Rebuild Search Index
maintenance.prompt.flush=Flush the page cache for your Roller weblog.
maintenance.button.flush=Flush Cache
-maintenance.message.indexed=Successully scheduled search index rebuild for your Roller weblog
-maintenance.message.flushed=Successfully flushed the page cache of your Roller weblog
+maintenance.message.indexed=Successully scheduled search index rebuild for your \
+Roller weblog
+maintenance.message.flushed=Successfully flushed the page cache of your \
+Roller weblog
-# --------------------------------------------------------------- Member permissions
+# ----------------------------------------------------------- Member permissions
memberPermissions.title=Website Member Permissions
-memberPermissions.description=You can change permissions of weblog members, or remove them from the weblog.
+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 \
+demote or remove yourself from the weblog.
+
memberPermissions.userName=Username
memberPermissions.administrator=Admin
memberPermissions.author=Author
@@ -472,14 +510,34 @@
memberPermissions.membersRemoved=Removed {0} user(s)
memberPermissions.membersChanged=Changed permission for {0} user(s)
-memberPermissions.confirmRemove=Are you sure you want to remove members from this weblog?
+memberPermissions.confirmRemove=Are you sure you want to remove members from this \
+weblog?
memberPermissions.button.save=Save
-# ------------------------------------------------------------ New user registation
+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>
+
+# --------------------------------------------------------- New user registation
newUser.addNewUser=New User Registration
-newuser.loginName=User Name
+newuser.loginName=User Name s
newuser.fullName=Full Name
newuser.password=Password
newuser.eMailAddress=Email Address
@@ -489,7 +547,7 @@
newUser.created=New user successfully created. Create another?
newUser.error.mismatchedPasswords=ERROR: passwords to not match
-# ------------------------------------------------------------------- Navigation Bar
+# --------------------------------------------------------------- Navigation Bar
navigationBar.header=Navigation
navigationBar.main=Main
@@ -498,8 +556,9 @@
navigationBar.logout=Logout
navigationBar.login=Login
navigationBar.register=Register
+navigationBar.youMay=You may
-# ------------------------------------------------------------------ Page management
+# -------------------------------------------------------------- Page management
pagesForm.title=Page Templates
pagesForm.name=Name
@@ -508,7 +567,8 @@
pagesForm.edit=Edit
pagesForm.remove=Remove
pagesForm.required=(required)
-pagesForm.hiddenNote=NOTE: Pages with names that start with '_' are hidden. They will not be shown in the navigation bar.
+pagesForm.hiddenNote=NOTE: Pages with names that start with '_' are hidden. \
+They will not be shown in the navigation bar.
pagesForm.addNewPage=Add a new page
pagesForm.addNewPage.success=New page <strong>{0}</strong> added successfully.
pagesForm.add=Add
@@ -516,7 +576,7 @@
pageCache.flushed=Page cache has been successfully flushed.
-# ------------------------------------------------------------------------ Page edit
+# -------------------------------------------------------------------- Page edit
pageForm.editPage=Edit Page
pageForm.name=Name
@@ -526,39 +586,53 @@
pageForm.save=Save
pageForm.save.success=Page updated successfully.
-# -------------------------------------------------------- Ping Target Admin/Editing
+# ---------------------------------------------------- Ping Target Admin/Editing
commonPingTargets.commonPingTargets=Common Weblog Ping Targets
-commonPingTargets.explanation=These target sites are available to all users for weblog update pings.
+commonPingTargets.explanation=These target sites are available to all users for \
+weblog update pings.
customPingTargets.customPingTargets=Custom Weblog Ping Targets
-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. Sites that you configure here are only available \
+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. \
+Sites that you configure here are only available \
for your own use.
-customPingTargets.disAllowedExplanation=The use of custom ping targets has been disabled on this site. \
-To get an additional common ping target added, please contact an administrator.
+customPingTargets.disAllowedExplanation=The use of custom ping targets has been \
+disabled on this site. To get an additional common ping target added, \
+Please contact an administrator.
pings.title=Configure Automatic Weblog Pings
-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 your weblog changes. You can also trigger pings manually \
-to specific sites from this page. <strong>Note:</strong> Normally, you are expected to register your weblog with a site before starting \
+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 \
+your weblog changes. You can also trigger pings manually \
+to specific sites from this page. <strong>Note:</strong> Normally, you are \
+expected to register your weblog with a site before starting \
to send that site pings.
pings.commonPingTargets=Common Ping Targets
-pings.commonPingTargetsExplanation=These ping targets have been configured by the site administrator for use by all users. \
+pings.commonPingTargetsExplanation=These ping targets have been configured by the \
+site administrator for use by all users. \
You can send pings to any of these well-known sites.
pings.customPingTargets=Custom Ping Targets
-pings.customPingTargetsExplanationEmpty=You can also add sites yourself using the menu item <strong>Custom Ping Targets</strong>. \
-Your custom ping targets are only available for your own use. Currently you have no custom ping targets.
-pings.customPingTargetsExplanationNonEmpty=These are sites you have set up for yourself as custom ping targets. These are \
-only available for your own use.
+pings.customPingTargetsExplanationEmpty=You can also add sites yourself using the \
+menu item <strong>Custom Ping Targets</strong>. \
+Your custom ping targets are only available for your own use. Currently you \
+have no custom ping targets.
+pings.customPingTargetsExplanationNonEmpty=These are sites you have set up for \
+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 responded with the following error message.
-ping.transmissionFailed=The ping transmission failed. Check to make sure the ping target URL is correct.
+ping.transmittedButErrorReturned=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 target URL is correct.
ping.unknownHost=The hostname in the ping target URL is unknown.
-ping.networkConnectionFailed=There were network connection problems reaching the ping target site.
-ping.pingProcessingIsSuspended=Ping processing has been suspended temporarily by a site administrator.
+ping.networkConnectionFailed=There were network connection problems reaching the \
+ping target site.
+ping.pingProcessingIsSuspended=Ping processing has been suspended temporarily by \
+a site administrator.
pingResult.OK=OK
pingTarget.pingTarget=Ping Target
@@ -569,8 +643,10 @@
pingTarget.edit=Edit
pingTarget.remove=Remove
pingTarget.confirmRemoveTitle=Remove Ping Target Confirmation
-pingTarget.confirmCommonRemove=Removing this target will also remove all user's automatic ping configurations that use this target. Are you sure?
-pingTarget.confirmCustomRemove=Removing this target will also remove all of your automatic ping configurations that use this target. Are you sure?
+pingTarget.confirmCommonRemove=Removing this target will also remove all user's \
+automatic ping configurations that use this target. Are you sure?
+pingTarget.confirmCustomRemove=Removing this target will also remove all of your \
+automatic ping configurations that use this target. Are you sure?
pingTarget.removeOK=Yes, Remove
pingTarget.cancel=No, Cancel
pingTarget.enable=Enable
@@ -581,11 +657,12 @@
pingTarget.manual=Manual
pingTarget.sendPingNow=Send Ping Now
-pingTarget.nameNotUnique=The name of this target conflicts with another one in the same set of targets.
+pingTarget.nameNotUnique=The name of this target conflicts with another one in \
+the same set of targets.
pingTarget.malformedUrl=The URL is not properly formed.
pingTarget.unknownHost=The hostname in this URL doesn't seem to exist.
-# ------------------------------------------------------------------- Planet Roller
+# ---------------------------------------------------------------- Planet Roller
planet.rankings=Technorati Rankings
planet.hotBlogs=Hot Blogs On-site
@@ -698,7 +775,7 @@
planetGroups.error.nameReserved=Can't use handle 'all' or 'external'
planetGroups.error.deleting=Error deleting object
-# --------------------------------------------------------------------- referers.jsp
+# ----------------------------------------------------------------- referers.jsp
referers.todaysReferers=Today's Referer Rankings
referers.url=Referring URL
@@ -711,12 +788,12 @@
referers.deletedReferers=Deleted specified referers
referers.noReferersSpecified=You did not specify any referers to delete
-# ---------------------------------------------------------------------- Search Form
+# ------------------------------------------------------------------ Search Form
searchForm.button=Search
searchForm.alert=Please enter a search term to continue.
-# ---------------------------------------------------------------------- Tabbed Menu
+# ------------------------------------------------------------------ Tabbed Menu
tabbedmenu.main=Main
tabbedmenu.website.user=Your Profile
@@ -757,7 +834,7 @@
tabbedmenu.admin.planetSubscriptions=External Subscriptions
tabbedmenu.admin.planetGroups=Custom Groups
-# ---------------------------------------------------------------------------- Theme
+# ------------------------------------------------------------------------ Theme
themeEditor.title=Weblog Theme
themeEditor.selectTheme=Select a new theme to preview
@@ -765,29 +842,33 @@
themeEditor.yourThemeIsShownBelow=Your current theme is shown below.
themeEditor.themeBelowIsCalled=The theme shown below is called:
themeEditor.savePrompt=Would you like to save this as your new theme?
-themeEditor.saveWarning=NOTE: this may destroy any customizations you made to the Page Templates of your previous theme.
+themeEditor.saveWarning=NOTE: this may destroy any customizations you made to the \
+Page Templates of your previous theme.
themeEditor.save=Save
themeEditor.cancel=Cancel
-# -------------------------------------------------------------------------- Uploads
+# ---------------------------------------------------------------------- Uploads
uploadFiles.title=File Uploads
uploadFiles.manageFiles=Manage Uploaded Files
uploadFiles.uploadDisabled=Upload has been disabled.
uploadFiles.exceededQuota=You have exceeded your file upload quota.
uploadFiles.upload=Upload
-uploadFiles.quotaNote=You may upload files smaller than {0} MB in size, up to a total of {1} MB for all files.
+uploadFiles.quotaNote=You may upload files smaller than {0} MB in size, up to a \
+total of {1} MB for all files.
uploadFiles.uploadPrompt=Select a file for upload:
uploadFiles.noFiles=No files found.
uploadFiles.button.delete=Delete Selected
-# ---------------------------------------------------------------------- User admin
+# ------------------------------------------------------------------- User admin
userAdmin.searchUserTitle=Find user to edit
userAdmin.editUserTitle=Edit user [{0}]
-userAdmin.cookieLogin=You cannot passwords when logging in with the <strong>Remember Me</strong> feature. Please logout and log back in to change passwords.
+userAdmin.cookieLogin=You cannot passwords when logging in with the \
+<strong>Remember Me</strong> feature. Please logout and log back in to \
+change passwords.
userAdmin.editUser=Edit User
userAdmin.userSettings=User Settings
userAdmin.delete=Delete
@@ -808,7 +889,7 @@
userAdmin.userAdmin=Administrator
userAdmin.warning=NOTE: This operation cannot be undone !!
-# -------------------------------------------------------------------- User settings
+# ---------------------------------------------------------------- User settings
userSettings.userSettings=User Settings
userSettings.username=Username
@@ -819,12 +900,15 @@
userSettings.locale=Locale
userSettings.timeZone=Timezone
userSettings.save=Save
-userSettings.cookieLogin=You cannot passwords when logging in with the <strong>Remember Me</strong> feature. Please logout and log back in to change passwords.
-userSettings.passwordResetError=Password was not reset. Password fields did not match?
+userSettings.cookieLogin=You cannot passwords when logging in with the \
+<strong>Remember Me</strong> feature. Please logout and log back in to \
+change passwords.
+userSettings.passwordResetError=Password was not reset. Password fields did not \
+match?
userSettings.saved=User settings were successfully saved.
userSettings.needPasswordTwice=Must enter both password and confirmation password.
-# ---------------------------------------------------------------------- Weblog edit
+# ------------------------------------------------------------------ Weblog edit
weblogEntry.pendingEntrySubject=Roller [{0}] new post pending review
@@ -905,7 +989,8 @@
weblogEdit.trackbacks=Trackbacks
weblogEdit.sendTrackback=Send Trackback
weblogEdit.trackbackUrl=Trackback URL
-weblogEdit.trackbackResults=<b>Trackback response (error code 0 indicates success):</b><br /><br />{0}
+weblogEdit.trackbackResults=<b>Trackback response (error code 0 indicates \
+success):</b><br /><br />{0}
weblogEdit.commentSettings=Comment Settings
weblogEdit.commentDelete=Delete
@@ -922,14 +1007,14 @@
weblogEdit.message.mediaCastProblem=Problem processing MediaCast, invalid URL?
-# -------------------------------------------------------------- Weblog Entry Remove
+# ---------------------------------------------------------- Weblog Entry Remove
weblogEntryRemove.removeWeblogEntry=Remove Weblog Entry
weblogEntryRemove.yes=Yes
weblogEntryRemove.no=No
weblogEntryRemove.areYouSure=Are you sure you want to remove this Weblog Entry?
-# ------------------------------------------------------ Weblog Entry Export/Import
+# --------------------------------------------------- Weblog Entry Export/Import
weblogEntryExport.title=Export Entries
weblogEntryExport.exportSuccess={0}
weblogEntryExport.exportFiles={0}
@@ -939,10 +1024,11 @@
weblogEntryImport.XMLFile=XML file:
weblogEntryImport.button.import=Import
-# ------------------------------------------------------ Weblog Entry Export/Import
+# --------------------------------------------------- Weblog Entry Export/Import
weblogEntryQuery.title=Weblog Entry Archive
-weblogEntryQuery.description=Search weblog entry archives by category, date, and status.
+weblogEntryQuery.description=Search weblog entry archives by category, date, and \
+status.
weblogEntryQuery.filterByCategory=Filter By Category
weblogEntryQuery.filterByPublishTime=Filter By Publish Time
@@ -982,7 +1068,7 @@
weblogEntryQuery.button.query=Search
weblogEntryQuery.button.export=Export
-# ---------------------------------------------------------------------- Weblog Main
+# ------------------------------------------------------------------ Weblog Main
weblogMain.search=Search
weblogMain.navigation=Navigation
@@ -992,7 +1078,7 @@
weblogMain.archives=Archives
weblogMain.poweredBy=Powered By
-# -------------------------------------------------------------------------- Website
+# ---------------------------------------------------------------------- Website
websiteSettings.title=Weblog Settings
websiteSettings.websiteTitle=Title
@@ -1005,20 +1091,22 @@
websiteSettings.formatting=Formatting
websiteSettings.allowComments=Allow Comments for your weblog?
websiteSettings.emailComments=E-Mail Comments?
-websiteSettings.emailFromAddress=Default <em>from</em> e-mail address<br />for Comment Notifications
+websiteSettings.emailFromAddress=Default <em>from</em> e-mail address<br />for \
+Comment Notifications
websiteSettings.autoformat=Autoformat new entries?
websiteSettings.bloggerApi=Blogger API
websiteSettings.enableBloggerApi=Enable Blogger API 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 these<br />(comma separated) words
+websiteSettings.ignoreUrls=Ignore referering URLs that<br />contain any of \
+these<br />(comma separated) words
websiteSettings.editorSettings=Editor
websiteSettings.commentSettings=Comments
websiteSettings.button.update=Update Weblog Settings
websiteSettings.button.rebuildIndex=Rebuild Search Index
-# ----------------------------------------------------------------- Welcome new user
+# ------------------------------------------------------------- Welcome new user
welcome.title=Welcome to Roller
welcome.accountCreated=Your new user account has been created.
@@ -1027,7 +1115,7 @@
welcome.clickHere=Click here
welcome.toLoginAndPost=to login and post your first Weblog entry.
-# -------------------------------------------------------------------- Your profile
+# ----------------------------------------------------------------- Your profile
yourProfile.title=Your Profile
yourProfile.description=You can change your username, email and password here.
@@ -1036,31 +1124,53 @@
yourProfile.button.save=Save
-# ------------------------------------------------------------------- Your Weblogs
+# ---------------------------------------------------------------- Your Weblogs
yourWebsites.title=Your Weblogs
-yourWebsites.description=Click weblog title to select it as your current weblog.
+
+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 create additional \
+weblogs, select which weblog you'd like to work in and accept invitations to \
+join other user's weblogs.
+
yourWebsites.invited=You've been invited to join the weblog
yourWebsites.accept=accept
yourWebsites.decline=decline
-yourWebsites.createWebsite=Create new weblog
+
+yourWebsites.websiteTablesPrompt=Click weblog title to select it as your current \
+weblog.
yourWebsites.tableTitle=Title
yourWebsites.tableDescription=Description
-yourWebsites.permissions=Permissions
yourWebsites.select=Select
yourWebsites.resign=Resign
+yourWebsites.permissions=Permissions
yourWebsites.confirmResignation=Are you sure you wish to resign from weblog
yourWebsites.youHaveNone=You have no weblogs.
yourWebsites.youCanCreateOne=You may create one.
yourWebsites.youCannot=Ask your administrator to create one for you.
+yourWebsites.notAllowed=Not allowed
+
+yourWebsites.createWebsite=Create new weblog
yourWebsites.invitations=Weblog Invitations
-yourWebsites.invitationsPrompt=You have one or more invitations to accept or decline:
+yourWebsites.invitationsPrompt=You have one or more invitations to accept or \
+decline:
yourWebsites.youAreInvited=You are invited to join weblog [{0}] -
-
yourWebsites.selected=You are now working in weblog [{0}]
yourWebsites.declined=You have declined an invitation to join weblog [{0}]
yourWebsites.accepted=You are now a member of weblog [{0}]
yourWebsites.resigned=You have resigned from weblog [{0}]
+
+
+
+
Added: 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=227447&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm (added)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm Thu Aug 4 12:01:27 2005
@@ -0,0 +1,47 @@
+
+
+<table class="menuTabTable" cellspacing="0" >
+<tr>
+ #foreach( $menu in $menuModel.getMenus() )
+ #if( $menu.isPermitted( $req ) )
+ <td class="menuTabSeparator"></td>
+ #if( $menu.isSelected( $req ) )
+ <td class="menuTabSelected">
+ #else
+ <td class="menuTabUnselected">
+ #end
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$menu.getUrl( $ctx )">$text.get( $menu.getName() )</a>
+ </div>
+ </div>
+ </td>
+ #end
+ #end
+</tr>
+</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>
+</table>
+
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties Thu Aug 4 12:01:27 2005
@@ -29,6 +29,7 @@
# user management settings
users.registration.enabled=true
+groupblogging.enabled=true
#----------------------------------
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=227447&r1=227446&r2=227447&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 Thu Aug 4 12:01:27 2005
@@ -54,7 +54,8 @@
perms="admin" />
<menu-item forward="editPages" name="tabbedmenu.website.pages"
perms="admin" />
- <menu-item forward="memberPermissions" name="tabbedmenu.website.members"
+ <menu-item forward="memberPermissions" enabledProperty="groupblogging.enabled"
+ name="tabbedmenu.website.members"
perms="admin" />
<menu-item forward="pingSetup" name="tabbedmenu.weblog.pingSetup"
disabledProperty="pings.disablePingUsage"
Modified: incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp Thu Aug 4 12:01:27 2005
@@ -26,7 +26,7 @@
<fmt:message key="planetConfig.title" />
</label>
<html:text property="title" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.title" />' />
</div>
@@ -35,7 +35,7 @@
<fmt:message key="planetConfig.siteUrl" />
</label>
<html:text property="siteUrl" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.siteUrl" />' />
</div>
@@ -44,7 +44,7 @@
<fmt:message key="planetConfig.adminEmail" />
</label>
<html:text property="adminEmail" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.adminEmail" />' />
</div>
@@ -53,7 +53,7 @@
<fmt:message key="planetConfig.cacheDir" />
</label>
<html:text property="cacheDir" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.cacheDir" />' />
</div>
@@ -62,7 +62,7 @@
<fmt:message key="planetConfig.proxyHost" />
</label>
<html:text property="proxyHost" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.proxyHost" />' />
</div>
@@ -71,7 +71,7 @@
<fmt:message key="planetConfig.proxyPort" />
</label>
<html:text property="proxyPort" size="40" maxlength="255" />
- <img src="../images/help.jpeg" alt="help"
+ <img src="../images/Help16.gif" alt="help"
title='<fmt:message key="planetConfig.tip.proxyPort" />' />
</div>
Modified: incubator/roller/branches/roller_2.0/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/taglibs.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/taglibs.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/taglibs.jsp Thu Aug 4 12:01:27 2005
@@ -1,6 +1,6 @@
<%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %><%@
-taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@
-taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %><%@
+taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@
+taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %><%@
taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %><%@
taglib uri="http://struts.apache.org/tags-html" prefix="html" %><%@
taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %><%@
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=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Thu Aug 4 12:01:27 2005
@@ -23,498 +23,505 @@
/* ----------------------------------------------------------------------
General styles
---------------------------------------------------------------------- */
-
+
body {
- height:100%;
- background: white;
- margin: 0;
- padding: 0;
+ height:100%;
+ background: white;
+ margin: 0;
+ padding: 0;
font:small Verdana,Arial,Sans-serif;
color:black;
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-size: 100%;
}
-
-p {
- background: transparent;
- color: #000000;
-}
-
-h1 {
- background: transparent;
- color: #A0A060;
- letter-spacing: 0.2em;
- font-size: x-large;
- font-weight: bold;
-}
-
-h2 {
- background: transparent;
- color: #A0A060;
- letter-spacing: 0.2em;
- font-size: large;
- font-weight: bold;
-}
-
-h3 {
- background: transparent;
- color: #A0A060;
- letter-spacing: 0.2em;
- font-weight: bold;
-}
-
-img {
- border: 0px;
-}
-
-img.w3c {
- border: 0px;
- height: 31px;
- width: 88px;
- margin-right: 5px;
-}
-
-a {
- background: transparent;
- text-decoration: none;
-}
-
-a:link {
- background: transparent;
- font-weight: bold;
- color: #A0A060;
- text-decoration: underline;
-}
-
-a:visited {
- background: transparent;
+
+p {
+ background: transparent;
+ color: #000000;
+}
+
+h1 {
+ background: transparent;
+ color: #A0A060;
+ letter-spacing: 0.2em;
+ font-size: x-large;
+ font-weight: bold;
+}
+
+h2 {
+ background: transparent;
+ color: #A0A060;
+ letter-spacing: 0.2em;
+ font-size: large;
+ font-weight: bold;
+}
+
+h3 {
+ background: transparent;
+ color: #A0A060;
+ letter-spacing: 0.2em;
+ font-weight: bold;
+}
+
+img {
+ border: 0px;
+}
+
+img.w3c {
+ border: 0px;
+ height: 31px;
+ width: 88px;
+ margin-right: 5px;
+}
+
+a {
+ background: transparent;
+ text-decoration: none;
+}
+
+a:link {
+ background: transparent;
font-weight: bold;
- color: #A0A060;
- text-decoration: underline;
-}
-
-a:hover {
+ color: #A0A060;
+ text-decoration: underline;
+}
+
+a:visited {
+ background: transparent;
font-weight: bold;
- text-decoration: none;
-}
-
-a:active {
+ color: #A0A060;
+ text-decoration: underline;
+}
+
+a:hover {
font-weight: bold;
- text-decoration: underline overline;
-}
-
-textarea {
- margin: 3px 0px 0px 0px;
-}
-
-.details {
- font-size: small;
- color: grey;
+ text-decoration: none;
}
-
+
+a:active {
+ font-weight: bold;
+ text-decoration: underline overline;
+}
+
+textarea {
+ margin: 3px 0px 0px 0px;
+}
+
+.details {
+ font-size: small;
+ color: grey;
+}
+
+div.helptext {
+ background: #f0f0f0;
+ border: 1px #c0c0c0 solid;
+ padding: 2px;
+ margin: 30px 10px 10px 0px;
+ width: 75%;
+}
+
/* ----------------------------------------------------------------------
Main page styles
---------------------------------------------------------------------- */
-div.entryTitleBox {
- padding: 3px;
- margin: 3px;
- border: 1px #c0c0c0 solid;
- background: #CCCC99;
- color: white;
- font-size: medium;
-}
-
-div.entryBox {
- padding: 3px;
- margin: 3px;
- border: 1px #c0c0c0 solid;
-}
-
-div.entryBoxPinned {
- padding: 3px;
- margin: 3px;
- border: 1px #c0c0c0 solid;
- background: #e7e7ff;
-}
-
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- font-size: medium;
- font-weight: bold;
-}
-
-span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
- font-size: small;
- padding-left:0px;
- list-style-type:none
-}
-
-span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
- font-size: small;
- color: grey;
-}
-
-p.websiteDescription {
- text-style: italics;
-}
-
-.version {
- font-size: small;
- color: grey;
- text-align: center;
+div.entryTitleBox {
+ padding: 3px;
+ margin: 3px;
+ border: 1px #A0A060 solid;
+ background: #c0c080;
+ color: white;
+ font-size: medium;
+}
+
+div.entryBox {
+ padding: 3px;
+ margin: 3px;
+ border: 1px #c0c0c0 solid;
+}
+
+div.entryBoxPinned {
+ padding: 3px;
+ margin: 3px;
+ border: 1px #c0c0c0 solid;
+ background: #e7e7ff;
+}
+
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+ font-size: medium;
+ font-weight: bold;
+}
+
+span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
+ font-size: small;
+ padding-left:0px;
+ list-style-type:none
+}
+
+span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
+ font-size: small;
+ color: grey;
+}
+
+p.websiteDescription {
+ text-style: italics;
}
-
+
+.version {
+ font-size: small;
+ color: grey;
+ text-align: center;
+}
+
/* ----------------------------------------------------------------------
Table styles
---------------------------------------------------------------------- */
-
-table.rollertable {
- border-collapse: collapse;
- margin: 5px;
- width: 90%;
-}
-
-table.rollertable th, table.rollertable thead th {
- border: 1px solid #ccc;
- background: #CCCC99;
-}
-
-table.rollertable thead th {
- font-size: 1em;
-}
-
-table.rollertable td, table.rollertable tbody td {
- border: 1px solid #ccc;
- vertical-align: top;
-}
-
-table.rollertable tbody td {
- padding: 3px;
-}
-
-table.rollertable td.center {
- text-align: center;
-}
-
-.rollertable_even td {
- border: 1px solid #ccc;
- background: #EEEEEE;
- color: inherit;
- vertical-align: top;
-}
-
-.rollertable_odd td{
- border: 1px solid #ccc;
- background: inherit;
- vertical-align: top;
-}
-
-td.rollertable_entry, div.rollertable_entry {
- border: 1px solid #ccc;
- background: inherit;
- padding:5px;
- vertical-align: top;
-}
-
-td.propname {
- padding: 0px 0px 0px 3em;
- vertical-align: top;
-}
-
-table.edit th {
- text-align: right;
- padding-right: 5px;
-}
-
+
+table.rollertable {
+ border-collapse: collapse;
+ width: 90%;
+}
+
+table.rollertable th, table.rollertable thead th {
+ border: 1px solid #ccc;
+ background: #CCCC99;
+}
+
+table.rollertable thead th {
+ font-size: 1em;
+}
+
+table.rollertable td, table.rollertable tbody td {
+ border: 1px solid #ccc;
+ vertical-align: top;
+}
+
+table.rollertable tbody td {
+ padding: 3px;
+}
+
+table.rollertable td.center {
+ text-align: center;
+}
+
+.rollertable_even td {
+ border: 1px solid #ccc;
+ background: #EEEEEE;
+ color: inherit;
+ vertical-align: top;
+}
+
+.rollertable_odd td{
+ border: 1px solid #ccc;
+ background: inherit;
+ vertical-align: top;
+}
+
+td.rollertable_entry, div.rollertable_entry {
+ border: 1px solid #ccc;
+ background: inherit;
+ padding: 5px;
+ vertical-align: top;
+}
+
+td.propname {
+ padding: 0px 0px 0px 3em;
+ vertical-align: top;
+}
+
+table.edit th {
+ text-align: right;
+ padding-right: 5px;
+}
+
/* ----------------------------------------------------------------------
Calendar styles
---------------------------------------------------------------------- */
-
-div.archiveCalendar {
- position: absolute;
- top: 80px;
- right: 20px;
- font-size: 11px;
-}
-
-.hCalendarDay {
- border-width: thin;
- font-size: .9em;
- text-align: center;
-}
-
-.hCalendarDayCurrent {
- border-style: dotted;
- border-width: thin;
- font-size: .9em;
- font-weight: bolder;
- text-align: center;
-}
-
-.hCalendarDayLinked {
- border-width: thin;
- font-size: .9em;
- font-weight: bolder;
- text-align: center;
-}
-
-.hCalendarDayNameRow {
- font-size: .9em;
- background-color: #eee;
- border-bottom: 1px solid #ccc;
- text-align: center;
-}
-
-.hCalendarDayNotInMonth {
- background: transparent;
- color: #AAAAAA;
- font-size: .9em;
- text-align: center;
-}
-
-.hCalendarNextPrev {
- text-align: center;
-}
-
-.hCalendarMonthYearRow {
- font-weight: bold;
- text-align: center;
-}
-
+
+div.archiveCalendar {
+ position: absolute;
+ top: 80px;
+ right: 20px;
+ font-size: 11px;
+}
+
+.hCalendarDay {
+ border-width: thin;
+ font-size: .9em;
+ text-align: center;
+}
+
+.hCalendarDayCurrent {
+ border-style: dotted;
+ border-width: thin;
+ font-size: .9em;
+ font-weight: bolder;
+ text-align: center;
+}
+
+.hCalendarDayLinked {
+ border-width: thin;
+ font-size: .9em;
+ font-weight: bolder;
+ text-align: center;
+}
+
+.hCalendarDayNameRow {
+ font-size: .9em;
+ background-color: #eee;
+ border-bottom: 1px solid #ccc;
+ text-align: center;
+}
+
+.hCalendarDayNotInMonth {
+ background: transparent;
+ color: #AAAAAA;
+ font-size: .9em;
+ text-align: center;
+}
+
+.hCalendarNextPrev {
+ text-align: center;
+}
+
+.hCalendarMonthYearRow {
+ font-weight: bold;
+ text-align: center;
+}
+
/* ----------------------------------------------------------------------
Error and status message styles
---------------------------------------------------------------------- */
-
-.statusMsg {
- background: #CCFFCC;
- border: 1px solid #008000;
- color: #000000;
- display: block;
- font-size: .9em;
- margin: 0px 0px 10px 0px;
- padding: 3px;
- width: 98%;
-}
-
-.error {
- background: transparent;
- color: #FF0000;
-}
-
-.warning {
- background: transparent;
- color: #FF0000;
- font-size: .9em;
-}
-
-.errors, .messages, .warnings {
- padding: 5px;
- margin-top: 10px;
-}
-
-.errors {
- background-color:#fcc;
+
+.statusMsg {
+ background: #CCFFCC;
+ border: 1px solid #008000;
+ color: #000000;
+ display: block;
+ font-size: .9em;
+ margin: 0px 0px 10px 0px;
+ padding: 3px;
+ width: 98%;
+}
+
+.error {
+ background: transparent;
+ color: #FF0000;
+}
+
+.warning {
+ background: transparent;
+ color: #FF0000;
+ font-size: .9em;
+}
+
+.errors, .messages, .warnings {
+ padding: 5px;
+ margin-top: 10px;
+}
+
+.errors {
+ background-color: #fcc;
border: 1px solid red;
-}
-
-.messages {
- background-color: #cfc;
- border: 1px solid green;
+}
+
+.messages {
+ background-color: #cfc;
+ border: 1px solid green;
}
.warnings {
background-color:#FFFFAA;
border: 1px solid yellow;
-}
-
-div.error {
- background-color: #ffcccc;
- border: 1px solid #000000;
- color: #aa0000;
- font-size: 0.9em;
- font-weight: normal;
- margin: 5px 10px 5px 0px;
- padding: 3px;
- text-align: left;
- vertical-align: bottom;
-}
-
-div.output {
- background-color: #e0e0e0;
- border: 1px solid #CCCC99;
- color: #000000;
- font-size: 0.9em;
- font-weight: normal;
- margin: 5px 10px 5px 0px;
- padding: 3px;
- text-align: left;
- vertical-align: bottom;
-}
-
+}
+
+div.error {
+ background-color: #ffcccc;
+ border: 1px solid #000000;
+ color: #aa0000;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 5px 10px 5px 0px;
+ padding: 3px;
+ text-align: left;
+ vertical-align: bottom;
+}
+
+div.output {
+ background-color: #e0e0e0;
+ border: 1px solid #CCCC99;
+ color: #000000;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 5px 10px 5px 0px;
+ padding: 3px;
+ text-align: left;
+ vertical-align: bottom;
+}
+
/* ----------------------------------------------------------------------
Misc styles
---------------------------------------------------------------------- */
-
-div.NN4 {
- display: none;
-}
-
-div.rNavigationBar {
- margin-bottom: 20px;
- margin-right: 10px;
-}
-
-.entryDate {
- background: transparent;
- color: #989898;
- font-style: italic;
-}
-
-.commentTitle {
- background: #FFFFDD;
- border: 1px solid #000;
- padding: 3px;
- margin: 0px 5px 10px 0px;
- color: #000000;
- font-size: .9em;
- width: 98%;
-}
-
-.version {
- font-size: x-small;
- color: #808080;
-}
-
-.page {
- visibility: hidden;
- position: absolute;
- float:left;
- background-color: white;
- border: 1px gray solid;
- padding: 10px;
- width: 80%;
- height: 40em;
-}
-
-.tab {
- background-color: white;
- border-top: 1px gray solid;
- border-left: 1px gray solid;
- border-right: 1px gray solid;
- font-family: verdana;
- font-style: bold;
- padding: 5px;
- margin: 2px;
-}
-
+
+div.NN4 {
+ display: none;
+}
+
+div.rNavigationBar {
+ margin-bottom: 20px;
+ margin-right: 10px;
+}
+
+.entryDate {
+ background: transparent;
+ color: #989898;
+ font-style: italic;
+}
+
+.commentTitle {
+ background: #FFFFDD;
+ border: 1px solid #000;
+ padding: 3px;
+ margin: 0px 5px 10px 0px;
+ color: #000000;
+ font-size: .9em;
+ width: 98%;
+}
+
+.version {
+ font-size: x-small;
+ color: #808080;
+}
+
+.page {
+ visibility: hidden;
+ position: absolute;
+ float: left;
+ background-color: white;
+ border: 1px gray solid;
+ padding: 10px;
+ width: 80%;
+ height: 40em;
+}
+
+.tab {
+ background-color: white;
+ border-top: 1px gray solid;
+ border-left: 1px gray solid;
+ border-right: 1px gray solid;
+ font-family: verdana;
+ font-style: bold;
+ padding: 5px;
+ margin: 2px;
+}
+
/* ----------------------------------------------------------------------
form layout styles
---------------------------------------------------------------------- */
-
-div.row {
- padding:2px;
-}
-
-div.formrow {
- float:left:
- width:80%;
-}
-
-label.formrow {
- float:left;
- text-align: right;
- width:20%;
- padding-right: 1em;
-}
-
-div.buttonBox {
- width: 98%;
- border: 1px solid black;
- background-color: #f3f3f3;
- padding: 3px;
- margin-top: 5em;
- clear:both;
-}
-
-.left {
- font-size:small;
- width: 136px;
-}
-
-.leftTitle {
- font-size:small;
- font-weight:bold;
-}
-
+
+div.row {
+ padding: 2px;
+}
+
+div.formrow {
+ float: left:
+ width: 80%;
+}
+
+label.formrow {
+ float: left;
+ text-align: right;
+ width: 20%;
+ padding-right: 1em;
+}
+
+div.buttonBox {
+ width: 98%;
+ border: 1px solid black;
+ background-color: #f3f3f3;
+ padding: 3px;
+ margin-top: 5em;
+ clear: both;
+}
+
+.left {
+ font-size: small;
+ width: 136px;
+}
+
+.leftTitle {
+ font-size: small;
+ font-weight: bold;
+}
+
/* ----------------------------------------------------------------------
weblog editor styles
----------------------------------------------------------------------- */
-
-div.previewEntry {
- border: 1px solid gray;
- clear:both;
- height: 22em;
- width: 98%;
- padding: 10px;
- overflow:auto;
-}
-
-div.centerTitle {
- border: 1px solid #ccc;
- background: #CCCC99;
- color: black;
- font-weight: bolder;
- font-size: large;
- text-align: center;
-}
-
-div.control {
- width:95%;
- background:#CCCC99;
- padding:4px;
- margin:5px;
-}
-
-div.controlToggle {
- width:95%;
- color:black;
- background:#CCCC99;
- padding:4px;
- margin:5px;
- border-top: 1px solid #c0c0c0;
-}
-
-a.controlToggle {
- color:black;
- background: transparent;
- text-decoration: none;
-}
-
-a.controlToggle:link {
- color:black;
- background: transparent;
- text-decoration: none;
-}
-
-a.controlToggle:visited {
- color:black;
- background: transparent;
- text-decoration: none;
-}
-
-a.controlToggle:hover {
- color:black;
- background: transparent;
- text-decoration: underline;
- font-weight: bold;
-}
-
-
-
+---------------------------------------------------------------------- */
+
+div.previewEntry {
+ border: 1px solid gray;
+ clear: both;
+ height: 22em;
+ width: 98%;
+ padding: 10px;
+ overflow: auto;
+}
+
+div.centerTitle {
+ border: 1px solid #ccc;
+ background: #CCCC99;
+ color: black;
+ font-weight: bolder;
+ font-size: large;
+ text-align: center;
+}
+
+div.control {
+ width: 90%;
+ background: #CCCC99;
+ padding: 4px;
+ margin: 5px 5px 5px 0px;
+}
+
+div.controlToggle {
+ width: 90%;
+ color: black;
+ background: #CCCC99;
+ padding: 4px;
+ margin: 5px 5px 5px 0px;
+ border: 1px solid #c0c0c0;
+}
+
+a.controlToggle {
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+
+a.controlToggle:link {
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+
+a.controlToggle:visited {
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+
+a.controlToggle:hover {
+ color: black;
+ background: transparent;
+ text-decoration: underline;
+ font-weight: bold;
+}
+
+
+
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=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/status.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/status.jsp Thu Aug 4 12:01:27 2005
@@ -24,7 +24,7 @@
<fmt:message key="mainPage.currentWebsite" />:<br />
[<b><%= website.getHandle() %></b>]<br />
<% } %>
- <br />
+ <fmt:message key="navigationBar.youMay" />
<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>
Modified: incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Thu Aug 4 12:01:27 2005
@@ -103,6 +103,11 @@
<input type="submit" value='<fmt:message key="inviteMember.button.save" />'></input>
</div>
+ <div class="helptext">
+ <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
+ <fmt:message key="memberPermissions.permissionHelp" />
+ </div>
+
</html:form>
<%@ include file="/theme/footer.jsp" %>
Modified: incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp Thu Aug 4 12:01:27 2005
@@ -8,6 +8,7 @@
</fmt:message>
</p>
+<img src="../images/ComposeMail16.gif" alt="mail-icon" align="bottom" />
<roller:link page="/editor/inviteMember.do">
<fmt:message key="inviteMemberDone.inviteAnother" />
</roller:link>
Modified: incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp Thu Aug 4 12:01:27 2005
@@ -1,5 +1,5 @@
<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-<% pageContext.setAttribute("leftPage","/website/MemberPermissionsSidebar.jsp"); %>
+
<script>
// <!--
function save() {
@@ -69,12 +69,27 @@
</c:forEach>
</table>
- <br />
+ <p>
+ <img src="../images/ComposeMail16.gif" alt="mail-icon" align="bottom" />
+ <roller:link page="/editor/inviteMember.do">
+ <fmt:message key="memberPermissions.inviteMember" />
+ </roller:link>
+ </p>
<div class="control">
<input type="button" onclick="javascript:save()"
value='<fmt:message key="memberPermissions.button.save" />'></input>
</div>
+
+ <div class="helptext">
+ <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
+ <fmt:message key="memberPermissions.whyInvite" />
+ </div>
+
+ <div class="helptext">
+ <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
+ <fmt:message key="memberPermissions.permissionHelp" />
+ </div>
</html:form>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Thu Aug 4 12:01:27 2005
@@ -32,6 +32,17 @@
-->
</script>
+<%-- Choose appropriate prompt at start of page --%>
+<br />
+<c:choose>
+ <c:when test="${empty model.permissions}">
+ <p><fmt:message key="yourWebsites.noBlog" />
+ <roller:link page="/editor/createWebsite.do">
+ <fmt:message key="yourWebsites.createAWeblog" />
+ </roller:link></p>
+ </c:when>
+</c:choose>
+
<html:form action="/editor/yourWebsites" method="post">
<input type="hidden" name="inviteId" value="" />
<input type="hidden" name="websiteId" value="" />
@@ -40,7 +51,7 @@
<c:if test="${!empty model.pendings}">
<h1><fmt:message key="yourWebsites.invitations" /></h1>
<p><fmt:message key="yourWebsites.invitationsPrompt" /></p>
- <c:forEach var="invite" items="${model.pendings}">
+ <c:forEach var="invite" items="${model.pendings}">
<fmt:message key="yourWebsites.youAreInvited" >
<fmt:param value="${invite.website.handle}" />
</fmt:message>
@@ -51,53 +62,72 @@
<a href='javascript:declineInvite("<c:out value='${invite.id}'/>")'>
<fmt:message key="yourWebsites.decline" />
</a><br />
- </c:forEach>
+ </c:forEach>
<br />
</c:if>
-
+
<c:choose>
- <c:when test="${!empty model.permissions}">
+ <c:when test="${!empty model.permissions}">
<h1><fmt:message key="yourWebsites.title" /></h1>
- <p><fmt:message key="yourWebsites.description" /></p>
- <table class="rollertable">
- <tr class="rHeaderTr">
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.tableTitle" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.tableDescription" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.permissions" />
- </th>
- <th class="rollertable" width="20%">
- <fmt:message key="yourWebsites.resign" />
- </th>
- </tr>
- <c:forEach var="perms" items="${model.permissions}">
- <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
- <td class="rollertable">
- <a href='javascript:selectWebsite("<c:out value='${perms.website.id}'/>")'>
- <c:out value="${perms.website.name}" />
- </a>
- </td>
- <td class="rollertable">
- <c:out value="${perms.website.description}" />
- </td>
- <td class="rollertable" align="center">
- <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
- <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
- <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
- </td>
- <td class="rollertable" align="center">
- <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
- <fmt:message key="yourWebsites.resign" />
- </a>
- </td>
- </roller:row>
- </c:forEach>
- </table>
+ <p><fmt:message key="yourWebsites.websiteTablesPrompt" /></p>
+ <table class="rollertable">
+ <tr class="rHeaderTr">
+ <th class="rollertable" width="20%">
+ <fmt:message key="yourWebsites.tableTitle" />
+ </th>
+ <th class="rollertable" width="20%">
+ <fmt:message key="yourWebsites.tableDescription" />
+ </th>
+ <th class="rollertable" width="20%">
+ <fmt:message key="yourWebsites.permissions" />
+ </th>
+ <th class="rollertable" width="20%">
+ <fmt:message key="yourWebsites.resign" />
+ </th>
+ </tr>
+ <c:forEach var="perms" items="${model.permissions}">
+ <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+ <td class="rollertable">
+ <a href='javascript:selectWebsite("<c:out value='${perms.website.id}'/>")'>
+ <c:out value="${perms.website.name}" />
+ </a>
+ </td>
+ <td class="rollertable">
+ <c:out value="${perms.website.description}" />
+ </td>
+ <td class="rollertable" align="center">
+ <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
+ <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
+ <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
+ </td>
+ <td class="rollertable" align="center">
+ <c:choose>
+ <c:when test="${perms.website.adminUserCount == 1 && perms.permissionMask == 3}">
+ <fmt:message key="yourWebsites.notAllowed" />
+ </c:when>
+ <c:otherwise>
+ <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
+ <img src="../images/Remove16.gif" alt="remove-icon" border="0" align="bottom"
+ title="<fmt:message key='yourWebsites.resign' />" />
+ </a>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </roller:row>
+ </c:forEach>
+ </table>
+
+ <c:if test="${model.groupBloggingEnabled}">
+ <p>
+ <img src="../images/New16.gif" alt="new-icon" />
+ <roller:link page="/editor/createWebsite.do">
+ <fmt:message key="yourWebsites.createWebsite" />
+ </roller:link>
+ </p>
+ </c:if> <%-- group blogging enabled --%>
+
</c:when>
+
<c:when test="${empty model.permissions}">
<h1><fmt:message key="yourWebsites.title" /></h1>
<p><fmt:message key="yourWebsites.youHaveNone" /></p>
@@ -107,8 +137,21 @@
</roller:link>
</p>
</c:when>
+
</c:choose>
-
+
</html:form>
+<br />
+
+<c:if test="${model.groupBloggingEnabled}">
+ <div class="helptext">
+ <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
+ <fmt:message key="createWebsite.whyCreateMore" />
+ </div>
+ <div class="helptext">
+ <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
+ <fmt:message key="memberPermissions.permissionHelp" />
+ </div>
+</c:if> <%-- group blogging enabled --%>
<%@ include file="/theme/footer.jsp" %>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp?rev=227447&r1=227446&r2=227447&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Thu Aug 4 12:01:27 2005
@@ -2,19 +2,23 @@
<table class="sidebarBox" >
<tr>
- <td class="sidebarBox">
+ <td class="sidebarBox">
<div class="menu-tr"><div class="menu-tl">
- <fmt:message key="mainPage.actions" />
+ <fmt:message key="mainPage.sidebarHelpTitle" />
</div></div>
</td>
</tr>
<tr>
<td>
- <p>
- <roller:link page="/editor/createWebsite.do">
- <fmt:message key="yourWebsites.createWebsite" />
- </roller:link>
- </p>
+ <img src="../images/Help16.gif" alt="help-icon" align="bottom" />
+ <c:choose>
+ <c:when test="${model.groupBloggingEnabled}">
+ <fmt:message key="yourWebsites.groupBloggingEnabled" />
+ </c:when>
+ <c:when test="${!model.groupBloggingEnabled}">
+ <fmt:message key="yourWebsites.groupBloggingDisabled" />
+ </c:when>
+ </c:choose>
</td>
</tr>
</table>