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 2007/06/06 01:15:52 UTC
svn commit: r544674 [2/3] - in /roller/branches/roller_guice: ./
apps/weblogger/src/java/org/apache/roller/weblogger/pojos/
apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/
apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/ ...
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java Tue Jun 5 16:15:47 2007
@@ -19,14 +19,13 @@
package org.apache.roller.weblogger.ui.struts2.admin;
import java.text.DateFormat;
-import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
+import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.util.DateUtil;
import org.apache.roller.weblogger.util.Utilities;
@@ -36,12 +35,11 @@
public class GlobalCommentManagementBean {
private String searchString = null;
- private Date startDate = null;
- private Date endDate = null;
+ private String startDateString = null;
+ private String endDateString = null;
private String spamString = "ALL";
private String approvedString = "ALL";
- private int count = 30;
- private int offset = 0;
+ private int page = 0;
private String[] spamComments = new String[0];
private String[] deleteComments = new String[0];
@@ -92,22 +90,22 @@
}
}
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
+ public Date getStartDate() {
+ if(!StringUtils.isEmpty(getStartDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getStartDateString());
+ } catch(Exception e) { }
+ return null;
}
-
- public int getOffset() {
- return offset;
+
+ public Date getEndDate() {
+ if(!StringUtils.isEmpty(getEndDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getEndDateString());
+ } catch(Exception e) { }
+ return null;
}
- public void setOffset(int offset) {
- this.offset = offset;
- }
public String getSpamString() {
return spamString;
@@ -141,22 +139,6 @@
this.searchString = searchString;
}
- public Date getStartDate() {
- return startDate;
- }
-
- public void setStartDate(Date startDate) {
- this.startDate = startDate;
- }
-
- public Date getEndDate() {
- return endDate;
- }
-
- public void setEndDate(Date endDate) {
- this.endDate = endDate;
- }
-
public String[] getSpamComments() {
return spamComments;
}
@@ -171,6 +153,38 @@
public void setDeleteComments(String[] deleteComments) {
this.deleteComments = deleteComments;
+ }
+
+ public String getApprovedString() {
+ return approvedString;
+ }
+
+ public void setApprovedString(String approvedString) {
+ this.approvedString = approvedString;
+ }
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
+ }
+
+ public String getStartDateString() {
+ return startDateString;
+ }
+
+ public void setStartDateString(String startDateString) {
+ this.startDateString = startDateString;
+ }
+
+ public String getEndDateString() {
+ return endDateString;
+ }
+
+ public void setEndDateString(String endDateString) {
+ this.endDateString = endDateString;
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Tue Jun 5 16:15:47 2007
@@ -121,7 +121,6 @@
// copy form data into new user pojo
User ud = new User();
getBean().copyTo(ud); // doesn't copy password
- ud.setId(null);
ud.setUserName(getBean().getUserName());
ud.setDateCreated(new java.util.Date());
ud.setEnabled(Boolean.TRUE);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Tue Jun 5 16:15:47 2007
@@ -21,18 +21,23 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -43,11 +48,14 @@
private static Log log = LogFactory.getLog(Comments.class);
+ // number of comments to show per page
+ private static final int COUNT = 30;
+
// bean for managing submitted data
private CommentsBean bean = new CommentsBean();
- // list of comments to display
- private List comments = Collections.EMPTY_LIST;
+ // pager for the comments we are viewing
+ private CommentsPager pager = null;
// first comment in the list
private WeblogEntryComment firstComment = null;
@@ -55,15 +63,6 @@
// last comment in the list
private WeblogEntryComment lastComment = null;
- // are there more results for the query?
- private boolean moreResults = false;
-
- // link to previous page of results
- private String prevLink = null;
-
- // linke to next page of results
- private String nextLink = null;
-
// indicates number of comments that would be deleted by bulk removal
// a non-zero value here indicates bulk removal is a valid option
private int bulkDeleteCount = 0;
@@ -84,37 +83,78 @@
public void loadComments() {
+ List comments = Collections.EMPTY_LIST;
+ boolean hasMore = false;
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- List comments = wmgr.getComments(
+
+ // lookup weblog entry if necessary
+ WeblogEntry queryEntry = null;
+ if(!StringUtils.isEmpty(getBean().getEntryId())) {
+ queryEntry = wmgr.getWeblogEntry(getBean().getEntryId());
+ }
+
+ // query for comments
+ comments = wmgr.getComments(
getActionWeblog(),
- null,
+ queryEntry,
getBean().getSearchString(),
getBean().getStartDate(),
getBean().getEndDate(),
getBean().getStatus(),
true, // reverse chrono order
- getBean().getOffset(),
- getBean().getCount() + 1);
+ getBean().getPage() * COUNT,
+ COUNT + 1);
if(comments != null && comments.size() > 0) {
- if(comments.size() > getBean().getCount()) {
+ if(comments.size() > COUNT) {
comments.remove(comments.size()-1);
- setMoreResults(true);
+ hasMore = true;
}
- setComments(comments);
setFirstComment((WeblogEntryComment)comments.get(0));
setLastComment((WeblogEntryComment)comments.get(comments.size()-1));
- loadNextPrevLinks(isMoreResults());
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
// TODO: i18n
addError("Error looking up comments");
}
+
+ // build comments pager
+ String baseUrl = buildBaseUrl();
+ setPager(new CommentsPager(baseUrl, getBean().getPage(), comments, hasMore));
}
-
+
+
+ // use the action data to build a url representing this action, including query data
+ private String buildBaseUrl() {
+
+ Map<String, String> params = new HashMap();
+
+ if(!StringUtils.isEmpty(getBean().getEntryId())) {
+ params.put("bean.entryId", getBean().getEntryId());
+ }
+ if(!StringUtils.isEmpty(getBean().getSearchString())) {
+ params.put("bean.searchString", getBean().getSearchString());
+ }
+ if(!StringUtils.isEmpty(getBean().getStartDateString())) {
+ params.put("bean.startDateString", getBean().getStartDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getEndDateString())) {
+ params.put("bean.endDateString", getBean().getEndDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getApprovedString())) {
+ params.put("bean.approvedString", getBean().getApprovedString());
+ }
+ if(!StringUtils.isEmpty(getBean().getSpamString())) {
+ params.put("bean.spamString", getBean().getSpamString());
+ }
+
+ return URLUtilities.getActionURL("comments", "/roller-ui/authoring",
+ getActionWeblog().getHandle(), params, false);
+ }
+
public String execute() {
@@ -122,7 +162,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
return LIST;
}
@@ -137,7 +177,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
@@ -152,7 +192,7 @@
0,
-1);
- if(allMatchingComments.size() > getBean().getCount()) {
+ if(allMatchingComments.size() > COUNT) {
setBulkDeleteCount(allMatchingComments.size());
}
@@ -303,11 +343,6 @@
}
- private void loadNextPrevLinks(boolean moreResults) {
-
- }
-
-
public List getCommentStatusOptions() {
List opts = new ArrayList();
@@ -340,14 +375,6 @@
this.bean = bean;
}
- public List getComments() {
- return comments;
- }
-
- public void setComments(List comments) {
- this.comments = comments;
- }
-
public int getBulkDeleteCount() {
return bulkDeleteCount;
}
@@ -372,28 +399,12 @@
this.lastComment = lastComment;
}
- public String getPrevLink() {
- return prevLink;
- }
-
- public void setPrevLink(String prevLink) {
- this.prevLink = prevLink;
- }
-
- public String getNextLink() {
- return nextLink;
- }
-
- public void setNextLink(String nextLink) {
- this.nextLink = nextLink;
- }
-
- public boolean isMoreResults() {
- return moreResults;
+ public CommentsPager getPager() {
+ return pager;
}
- public void setMoreResults(boolean moreResults) {
- this.moreResults = moreResults;
+ public void setPager(CommentsPager pager) {
+ this.pager = pager;
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java Tue Jun 5 16:15:47 2007
@@ -18,10 +18,13 @@
package org.apache.roller.weblogger.ui.struts2.editor;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.Utilities;
@@ -31,13 +34,13 @@
*/
public class CommentsBean {
+ private String entryId = null;
private String searchString = null;
- private Date startDate = null;
- private Date endDate = null;
+ private String startDateString = null;
+ private String endDateString = null;
private String spamString = "ALL";
private String approvedString = "ALL";
- private int count = 30;
- private int offset = 0;
+ private int page = 0;
private String[] approvedComments = new String[0];
private String[] spamComments = new String[0];
@@ -96,22 +99,22 @@
}
}
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
+ public Date getStartDate() {
+ if(!StringUtils.isEmpty(getStartDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getStartDateString());
+ } catch(Exception e) { }
+ return null;
}
-
- public int getOffset() {
- return offset;
+
+ public Date getEndDate() {
+ if(!StringUtils.isEmpty(getEndDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getEndDateString());
+ } catch(Exception e) { }
+ return null;
}
- public void setOffset(int offset) {
- this.offset = offset;
- }
public String getSpamString() {
return spamString;
@@ -145,22 +148,6 @@
this.searchString = searchString;
}
- public Date getStartDate() {
- return startDate;
- }
-
- public void setStartDate(Date startDate) {
- this.startDate = startDate;
- }
-
- public Date getEndDate() {
- return endDate;
- }
-
- public void setEndDate(Date endDate) {
- this.endDate = endDate;
- }
-
public String[] getApprovedComments() {
return approvedComments;
}
@@ -183,6 +170,46 @@
public void setDeleteComments(String[] deleteComments) {
this.deleteComments = deleteComments;
+ }
+
+ public String getApprovedString() {
+ return approvedString;
+ }
+
+ public void setApprovedString(String approvedString) {
+ this.approvedString = approvedString;
+ }
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
+ }
+
+ public String getStartDateString() {
+ return startDateString;
+ }
+
+ public void setStartDateString(String startDateString) {
+ this.startDateString = startDateString;
+ }
+
+ public String getEndDateString() {
+ return endDateString;
+ }
+
+ public void setEndDateString(String endDateString) {
+ this.endDateString = endDateString;
+ }
+
+ public String getEntryId() {
+ return entryId;
+ }
+
+ public void setEntryId(String entryId) {
+ this.entryId = entryId;
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Tue Jun 5 16:15:47 2007
@@ -19,8 +19,10 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -29,8 +31,10 @@
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.ui.struts2.pagers.EntriesPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.URLUtilities;
/**
@@ -40,11 +44,14 @@
private static Log log = LogFactory.getLog(Entries.class);
+ // number of comments to show per page
+ private static final int COUNT = 30;
+
// bean for managing submitted data
private EntriesBean bean = new EntriesBean();
- // list of entries to display
- private List<WeblogEntry> entries = Collections.EMPTY_LIST;
+ // pager for the entries we are viewing
+ private EntriesPager pager = null;
// first entry in the list
private WeblogEntry firstEntry = null;
@@ -52,9 +59,6 @@
// last entry in the list
private WeblogEntry lastEntry = null;
- // are there more results for the query?
- private boolean moreResults = false;
-
public Entries() {
this.actionName = "entries";
@@ -75,11 +79,13 @@
log.debug("entries bean is ...\n"+getBean().toString());
}
+ List<WeblogEntry> entries = null;
+ boolean hasMore = false;
try {
String status = getBean().getStatus();
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- List<WeblogEntry> entries = wmgr.getWeblogEntries(
+ entries = wmgr.getWeblogEntries(
getActionWeblog(),
null,
getBean().getStartDate(),
@@ -91,18 +97,17 @@
getBean().getSortBy(),
null,
null,
- getBean().getOffset(),
- getBean().getCount() + 1);
+ getBean().getPage() * COUNT,
+ COUNT + 1);
if(entries != null && entries.size() > 0) {
log.debug("query found "+entries.size()+" results");
- if(entries.size() > getBean().getCount()) {
+ if(entries.size() > COUNT) {
entries.remove(entries.size()-1);
- setMoreResults(true);
+ hasMore = true;
}
- setEntries(entries);
setFirstEntry((WeblogEntry)entries.get(0));
setLastEntry((WeblogEntry)entries.get(entries.size()-1));
}
@@ -112,10 +117,46 @@
addError("Error looking up entries");
}
+ // build entries pager
+ String baseUrl = buildBaseUrl();
+ setPager(new EntriesPager(baseUrl, getBean().getPage(), entries, hasMore));
+
return LIST;
}
+ // use the action data to build a url representing this action, including query data
+ private String buildBaseUrl() {
+
+ Map<String, String> params = new HashMap();
+
+ if(!StringUtils.isEmpty(getBean().getCategoryPath())) {
+ params.put("bean.categoryPath", getBean().getCategoryPath());
+ }
+ if(!StringUtils.isEmpty(getBean().getTagsAsString())) {
+ params.put("bean.tagsAsString", getBean().getTagsAsString());
+ }
+ if(!StringUtils.isEmpty(getBean().getText())) {
+ params.put("bean.text", getBean().getText());
+ }
+ if(!StringUtils.isEmpty(getBean().getStartDateString())) {
+ params.put("bean.startDateString", getBean().getStartDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getEndDateString())) {
+ params.put("bean.endDateString", getBean().getEndDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getStatus())) {
+ params.put("bean.status", getBean().getStatus());
+ }
+ if(!StringUtils.isEmpty(getBean().getSortBy())) {
+ params.put("bean.sortBy", getBean().getSortBy());
+ }
+
+ return URLUtilities.getActionURL("entries", "/roller-ui/authoring",
+ getActionWeblog().getHandle(), params, false);
+ }
+
+
public List<WeblogCategory> getCategories() {
// make list of categories with first option being being a transient
// category just meant to represent the default option of any category
@@ -162,14 +203,6 @@
this.bean = bean;
}
- public List<WeblogEntry> getEntries() {
- return entries;
- }
-
- public void setEntries(List<WeblogEntry> entries) {
- this.entries = entries;
- }
-
public WeblogEntry getFirstEntry() {
return firstEntry;
}
@@ -186,12 +219,12 @@
this.lastEntry = lastEntry;
}
- public boolean isMoreResults() {
- return moreResults;
+ public EntriesPager getPager() {
+ return pager;
}
- public void setMoreResults(boolean moreResults) {
- this.moreResults = moreResults;
+ public void setPager(EntriesPager pager) {
+ this.pager = pager;
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java Tue Jun 5 16:15:47 2007
@@ -18,8 +18,11 @@
package org.apache.roller.weblogger.ui.struts2.editor;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.util.Utilities;
@@ -28,19 +31,14 @@
*/
public class EntriesBean {
- private Date endDate = null;
- private Date startDate = null;
+ private String endDateString = null;
+ private String startDateString = null;
private String categoryPath = null;
private String tagsAsString = null;
private String text = null;
private String status = "ALL";
private String sortBy = "updateTime";
-
- /** max entries displayed per page */
- private int count = 30;
-
- /** offset into current query results */
- private int offset = 0;
+ private int page = 0;
public EntriesBean() {
@@ -55,23 +53,23 @@
}
}
-
- public Date getEndDate() {
- return endDate;
- }
-
- public void setEndDate(Date endDate) {
- this.endDate = endDate;
- }
-
public Date getStartDate() {
- return startDate;
+ if(!StringUtils.isEmpty(getStartDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getStartDateString());
+ } catch(Exception e) { }
+ return null;
}
-
- public void setStartDate(Date startDate) {
- this.startDate = startDate;
+
+ public Date getEndDate() {
+ if(!StringUtils.isEmpty(getEndDateString())) try {
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
+ return df.parse(getEndDateString());
+ } catch(Exception e) { }
+ return null;
}
+
public String getCategoryPath() {
return categoryPath;
}
@@ -112,20 +110,12 @@
this.sortBy = sortBy;
}
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public int getOffset() {
- return offset;
+ public int getPage() {
+ return page;
}
-
- public void setOffset(int offset) {
- this.offset = offset;
+
+ public void setPage(int page) {
+ this.page = page;
}
@@ -139,10 +129,25 @@
buf.append("catPath = ").append(getCategoryPath()).append("\n");
buf.append("tags = ").append(getTagsAsString()).append("\n");
buf.append("text = ").append(getText()).append("\n");
- buf.append("offset = ").append(getOffset()).append("\n");
- buf.append("count = ").append(getCount()).append("\n");
+ buf.append("page = ").append(getPage()).append("\n");
return buf.toString();
+ }
+
+ public String getEndDateString() {
+ return endDateString;
+ }
+
+ public void setEndDateString(String endDateString) {
+ this.endDateString = endDateString;
+ }
+
+ public String getStartDateString() {
+ return startDateString;
+ }
+
+ public void setStartDateString(String startDateString) {
+ this.startDateString = startDateString;
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml Tue Jun 5 16:15:47 2007
@@ -4,30 +4,30 @@
<field name="bean.title">
<field-validator type="requiredstring">
- <message key="weblogEdit.error.incompleteEntry">unspecified key</message>
+ <message key="Entry.error.titleNull">unspecified key</message>
</field-validator>
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <message key="EntryAdd.error.handleSize">unspecified key</message>
+ <message key="Entry.error.titleSize">unspecified key</message>
</field-validator>
</field>
<field name="bean.locale">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.localeNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.categoryId">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.categoryNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.text">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.textNull">unspecified key</message>
</field-validator>
</field>
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java Tue Jun 5 16:15:47 2007
@@ -20,6 +20,7 @@
import java.sql.Timestamp;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -219,7 +220,7 @@
log.debug("pubtime vals are "+getDateString()+", "+getHours()+", "+getMinutes()+", "+getSeconds());
// first convert the specified date string into an actual Date obj
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+ DateFormat df = new SimpleDateFormat("MM/dd/yy", locale);
df.setTimeZone(timezone);
Date newDate = df.parse(getDateString());
@@ -327,7 +328,7 @@
setMinutes(cal.get(Calendar.MINUTE));
setSeconds(cal.get(Calendar.SECOND));
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+ DateFormat df = new SimpleDateFormat("MM/dd/yy", locale);
df.setTimeZone(entry.getWebsite().getTimeZoneInstance());
setDateString(df.format(entry.getPubTime()));
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml Tue Jun 5 16:15:47 2007
@@ -4,30 +4,30 @@
<field name="bean.title">
<field-validator type="requiredstring">
- <message key="weblogEdit.error.incompleteEntry">unspecified key</message>
+ <message key="Entry.error.titleNull">unspecified key</message>
</field-validator>
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <message key="EntryAdd.error.handleSize">unspecified key</message>
+ <message key="Entry.error.titleSize">unspecified key</message>
</field-validator>
</field>
<field name="bean.locale">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.localeNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.categoryId">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.categoryNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.text">
<field-validator type="requiredstring">
- <message key="EntryAdd.error.titleNull">unspecified key</message>
+ <message key="Entry.error.textNull">unspecified key</message>
</field-validator>
</field>
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java Tue Jun 5 16:15:47 2007
@@ -299,42 +299,11 @@
}
- public class WeblogResourceComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- ThemeResource r1 = (ThemeResource)o1;
- ThemeResource r2 = (ThemeResource)o2;
-
- // consider directories so they go to the top of the list
- if(r1.isDirectory() && r2.isDirectory()) {
- // if we have 2 directories then just go by name
- return r1.getPath().compareTo(r2.getPath());
- } else if(r1.isDirectory()) {
- // directories go before files
- return -1;
- } else if(r2.isDirectory()) {
- // directories go before files
- return 1;
- } else {
- // if we have 2 files then just go by name
- return r1.getPath().compareTo(r2.getPath());
- }
- }
- public boolean equals(Object o1, Object o2) {
- ThemeResource r1 = (ThemeResource)o1;
- ThemeResource r2 = (ThemeResource)o2;
-
- // need to be same type to be equals, i.e both files or directories
- if((r1.isDirectory() && !r2.isDirectory()) ||
- (r1.isFile() && !r2.isFile())) {
- return false;
- }
-
- // after that it's just a matter of comparing paths
- return r1.getPath().equals(r2.getPath());
- }
+ public String getResourceURL(String path) {
+ return URLUtilities.getWeblogResourceURL(getActionWeblog(), path, false);
}
-
+
public String getPath() {
return path;
}
@@ -409,6 +378,42 @@
public void setUploadedFilesFileName(String[] uploadedFilesFileName) {
this.uploadedFilesFileName = uploadedFilesFileName;
+ }
+
+
+ public class WeblogResourceComparator implements Comparator {
+ public int compare(Object o1, Object o2) {
+ ThemeResource r1 = (ThemeResource)o1;
+ ThemeResource r2 = (ThemeResource)o2;
+
+ // consider directories so they go to the top of the list
+ if(r1.isDirectory() && r2.isDirectory()) {
+ // if we have 2 directories then just go by name
+ return r1.getPath().compareTo(r2.getPath());
+ } else if(r1.isDirectory()) {
+ // directories go before files
+ return -1;
+ } else if(r2.isDirectory()) {
+ // directories go before files
+ return 1;
+ } else {
+ // if we have 2 files then just go by name
+ return r1.getPath().compareTo(r2.getPath());
+ }
+ }
+ public boolean equals(Object o1, Object o2) {
+ ThemeResource r1 = (ThemeResource)o1;
+ ThemeResource r2 = (ThemeResource)o2;
+
+ // need to be same type to be equals, i.e both files or directories
+ if((r1.isDirectory() && !r2.isDirectory()) ||
+ (r1.isFile() && !r2.isFile())) {
+ return false;
+ }
+
+ // after that it's just a matter of comparing paths
+ return r1.getPath().equals(r2.getPath());
+ }
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml Tue Jun 5 16:15:47 2007
@@ -4,26 +4,26 @@
<field name="bean.name">
<field-validator type="requiredstring">
- <message key="TemplateEdit.error.nameNull">unspecified key</message>
+ <message key="Template.error.nameNull">unspecified key</message>
</field-validator>
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <message key="TemplateEdit.error.nameSize">unspecified key</message>
+ <message key="Template.error.nameSize">unspecified key</message>
</field-validator>
</field>
<field name="bean.link">
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <message key="TemplateEdit.error.linkSize">unspecified key</message>
+ <message key="Template.error.linkSize">unspecified key</message>
</field-validator>
</field>
<field name="bean.description">
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <message key="TemplateEdit.error.descriptionSize">unspecified key</message>
+ <message key="Template.error.descriptionSize">unspecified key</message>
</field-validator>
</field>
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Tue Jun 5 16:15:47 2007
@@ -403,7 +403,7 @@
ownermsg.append((escapeHtml) ? "\n" : "<br />");
Map<String, String> parameters = new HashMap();
- parameters.put("entryId", entry.getId());
+ parameters.put("bean.entryId", entry.getId());
String deleteURL = URLUtilities.getActionURL(
"comments", "/roller-ui/authoring", weblog.getHandle(), parameters, true);
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Tue Jun 5 16:15:47 2007
@@ -47,6 +47,20 @@
bookmarkForm.error.invalidURL=Invalid URL: {0}
+# errors from validation
+Bookmark.error.nameNull=Name is a required field
+Bookmark.error.nameSize=Name cannot be more than 255 characters
+Bookmark.error.descriptionSize=Description cannot be more than 255 characters
+Bookmark.error.urlNull=Url is a required field
+Bookmark.error.urlBad=The url you entered is not valid
+Bookmark.error.weightNull=Weight is a required field
+Bookmark.error.weightNotInt=Weight must be a valid integer
+Bookmark.error.priorityNull=Priority is a required field
+Bookmark.error.priorityNotInt=Priority must be a valid integer
+Bookmark.error.imageBad=The image url you entered is not valid
+Bookmark.error.feedUrlBad=The feed url you entered is not valid
+
+
# ----------------------------------------------------------- BookmarksForm.jsp
bookmarksForm.root=root
@@ -134,6 +148,13 @@
categoryForm.error.duplicateName=The category name '{0}' is already in use, you will need to choose another
+# errors from validation
+Category.error.nameNull=Name is a required field
+Category.error.nameSize=Name cannot be more than 255 characters
+Category.error.descriptionSize=Description cannot be more than 255 characters
+Category.error.imageBad=The image url you entered is not valid
+
+
# ----------------------------------------------------------- CategoriesForm.jsp
categoriesForm.name=Name
@@ -415,11 +436,26 @@
createWebsite.created=New weblog [<b>{0}</b>] has been successfully created.
+# errors from validation
+CreateWeblog.error.handleNull=Handle is a required field
+CreateWeblog.error.handleSize=Handle cannot be more than 255 characters
+CreateWeblog.error.nameNull=Name is a required field
+CreateWeblog.error.nameSize=Name cannot be more than 255 characters
+CreateWeblog.error.descriptionSize=Description cannot be more than 255 characters
+CreateWeblog.error.emailAddressNull=Email address is a required field
+CreateWeblog.error.emailAddressSize=Email address cannot be more than 255 characters
+CreateWeblog.error.emailAddressBad=The email address you entered is not properly formatted
+CreateWeblog.error.localeNull=Locale is a required field
+CreateWeblog.error.localeSize=Locale cannot be more than 8 characters
+CreateWeblog.error.timeZoneNull=Time Zone is a required field
+CreateWeblog.error.timeZoneSize=Time Zone cannot be more than 64 characters
+
createWeblog.error.missingHandle=You must enter a valid handle
createWeblog.error.invalidHandle=The handle you specified is not valid
createWeblog.error.missingEmailAddress=You must enter a valid email address
createWeblog.error.handleExists=A weblog with that handle already exists
+
# --------------------------------------------------------------- Entry editors
editor.text.name=Text Editor
@@ -580,6 +616,12 @@
folderForm.error.duplicateName=The folder name '{0}' is already in use, you will need to choose another
+# errors from validation
+Folder.error.nameNull=Name is a required field
+Folder.error.nameSize=Name cannot be more than 255 characters
+Folder.error.descriptionSize=Description cannot be more than 255 characters
+
+
# ---------------------------------------------------------------------- Footer
footer.reportIssue=Report an Issue
@@ -959,6 +1001,13 @@
pageRemove.pageId=Page ID
pageRemove.pageName=Page Name
+# errors from validation
+Template.error.nameNull=Name is a required field
+Template.error.nameSize=Name cannot be more than 255 characters
+Template.error.linkSize=Link cannot be more than 255 characters
+Template.error.descriptionSize=Description cannot be more than 255 characters
+
+
# ---------------------------------------------------- Ping Target Admin/Editing
commonPingTargets.subtitle=Manage common weblog ping targets for all weblogs.
@@ -1444,6 +1493,26 @@
userRegister.tip.password=Your password.
userRegister.tip.passwordConfirm=Confirm your password.
+# errors from validation
+Register.error.nameNull=User Name is a required field
+Register.error.nameSize=User Name cannot be more than 255 characters
+Register.error.passwordNull=Password is a required field
+Register.error.passwordSize=Password cannot be more than 255 characters
+Register.error.passwordConfirmNull=Password confirm is a required field
+Register.error.passwordConfirmSize=Password confirm cannot be more than 255 characters
+Register.error.screenNameNull=Screen Name is a required field
+Register.error.screenNameSize=Screen Name cannot be more than 255 characters
+Register.error.fullNameNull=Full name is a required field
+Register.error.fullNameSize=Full name cannot be more than 255 characters
+Register.error.emailAddressNull=Email address is a required field
+Register.error.emailAddressSize=Email address cannot be more than 255 characters
+Register.error.emailAddressBad=The email address you entered is not properly formatted
+Register.error.localeNull=Locale is a required field
+Register.error.localeSize=Locale cannot be more than 20 characters
+Register.error.timeZoneNull=Time Zone is a required field
+Register.error.timeZoneSize=Time Zone cannot be more than 20 characters
+
+
# ---------------------------------------------------------------- User settings
userSettings.button.save=Save Profile
@@ -1587,6 +1656,14 @@
weblogEdit.mediaCastLacksContentTypeOrLength=Unable to use enclosure URL. Server provided no content type or no length.
weblogEdit.error.incompleteEntry=Entry must have a title
+# errors from validation
+Entry.error.titleNull=Title is a required field
+Entry.error.titleSize=Title cannot be more than 255 characters
+Entry.error.localeNull=Locale is a required field
+Entry.error.categoyrNull=Category is a required field
+Entry.error.textNull=Content is a required field
+
+
# -------------------------------------------------------- Weblog entries Pager
weblogEntriesPager.latest.home=Main
@@ -1826,6 +1903,12 @@
websiteSettings.label1=Default Entry Formatters
websiteSettings.label2=(applied in the listed order)
+
+# errors from validation
+WeblogConfig.error.nameNull=Name is a required field
+WeblogConfig.error.nameSize=Name cannot be more than 255 characters
+WeblogConfig.error.descriptionSize=Description cannot be more than 255 characters
+
# ------------------------------------------------------------- Welcome new user
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml Tue Jun 5 16:15:47 2007
@@ -67,7 +67,6 @@
<!-- results made available to all actions -->
<global-results>
<result name="access-denied" type="tiles">.denied</result>
- <result name="error" type="tiles">.error</result>
</global-results>
@@ -83,18 +82,6 @@
<action name="logout">
<result>/roller-ui/logout-redirect.jsp</result>
- </action>
-
- <action name="error">
- <result type="tiles">.error</result>
- </action>
-
- <action name="403">
- <result type="tiles">.403</result>
- </action>
-
- <action name="404">
- <result type="tiles">.404</result>
</action>
<action name="setup"
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp Tue Jun 5 16:15:47 2007
@@ -62,9 +62,9 @@
function handleCommentResponse() {
if (http.readyState == 4) {
comment = eval("(" + http.responseText + ")");
- commentDiv = document.getElementById("comment-" + comment.id);
+ commentDiv = $("comment-" + comment.id);
commentDiv.textContent = comment.content;
- linkDiv = document.getElementById("link-" + comment.id);
+ linkDiv = $("link-" + comment.id);
linkDiv.parentNode.removeChild(linkDiv);
}
isBusy = false;
@@ -78,7 +78,7 @@
<p class="pagetip"><s:text name="commentManagement.globalTip" /></p>
-<s:if test="comments.isEmpty">
+<s:if test="pager.items.isEmpty">
<s:text name="commentManagement.noCommentsFound" />
</s:if>
@@ -105,7 +105,7 @@
<div style="float:left;">
<s:text name="commentManagement.nowShowing">
- <s:param value="comments.size()" />
+ <s:param value="pager.items.size()" />
</s:text>
</div>
<div style="float:right;">
@@ -120,30 +120,30 @@
<%-- Next / previous links --%>
<%-- ============================================================= --%>
- <s:if test="prevLink != null && nextLink != null">
+ <s:if test="pager.prevLink != null && pager.nextLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
- | <a href='<s:property value="nextLink" />'>
+ | <a href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
</s:if>
- <s:elseif test="prevLink != null">
+ <s:elseif test="pager.prevLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
| <s:text name="commentManagement.next" />
»
</center><br />
</s:elseif>
- <s:elseif test="nextLink != null">
+ <s:elseif test="pager.nextLink != null">
<br /><center>
«
<s:text name="commentManagement.prev" />
- | <a class="" href='<s:property value="nextLink" />'>
+ | <a class="" href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
@@ -222,7 +222,7 @@
<%-- Loop through comments --%>
<%-- ========================================================= --%>
-<s:iterator id="comment" value="comments" status="rowstatus">
+<s:iterator id="comment" value="pager.items" status="rowstatus">
<tr>
<td>
<%-- a bit funky to use checkbox list here, but using checkbox didn't work for me :(
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp Tue Jun 5 16:15:47 2007
@@ -28,23 +28,49 @@
<p><s:text name="commentManagement.sidebarDescription" /></p>
- <s:form action="globalCommentManagement!query">
+ <s:form action="globalCommentManagement!query" id="comments">
<div class="sideformrow">
<label for="searchString" class="sideformrow"><s:text name="commentManagement.searchString" />:</label>
- <s:textfield name="bean.searchString" />
+ <s:textfield name="bean.searchString" size="15" />
</div>
<br />
<br />
<div class="sideformrow">
<label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate" />:</label>
- <s:datetimepicker name="bean.startDate" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calStart = new CalendarPopup();
+ } else {
+ var calStart = new CalendarPopup("datetagdiv");
+ document.write(calStart.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.startDateString" size="12" />
+ <a href="#" id="anchorCalStart" name="anchorCalStart"
+ onclick="calStart.select($('comments_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<div class="sideformrow">
<label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate" />:</label>
- <s:datetimepicker name="bean.endDate" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calEnd = new CalendarPopup();
+ } else {
+ var calEnd = new CalendarPopup("datetagdiv");
+ document.write(calEnd.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.endDateString" size="12" />
+ <a href="#" id="anchorCalEnd" name="anchorCalEnd"
+ onclick="calEnd.select($('comments_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<br />
<br />
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp Tue Jun 5 16:15:47 2007
@@ -50,6 +50,6 @@
<%-- this forces focus to the userName field --%>
<script type="text/javascript">
<!--
- document.getElementById('userName').focus();
+ $('userName').focus();
// -->
</script>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp Tue Jun 5 16:15:47 2007
@@ -23,7 +23,7 @@
document.preview.src="<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme="+theme;
}
function handlePreview(handle) {
- previewSpan = document.getElementById("handlePreview");
+ previewSpan = $("handlePreview");
var n1 = previewSpan.childNodes[0];
var n2 = document.createTextNode(handle.value);
if (handle.value == null) {
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp Tue Jun 5 16:15:47 2007
@@ -59,7 +59,7 @@
<td>
<input type="submit" name="login" id="login" value="<s:text name="loginPage.login" />" />
<input type="reset" name="reset" id="reset" value="<s:text name="loginPage.reset" />"
- onclick="document.getElementById('j_username').focus()" />
+ onclick="$('j_username').focus()" />
</td>
</tr>
@@ -73,11 +73,11 @@
if (document.getElementById) {
if (getCookie("username") != null) {
if (document.getElementById) {
- document.getElementById("j_username").value = getCookie("username");
- document.getElementById("j_password").focus();
+ $("j_username").value = getCookie("username");
+ $("j_password").focus();
}
} else {
- document.getElementById("j_username").focus();
+ $("j_username").focus();
}
}
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp Tue Jun 5 16:15:47 2007
@@ -62,9 +62,9 @@
function handleCommentResponse() {
if (http.readyState == 4) {
comment = eval("(" + http.responseText + ")");
- commentDiv = document.getElementById("comment-" + comment.id);
+ commentDiv = $("comment-" + comment.id);
commentDiv.textContent = comment.content;
- linkDiv = document.getElementById("link-" + comment.id);
+ linkDiv = $("link-" + comment.id);
linkDiv.parentNode.removeChild(linkDiv);
}
isBusy = false;
@@ -80,7 +80,7 @@
<p class="pagetip"><s:text name="commentManagement.tip" /></p>
-<s:if test="comments.isEmpty">
+<s:if test="pager.items.isEmpty">
<s:text name="commentManagement.noCommentsFound" />
</s:if>
@@ -108,7 +108,7 @@
<div style="float:left;">
<s:text name="commentManagement.nowShowing">
- <s:param value="comments.size()" />
+ <s:param value="pager.items.size()" />
</s:text>
</div>
<div style="float:right;">
@@ -123,30 +123,30 @@
<%-- Next / previous links --%>
<%-- ============================================================= --%>
- <s:if test="prevLink != null && nextLink != null">
+ <s:if test="pager.prevLink != null && pager.nextLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
- | <a href='<s:property value="nextLink" />'>
+ | <a href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
</s:if>
- <s:elseif test="prevLink != null">
+ <s:elseif test="pager.prevLink != null">
<br /><center>
«
- <a href='<s:property value="prevLink" />'>
+ <a href='<s:property value="pager.prevLink" />'>
<s:text name="commentManagement.prev" /></a>
| <s:text name="commentManagement.next" />
»
</center><br />
</s:elseif>
- <s:elseif test="nextLink != null">
+ <s:elseif test="pager.nextLink != null">
<br /><center>
«
<s:text name="commentManagement.prev" />
- | <a class="" href='<s:property value="nextLink" />'>
+ | <a class="" href='<s:property value="pager.nextLink" />'>
<s:text name="commentManagement.next" /></a>
»
</center><br />
@@ -237,7 +237,7 @@
<%-- Loop through comments --%>
<%-- ========================================================= --%>
-<s:iterator id="comment" value="comments" status="rowstatus">
+<s:iterator id="comment" value="pager.items" status="rowstatus">
<tr>
<td>
<%-- a bit funky to use checkbox list here, but using checkbox didn't work for me :(
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp Tue Jun 5 16:15:47 2007
@@ -28,7 +28,7 @@
<p><s:text name="commentManagement.sidebarDescription" /></p>
- <s:form action="comments!query">
+ <s:form action="comments!query" id="commentsQuery">
<s:hidden name="weblog" />
<div class="sideformrow">
@@ -40,12 +40,38 @@
<div class="sideformrow">
<label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate" />:</label>
- <s:datetimepicker name="bean.startDate" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calStart = new CalendarPopup();
+ } else {
+ var calStart = new CalendarPopup("datetagdiv");
+ document.write(calStart.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.startDateString" size="12" />
+ <a href="#" id="anchorCalStart" name="anchorCalStart"
+ onclick="calStart.select($('commentsQuery_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<div class="sideformrow">
<label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate" />:</label>
- <s:datetimepicker name="bean.endDate" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calEnd = new CalendarPopup();
+ } else {
+ var calEnd = new CalendarPopup("datetagdiv");
+ document.write(calEnd.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.endDateString" size="12" />
+ <a href="#" id="anchorCalEnd" name="anchorCalEnd"
+ onclick="calEnd.select($('commentsQuery_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<br />
<br />
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Entries.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Entries.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Entries.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Entries.jsp Tue Jun 5 16:15:47 2007
@@ -35,7 +35,7 @@
<div style="float:left;">
<s:text name="weblogEntryQuery.nowShowing">
- <s:param value="entries.size()" />
+ <s:param value="pager.items.size()" />
</s:text>
</div>
<div style="float:right;">
@@ -50,39 +50,36 @@
<%-- Next / previous links --%>
<%-- ============================================================= --%>
- <%--
- <c:choose>
- <c:when test="${!empty model.prevLink && !empty model.nextLink}">
- <br /><center>
- «
- <a href='<s:property value="${model.prevLink}" />'>
- <s:text name="weblogEntryQuery.prev" /></a>
- | <a href='<s:property value="${model.nextLink}" />'>
- <s:text name="weblogEntryQuery.next" /></a>
- »
- </center><br />
- </c:when>
- <c:when test="${!empty model.prevLink}">
- <br /><center>
- «
- <a href='<s:property value="${model.prevLink}" />'>
- <s:text name="weblogEntryQuery.prev" /></a>
- | <s:text name="weblogEntryQuery.next" />
- »
- </center><br />
- </c:when>
- <c:when test="${!empty model.nextLink}">
- <br /><center>
- «
- <s:text name="weblogEntryQuery.prev" />
- | <a class="" href='<s:property value="${model.nextLink}" />'>
- <s:text name="weblogEntryQuery.next" /></a>
- »
- </center><br />
- </c:when>
- <c:otherwise><br /></c:otherwise>
- </c:choose>
- --%>
+ <s:if test="pager.prevLink != null && pager.nextLink != null">
+ <br /><center>
+ «
+ <a href='<s:property value="pager.prevLink" />'>
+ <s:text name="weblogEntryQuery.prev" /></a>
+ | <a href='<s:property value="pager.nextLink" />'>
+ <s:text name="weblogEntryQuery.next" /></a>
+ »
+ </center><br />
+ </s:if>
+ <s:elseif test="pager.prevLink != null">
+ <br /><center>
+ «
+ <a href='<s:property value="pager.prevLink" />'>
+ <s:text name="weblogEntryQuery.prev" /></a>
+ | <s:text name="weblogEntryQuery.next" />
+ »
+ </center><br />
+ </s:elseif>
+ <s:elseif test="pager.nextLink != null">
+ <br /><center>
+ «
+ <s:text name="weblogEntryQuery.prev" />
+ | <a class="" href='<s:property value="pager.nextLink" />'>
+ <s:text name="weblogEntryQuery.next" /></a>
+ »
+ </center><br />
+ </s:elseif>
+ <s:else><br /></s:else>
+
</div> <%-- class="tablenav" --%>
@@ -118,7 +115,7 @@
</th>
</tr>
-<s:iterator id="post" value="entries">
+<s:iterator id="post" value="pager.items">
<%-- <td> with style if comment is spam or pending --%>
<s:if test="#post.status == 'DRAFT'">
<tr class="draftentry">
@@ -131,11 +128,11 @@
</s:else>
<td>
- <s:property value="#post.pubTime" />
+ <s:date name="#post.pubTime" format="MM/dd/yy hh:mm a" />
</td>
<td>
- <s:property value="#post.updateTime" />
+ <s:date name="#post.updateTime" format="MM/dd/yy hh:mm a" />
</td>
<td>
@@ -165,7 +162,7 @@
</table>
-<s:if test="entries.isEmpty">
+<s:if test="pager.items.isEmpty">
<s:text name="weblogEntryQuery.noneFound" />
<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
</s:if>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp Tue Jun 5 16:15:47 2007
@@ -68,19 +68,41 @@
<%-- ========================================================= --%>
<%-- filter by date --%>
-
+
<div class="sideformrow">
- <label for="startDateString" class="sideformrow">
- <s:text name="weblogEntryQuery.label.startDate" />:
- </label>
- <s:datetimepicker name="bean.startDate" />
+ <label for="startDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.startDate" />:</label>
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calStart = new CalendarPopup();
+ } else {
+ var calStart = new CalendarPopup("datetagdiv");
+ document.write(calStart.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.startDateString" size="12" />
+ <a href="#" id="anchorCalStart" name="anchorCalStart"
+ onclick="calStart.select($('entries_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<div class="sideformrow">
- <label for="endDateString" class="sideformrow">
- <s:text name="weblogEntryQuery.label.endDate" />:
- </label>
- <s:datetimepicker name="bean.endDate" />
+ <label for="endDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.endDate" />:</label>
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var calEnd = new CalendarPopup();
+ } else {
+ var calEnd = new CalendarPopup("datetagdiv");
+ document.write(calEnd.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.endDateString" size="12" />
+ <a href="#" id="anchorCalEnd" name="anchorCalEnd"
+ onclick="calEnd.select($('entries_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
</div>
<br />
<br />
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Tue Jun 5 16:15:47 2007
@@ -137,7 +137,20 @@
:
<s:select name="bean.seconds" list="secondsList" />
- <s:datetimepicker name="bean.dateString" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var cal = new CalendarPopup();
+ } else {
+ var cal = new CalendarPopup("datetagdiv");
+ document.write(cal.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.dateString" size="12" />
+ <a href="#" id="anchorCal" name="anchorCal"
+ onclick="cal.select($('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
<s:property value="actionWeblog.timeZone" />
</div>
<br />
@@ -169,12 +182,12 @@
<br>
<div class="control">
<s:if test="userAnAuthor">
- <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+ <s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
- <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+ <s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
</s:else>
- <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+ <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
</div>
</s:form>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Tue Jun 5 16:15:47 2007
@@ -169,7 +169,20 @@
:
<s:select name="bean.seconds" list="secondsList" />
- <s:datetimepicker name="bean.dateString" />
+ <script type="text/javascript" >
+ <!--
+ if (document.layers) { // Netscape 4 hack
+ var cal = new CalendarPopup();
+ } else {
+ var cal = new CalendarPopup("datetagdiv");
+ document.write(cal.getStyles());
+ }
+ // -->
+ </script>
+ <s:textfield name="bean.dateString" size="12" />
+ <a href="#" id="anchorCal" name="anchorCal"
+ onclick="cal.select($('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return false">
+ <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
<s:property value="actionWeblog.timeZone" />
</div>
<br />
@@ -205,13 +218,13 @@
<br>
<div class="control">
<s:if test="userAnAuthor">
- <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+ <s:submit key="weblogEdit.post" onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
- <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+ <s:submit key="weblogEdit.submitForReview" onclick="$('entry_bean_status').value='PENDING';"/>
</s:else>
- <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+ <s:submit key="weblogEdit.save" onclick="$('entry_bean_status').value='DRAFT';" />
<s:url id="removeUrl" action="entryRemove">
<s:param name="weblog" value="actionWeblog.handle" />
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Members.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Members.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Members.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Members.jsp Tue Jun 5 16:15:47 2007
@@ -83,22 +83,22 @@
<s:property value="#perm.user.userName" />
</td>
<td class="rollertable">
- <input type="radio" onchange="dirty()"
+ <input type="radio"
<s:if test="#perm.permissionMask == 3">checked</s:if>
name='perm-<s:property value="#perm.id" />' value="3" />
</td>
<td class="rollertable">
- <input type="radio" onchange="dirty()"
+ <input type="radio"
<s:if test="#perm.permissionMask == 1">checked</s:if>
name='perm-<s:property value="#perm.id" />' value="1" />
</td>
<td class="rollertable">
- <input type="radio" onchange="dirty()"
+ <input type="radio"
<s:if test="#perm.permissionMask == 0">checked</s:if>
name='perm-<s:property value="#perm.id" />' value="0" />
</td>
<td class="rollertable">
- <input type="radio" onchange="dirty()"
+ <input type="radio"
name='perm-<s:property value="#perm.id" />' value="-1" />
</td>
</tr>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp Tue Jun 5 16:15:47 2007
@@ -65,6 +65,6 @@
<%-- this forces focus to the userName field --%>
<script type="text/javascript">
<!--
- document.getElementById('userName').focus();
+ $('userName').focus();
// -->
</script>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp Tue Jun 5 16:15:47 2007
@@ -17,23 +17,6 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript">
-<!--
-function validate() {
- valid = false;
- for (i=0; i<5; i++) {
- var field = document.getElementById("uploadFile" + i);
- if (!isblank(field.value)) {
- valid = true;
- break;
- }
- }
- if (!valid) window.alert('<s:text name="uploadFiles.noFilesSpecified" />');
- else document.forms[0].submit();
-}
-// -->
-</script>
-
<p class="subtitle">
<s:text name="uploadFiles.subtitle" >
<s:param value="actionWeblog.handle" />
@@ -166,7 +149,7 @@
</s:if>
<s:else>
<img src='<s:url value="/images/image.png"/>' style="padding:0px" />
- <a href='<c:out value="${model.resourcesBaseURL}" /><s:property value="#f.path" />'>
+ <a href='<c:out value="${model.resourcesBaseURL}" /><s:property value="getResourceURL(#f.path)" />'>
<s:property value="#f.name" />
</a>
</s:else>
@@ -197,13 +180,3 @@
</table>
</s:form>
-
-<%--
-Added by Matt Raible since the focus javascript generated by Struts uses
-a name reference and IE seems to only focus on file inputs via elements[0]?
---%>
-<script type="text/javascript">
-<!--
- document.forms[0].elements[0].focus();
-// -->
-</script>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp Tue Jun 5 16:15:47 2007
@@ -32,7 +32,7 @@
<script type="text/javascript"><!--
if (getCookie("editorSize1") != null) {
- document.getElementById('stylesheetEdit_contents').rows = getCookie("editorSize1");
+ $('stylesheetEdit_contents').rows = getCookie("editorSize1");
}
function changeSize(e, num) {
a = e.rows + num;
@@ -57,9 +57,9 @@
<td align="right">
<!-- Add buttons to make this textarea taller or shorter -->
<input type="button" name="taller" value=" ↓ "
- onclick="changeSize1(document.getElementById('stylesheetEdit_contents'), 5)" />
+ onclick="changeSize1($('stylesheetEdit_contents'), 5)" />
<input type="button" name="shorter" value=" ↑ "
- onclick="changeSize1(document.getElementById('stylesheetEdit_contents'), -5)" />
+ onclick="changeSize1($('stylesheetEdit_contents'), -5)" />
</td>
</tr>
</table>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp Tue Jun 5 16:15:47 2007
@@ -59,9 +59,9 @@
// Update page URL when user changes link
function updatePageURLDisplay() {
- var previewSpan = document.getElementById('linkPreview');
+ var previewSpan = $('linkPreview');
var n1 = previewSpan.firstChild;
- var n2 = document.createTextNode(document.getElementById('template_bean_link').value);
+ var n2 = document.createTextNode($('template_bean_link').value);
if (n1 == null) {
previewSpan.appendChild(n2);
} else {
@@ -70,7 +70,7 @@
}
// Don't launch page if user has changed link, it'll be a 404
function launchPage() {
- if (originalLink != document.getElementById('template_bean_link').value) {
+ if (originalLink != $('template_bean_link').value) {
window.alert("Link changed, not launching page");
} else {
window.open(weblogURL + '/page/' + originalLink, '_blank');
@@ -115,7 +115,7 @@
<script type="text/javascript"><!--
if (getCookie("editorSize1") != null) {
- document.getElementById('template_bean_contents').rows = getCookie("editorSize1");
+ $('template_bean_contents').rows = getCookie("editorSize1");
}
function changeSize(e, num) {
a = e.rows + num;
@@ -141,9 +141,9 @@
<td align="right">
<!-- Add buttons to make this textarea taller or shorter -->
<input type="button" name="taller" value=" ↓ "
- onclick="changeSize1(document.getElementById('template_bean_contents'), 5)" />
+ onclick="changeSize1($('template_bean_contents'), 5)" />
<input type="button" name="shorter" value=" ↑ "
- onclick="changeSize1(document.getElementById('template_bean_contents'), -5)" />
+ onclick="changeSize1($('template_bean_contents'), -5)" />
</td>
</tr>
</table>
@@ -168,12 +168,12 @@
<td class="field">
<script type="text/javascript"><!--
function showContentTypeField() {
- if (document.getElementById('template_bean_autoContentType1').checked) {
- document.getElementById('template_bean_manualContentType').readOnly = true;
- document.getElementById('template_bean_manualContentType').style.background = '#e5e5e5';
+ if ($('template_bean_autoContentType1').checked) {
+ $('template_bean_manualContentType').readOnly = true;
+ $('template_bean_manualContentType').style.background = '#e5e5e5';
} else {
- document.getElementById('template_bean_manualContentType').readOnly = false;
- document.getElementById('template_bean_manualContentType').style.background = '#ffffff';
+ $('template_bean_manualContentType').readOnly = false;
+ $('template_bean_manualContentType').style.background = '#ffffff';
}
}
// --></script>