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/09 21:40:07 UTC
svn commit: r231087 - in /incubator/roller/branches/roller_2.0:
src/org/roller/business/ web/WEB-INF/classes/ web/bookmarks/
web/themes/basic/ web/themes/berkley/ web/themes/brushedmetal/
web/themes/cheb/ web/themes/clean/ web/themes/currency-i18n/ web...
Author: snoopdave
Date: Tue Aug 9 12:39:30 2005
New Revision: 231087
URL: http://svn.apache.org/viewcvs?rev=231087&view=rev
Log:
Better prompts on bookmarks and categories pages, added #showBlogrolle() macro and made initial blogroll and categories configurable via roller.properties
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
incubator/roller/branches/roller_2.0/web/themes/basic/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/berkley/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/brushedmetal/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/cheb/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/clean/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/currency-i18n/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/currency/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/grey2/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/moonshine/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/movablemanila/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/pacifica/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/robot/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/rolling/_sideColumn.vm
incubator/roller/branches/roller_2.0/web/themes/sotto/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/werner/Weblog.vm
incubator/roller/branches/roller_2.0/web/themes/x2/Weblog.vm
incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java Tue Aug 9 12:39:30 2005
@@ -12,6 +12,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.roller.RollerException;
+import org.roller.config.RollerConfig;
import org.roller.model.BookmarkManager;
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
@@ -269,85 +270,50 @@
"root", // description
null ); // image
rootCat.save();
-
- WeblogCategoryData generalCat = wmgr.createWeblogCategory(
- website, // websiteId
- rootCat,
- "General", // name
- "General", // description
- null ); // image
- generalCat.save();
-
- WeblogCategoryData javaCat = wmgr.createWeblogCategory(
- website, // websiteId
- rootCat,
- "Java", // name
- "Java", // description
- null ); // image
- javaCat.save();
-
- WeblogCategoryData musicCat = wmgr.createWeblogCategory(
- website, // websiteId
- rootCat,
- "Music", // name
- "Music", // description
- null ); // image
- musicCat.save();
-
+
+ String cats = RollerConfig.getProperty("newuser.categories");
+ if (cats != null)
+ {
+ String[] splitcats = cats.split(",");
+ for (int i=0; i<splitcats.length; i++)
+ {
+ WeblogCategoryData c = wmgr.createWeblogCategory(
+ website, // website
+ rootCat, // parent
+ splitcats[i], // name
+ splitcats[i], // description
+ null ); // image
+ c.save();
+ }
+ }
website.setBloggerCategory(rootCat);
website.setDefaultCategory(rootCat);
-
- Integer zero = new Integer(0);
-
- BookmarkManager bmgr = mRoller.getBookmarkManager();
-
+
+ BookmarkManager bmgr = mRoller.getBookmarkManager();
FolderData root = bmgr.createFolder(
null, "root", "root", website);
root.save();
- FolderData blogroll = bmgr.createFolder(
- root, "Blogroll", "Blogroll", website);
- blogroll.save();
-
- BookmarkData b1 = bmgr.createBookmark(
- blogroll, "Dave Johnson", "",
- "http://rollerweblogger.org/page/roller",
- "http://rollerweblogger.org/rss/roller",
- zero, zero, null);
- b1.save();
-
- BookmarkData b2 = bmgr.createBookmark(
- blogroll, "Matt Raible", "",
- "http://raibledesigns.com/page/rd",
- "http://raibledesigns.com/rss/rd",
- zero, zero, null);
- b2.save();
-
- BookmarkData b3 = bmgr.createBookmark(
- blogroll, "Lance Lavandowska", "",
- "http://brainopolis.dnsalias.com/roller/page/lance/",
- "http://brainopolis.dnsalias.com/roller/rss/lance/",
- zero, zero, null);
- b3.save();
-
-
- FolderData news = bmgr.createFolder(
- root, "News", "News", website);
- news.save();
-
- BookmarkData b5 = bmgr.createBookmark(
- news, "CNN", "",
- "http://www.cnn.com",
- "",
- zero, zero, null);
- b5.save();
-
- BookmarkData b6 = bmgr.createBookmark(
- news, "NY Times", "",
- "http://nytimes.com",
- "",
- zero, zero, null);
- b6.save();
+ Integer zero = new Integer(0);
+ String blogroll = RollerConfig.getProperty("newuser.blogroll");
+ if (blogroll != null)
+ {
+ String[] splitroll = blogroll.split(",");
+ for (int i=0; i<splitroll.length; i++)
+ {
+ String[] rollitems = splitroll[i].split("\\|");
+ BookmarkData b = bmgr.createBookmark(
+ root, // parent
+ rollitems[0], // name
+ "", // description
+ rollitems[1].trim(), // url
+ null, // feedurl
+ zero, // weight
+ zero, // priority
+ null); // image
+ b.save();
+ }
+ }
// Add user as member of website
PermissionsData perms = new PermissionsData();
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=231087&r1=231086&r2=231087&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 Tue Aug 9 12:39:30 2005
@@ -20,18 +20,29 @@
# ----------------------------------------------------------- BookmarksForm.jsp
bookmarksForm.addBookmark=Add Bookmark
-bookmarksForm.addFolder=Add Folder
+bookmarksForm.addFolder=Add Bookmark Folder
bookmarksForm.checkAll=Select All
bookmarksForm.checkNone=Select None
bookmarksForm.delete=Delete selected
bookmarksForm.description=Description
bookmarksForm.edit=Edit
bookmarksForm.edit.tip=Click to edit this folder or bookmark
-bookmarksForm.folder=Folder
+bookmarksForm.folder=Bookmark Folder
bookmarksForm.move=Move selected
bookmarksForm.name=Name
bookmarksForm.path=Path
bookmarksForm.root=root
+bookmarksForm.rootTitle=Bookmarks
+bookmarksForm.rootPrompt=\
+This is your top-level bookmarks folder. \
+The bookmarks you keep here will appear in the blogroll section of your blog \
+(assuming that you are using one of the default themes). You can create \
+bookmark folders here, but you will have to add corresponding bookmark display \
+macros to your weblog's templates if you wish to display their contents.
+bookmarksForm.folderPrompt=\
+This is a bookmark. You can add bookmarks here and even bookmark \
+folders, but they will not be displayed on your blog unless add the \
+appropriate bookmark display macros to your weblog's templates.
bookmarksForm.visitLink=Visit
bookmarksForm.visitLink.tip=Click to visit this site
@@ -69,6 +80,16 @@
categoriesForm.description=Description
categoriesForm.edit=Edit
categoriesForm.root=root
+categoriesForm.rootTitle=Categories
+categoriesForm.rootPrompt=\
+These are your top-level weblog categories. \
+You can use categories to organize your weblog entries and your readers can \
+choose to subscribe to separate newsfeeds for each of your categories. \
+You can also define sub-categories, but many of the Roller macros display \
+only top-level categories.
+categoriesForm.categoryPrompt=\
+You can add sub-categories here, but many of the Roller macros display \
+only top-level categories.
categoriesForm.addCategory=Add Category
categoriesForm.checkAll=Check All
categoriesForm.checkNone=Check None
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm Tue Aug 9 12:39:30 2005
@@ -107,3 +107,5 @@
#end
#end
+#macro( showBlogroll )#showBookmarks("/" false false)#end
+
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=231087&r1=231086&r2=231087&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 Tue Aug 9 12:39:30 2005
@@ -223,6 +223,25 @@
planet.aggregator.enabled=false
#----------------------------------
+# user creation setttings: blogroll and cats for new users
+
+# list of links to include in root bookmark folder of each new blog
+# format is like so: linktitle2|linkurl2,linktitle2|linkurl2,linktitle3|linkurl3
+newuser.blogroll=\
+Dave Johnson|http://rollerweblogger.org/page/roller,\
+Matt Raible|http://raibledesigns.com/page/rd,\
+Lance Lavandowska|http://brainopolis.dnsalias.com/roller/page/lance,\
+Anil Gangolli|www.busybuddha.org/blog/page/anil,\
+Henri Yandell|http://blog.generationjava.com/roller/page/bayard,\
+Allen Gilliland|http://blogs.sun.com/gconf,\
+blogs.sun.com|http://blogs.sun.com,\
+jroller.com|http://jroller.com
+
+# comma-separated list of top-level categories to be created in each new weblog
+newuser.categories=\
+General,Status,Java,Music,Politics,Music
+
+#----------------------------------
# misc settings
loginfilter.rememberme.enabled=true
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp Tue Aug 9 12:39:30 2005
@@ -1,5 +1,5 @@
<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-<% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
+<% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
<%-- JavaScript for bookmarks table --%>
<script type="text/javascript">
@@ -32,48 +32,38 @@
//-->
</script>
-<h1>
- <fmt:message key="bookmarksForm.folder" />:
- <c:if test="${empty folder}">
- <fmt:message key="bookmarksForm.root" />
- </c:if>
- <c:if test="${!(empty folder)}">
- <c:out value="${folder.name}" />
- </c:if>
-</h1>
-
-<%-- Folder path --%>
-
-<p>
-<b><fmt:message key="bookmarksForm.path" /></b>:
-
-<c:if test="${empty folderPath}">
- /
- <roller:link page="/editor/bookmarks.do">
- <roller:linkparam id="method" value="selectFolder" />
- <fmt:message key="bookmarksForm.root" />
- </roller:link>
-</c:if>
-</p>
-
-<p>
-<c:if test="${!(empty folderPath)}">
- <c:forEach var="folder" items="${folderPath}">
- /
- <roller:link page="/editor/bookmarks.do">
- <roller:linkparam id="method" value="selectFolder" />
- <roller:linkparam
- id="<%= RollerRequest.FOLDERID_KEY %>"
- name="folder" property="id" />
- <c:out value="${folder.name}" />
- </roller:link>
- </c:forEach>
- <br />
-</c:if>
-</p>
-
-<br />
-
+<p>
+<c:choose>
+ <c:when test="${empty folderPath}">
+ <h1><fmt:message key="bookmarksForm.rootTitle" /></h1>
+ <p><fmt:message key="bookmarksForm.rootPrompt" /></p>
+ </c:when>
+
+ <c:when test="${!(empty folderPath)}">
+ <h1>
+ <fmt:message key="bookmarksForm.folder" />
+ [<c:out value="${folder.name}" />]
+ </h1>
+ <p>
+ <b><fmt:message key="bookmarksForm.path" /></b>:
+ <c:forEach var="folder" items="${folderPath}">
+ /
+ <roller:link page="/editor/bookmarks.do">
+ <roller:linkparam id="method" value="selectFolder" />
+ <roller:linkparam
+ id="<%= RollerRequest.FOLDERID_KEY %>"
+ name="folder" property="id" />
+ <c:out value="${folder.name}" />
+ </roller:link>
+ </c:forEach>
+ <p>
+ <p><fmt:message key="bookmarksForm.folderPrompt" /></p>
+ </c:when>
+</c:choose>
+</p>
+
+<br />
+
<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
<html:form action="/editor/bookmarks" method="post">
@@ -92,18 +82,18 @@
<%-- Delete-selected button --%>
<input type="button" value="<fmt:message key='bookmarksForm.delete' />"
onclick="onDelete()"/></input>
-
-<%-- Move-selected button --%>
-<input type="button" value="<fmt:message key='bookmarksForm.move' />"
- onclick="onMove()"/></input>
-
-<%-- Move-to combo-box --%>
-<html:select property="moveToFolderId" size="1">
- <html:options collection="allFolders"
- property="id" labelProperty="path"/>
-</html:select>
-</p>
-
+
+<%-- Move-selected button --%>
+<input type="button" value="<fmt:message key='bookmarksForm.move' />"
+ onclick="onMove()"/></input>
+
+<%-- Move-to combo-box --%>
+<html:select property="moveToFolderId" size="1">
+ <html:options collection="allFolders"
+ property="id" labelProperty="path"/>
+</html:select>
+</p>
+
<table class="rollertable">
<tr class="rHeaderTr">
Modified: incubator/roller/branches/roller_2.0/web/themes/basic/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/basic/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/basic/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/basic/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -26,8 +26,7 @@
<h2>Links</h2>
<div class="sidebar">
- #showBookmarks("Blogroll" true false)
- #showBookmarks("News" true false)
+ #showBlogroll()
</div>
<h2>Navigation</h2>
Modified: incubator/roller/branches/roller_2.0/web/themes/berkley/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/berkley/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/berkley/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/berkley/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -184,7 +184,9 @@
<td><img src="#showThemePath('berkley')/images/ctrl_title_t.gif"></td>
</tr>
<tr>
- <td class="ctrl_content">#showBookmarks("Blogroll" true false)</td>
+ <td class="ctrl_content">
+ #showBlogroll()
+ </td>
<td> </td>
</tr>
</table>
Modified: incubator/roller/branches/roller_2.0/web/themes/brushedmetal/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/brushedmetal/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/brushedmetal/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/brushedmetal/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -27,8 +27,7 @@
<hr />
<h3>BlogRoll</h3>
- #showBookmarks("Blogroll" true true)
- #showBookmarks("News" true true)
+ #showBlogroll()
<h3>Newsfeeds</h3>
#showRSSBadge()<br />
Modified: incubator/roller/branches/roller_2.0/web/themes/cheb/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/cheb/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/cheb/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/cheb/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -32,10 +32,7 @@
#showSearchForm()
</div>
<div class="item">
- #showBookmarks("Blogroll" false false )
- <div>
- <div class="item">
- #showBookmarks("News" false false)
+ #showBlogroll()
</div>
<div class="item">
#showEditorNavBar(true)
Modified: incubator/roller/branches/roller_2.0/web/themes/clean/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/clean/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/clean/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/clean/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -25,8 +25,7 @@
#showRSSBadge()<br><br><br>
#showBasicNavBar(true)<br>
#showSearchForm()<br>
- #showBookmarks("Blogroll" true false)<br>
- #showBookmarks("News" true false)<br>
+ #showBlogroll()<br>
#showEditorNavBar(true)<br>
#showReferers(30 20)
</td>
Modified: incubator/roller/branches/roller_2.0/web/themes/currency-i18n/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/currency-i18n/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/currency-i18n/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/currency-i18n/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -143,8 +143,7 @@
<tr>
<td class="links">
- #showBookmarks("Blogroll" true false)<br>
- #showBookmarks("News" true false)<br>
+ #showBlogroll()<br>
#showBasicNavBar(true)<br>
#showEditorNavBar(true)<br>
Modified: incubator/roller/branches/roller_2.0/web/themes/currency/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/currency/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/currency/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/currency/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -143,8 +143,7 @@
<tr>
<td class="links">
- #showBookmarks("Blogroll" true false)<br>
- #showBookmarks("News" true false)<br>
+ #showBlogroll()<br>
#showBasicNavBar(true)<br>
#showEditorNavBar(true)<br>
Modified: incubator/roller/branches/roller_2.0/web/themes/grey2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/grey2/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/grey2/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/grey2/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -89,8 +89,7 @@
</tr>
<tr>
<td bgcolor="#ffffff" height="15">
- #showBookmarks("Blogroll" true false)<br>
- #showBookmarks("News" true false)<br>
+ #showBlogroll()<br>
#showBasicNavBar(true)<br>
<!-- Use the basic format to add as many links as you like --> #showEditorNavBar(true)<br>
<a href="http://comatised.com/design"><font face="Verdana"
Modified: incubator/roller/branches/roller_2.0/web/themes/moonshine/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/moonshine/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/moonshine/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/moonshine/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -60,12 +60,7 @@
<h2>Bookmarks::Blogroll</h2>
<div class="padded">
- #showBookmarks("Blogroll" true false)
- </div>
-
- <h2>Bookmarks::News</h2>
- <div class="padded">
- #showBookmarks("News" true false)
+ #showBlogroll()
</div>
<h2>Blog::Referers</h2>
Modified: incubator/roller/branches/roller_2.0/web/themes/movablemanila/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/movablemanila/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/movablemanila/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/movablemanila/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -33,8 +33,7 @@
<div align="center">#showWeblogCalendar()</div>
<div class="sidetitle">BlogRoll</div>
- #showBookmarks("Blogroll" true true)
- #showBookmarks("News" true true)
+ #showBlogroll()
<div class="sidetitle">Newsfeeds</div>
#showRSSBadge()<br />
Modified: incubator/roller/branches/roller_2.0/web/themes/pacifica/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/pacifica/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/pacifica/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/pacifica/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -61,8 +61,7 @@
<span class="label"><br>LINKS</span><br>
- #showBookmarks("Blogroll" false false)<br>
- #showBookmarks("News" true false)<br>
+ #showBlogroll()<br>
#showBasicNavBar(true)<br>
#showEditorNavBar(true)<br><br>
Modified: incubator/roller/branches/roller_2.0/web/themes/robot/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/robot/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/robot/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/robot/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -40,8 +40,7 @@
#showRSSBadge()<br>
#showRSSLinks()
<h2>Links</h2>
- #showBookmarks("Blogroll" true true)<br>
- #showBookmarks("News" true false)
+ #showBlogroll()
<h2>Navigation</h2>
#showBasicNavBar(true)<br>
#showEditorNavBar(true)<br>
Modified: incubator/roller/branches/roller_2.0/web/themes/rolling/_sideColumn.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/rolling/_sideColumn.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/rolling/_sideColumn.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/rolling/_sideColumn.vm Tue Aug 9 12:39:30 2005
@@ -18,9 +18,7 @@
<div class="box"><h2 class="box">links</h2>
<br/>
-#showBookmarks("Blogroll" true true)
-<br/>
-#showBookmarks("News" true true)
+#showBlogroll()
<br/>
</div>
Modified: incubator/roller/branches/roller_2.0/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/sotto/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/sotto/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/sotto/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -107,13 +107,7 @@
<div class="sidebarBox">
<div class="links">
- #showBookmarks("Blogroll" true false)
- </div>
- </div>
-
- <div class="sidebarBox">
- <div class="links">
- #showBookmarks("News" true false)
+ #showBlogroll()
</div>
</div>
Modified: incubator/roller/branches/roller_2.0/web/themes/werner/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/werner/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/werner/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/werner/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -48,9 +48,7 @@
<div class="menubox"><h2 class="box">links</h2>
<br/>
- #showBookmarks("Blogroll" true false )
- <br/>
- #showBookmarks("News" true false )
+ #showBlogroll()
<br/>
</div>
Modified: incubator/roller/branches/roller_2.0/web/themes/x2/Weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/themes/x2/Weblog.vm?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/themes/x2/Weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/themes/x2/Weblog.vm Tue Aug 9 12:39:30 2005
@@ -39,10 +39,7 @@
#showWeblogCalendar()
</div>
<div class="item">
- #showBookmarks("Blogroll" true false)
- </div>
- <div class="item">
- #showBookmarks("News" true false)
+ #showBlogroll()
</div>
<div class="item">
#showEditorNavBar(true)
Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp?rev=231087&r1=231086&r2=231087&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Tue Aug 9 12:39:30 2005
@@ -1,5 +1,5 @@
<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-<% pageContext.setAttribute("leftPage","/weblog/CategoriesSidebar.jsp"); %>
+<% pageContext.setAttribute("leftPage","/weblog/CategoriesSidebar.jsp"); %>
<%-- JavaScript for categories table --%>
<script type="text/javascript">
@@ -24,44 +24,36 @@
//-->
</script>
-<h1>
- <fmt:message key="categoriesForm.parent" />:
- <c:if test="${empty category}">
- <fmt:message key="categoriesForm.root" />
- </c:if>
- <c:if test="${!(empty category)}">
- <c:out value="${category.name}" />
- </c:if>
-</h1>
-
-<%-- Category path --%>
-
<p>
-<b><fmt:message key="categoriesForm.path" /></b>:
+<c:choose>
+ <c:when test="${empty categoryPath}">
+ <h1><fmt:message key="categoriesForm.rootTitle" /></h1>
+ <p><fmt:message key="categoriesForm.rootPrompt" /></p>
+ </c:when>
+
+ <c:when test="${!(empty categoryPath)}">
+ <h1>
+ <fmt:message key="categoriesForm.parent" />
+ [<c:out value="${category.name}" />]
+ </h1>
+ <p>
+ <b><fmt:message key="categoriesForm.path" /></b>:
+ <c:forEach var="category" items="${categoryPath}">
+ /
+ <roller:link page="/editor/categories.do">
+ <roller:linkparam id="method" value="selectCategory" />
+ <roller:linkparam
+ id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>"
+ name="category" property="id" />
+ <c:out value="${category.name}" />
+ </roller:link>
+ </c:forEach>
+ </p>
+ <p><fmt:message key="categoriesForm.categoryPrompt" /></p>
+ </c:when>
+</c:choose>
+</p>
-<c:if test="${empty categoryPath}">
- /
- <roller:link page="/editor/categories.do">
- <roller:linkparam id="method" value="selectCategory" />
- <fmt:message key="categoriesForm.root" />
- </roller:link>
-</c:if>
-
-<c:if test="${!(empty categoryPath)}">
- <c:forEach var="category" items="${categoryPath}">
- /
- <roller:link page="/editor/categories.do">
- <roller:linkparam id="method" value="selectCategory" />
- <roller:linkparam
- id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>"
- name="category" property="id" />
- <c:out value="${category.name}" />
- </roller:link>
- </c:forEach>
- <br />
-</c:if>
-</p>
-
<br />
<%-- Form is a table of categories each with checkbox --%>
@@ -156,7 +148,7 @@
</c:forEach>
</table>
-
+
</html:form>
<%@ include file="/theme/footer.jsp" %>