Author: agilliland
Date: Tue Jun 5 13:01:01 2007
New Revision: 544614
URL: http://svn.apache.org/viewvc?view=rev&rev=544614
Log:
reverting to use of old calendar widget instead of struts2 datetimepicker.
the struts2 datetimepicker has a number of bugs in struts 2.0.6 and they are
not going to be fixed unti struts 2.1 which has an undetermined release date.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
Tue Jun 5 13:01:01 2007
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.ui.struts2.admin;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -129,19 +128,14 @@
Map<String, String> params = new HashMap();
- SimpleDateFormat dojoFormat = new SimpleDateFormat("yyyy-MM-dd",
getLocale());
- SimpleDateFormat stdFormat = new SimpleDateFormat("MM/dd/yy",
getLocale());
-
if(!StringUtils.isEmpty(getBean().getSearchString())) {
params.put("bean.searchString", getBean().getSearchString());
}
- if(getBean().getStartDate() != null) {
- params.put("bean.startDate",
stdFormat.format(getBean().getStartDate()));
- params.put("dojo.bean.startDate",
dojoFormat.format(getBean().getStartDate()));
+ if(!StringUtils.isEmpty(getBean().getStartDateString())) {
+ params.put("bean.startDateString", getBean().getStartDateString());
}
- if(getBean().getEndDate() != null) {
- params.put("bean.endDate",
stdFormat.format(getBean().getEndDate()));
- params.put("dojo.bean.endDate",
dojoFormat.format(getBean().getEndDate()));
+ if(!StringUtils.isEmpty(getBean().getEndDateString())) {
+ params.put("bean.endDateString", getBean().getEndDateString());
}
if(!StringUtils.isEmpty(getBean().getApprovedString())) {
params.put("bean.approvedString", getBean().getApprovedString());
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
Tue Jun 5 13:01:01 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,8 +35,8 @@
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 page = 0;
@@ -91,6 +90,22 @@
}
}
+ 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 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 getSpamString() {
return spamString;
@@ -124,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;
}
@@ -170,6 +169,22 @@
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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
Tue Jun 5 13:01:01 2007
@@ -18,10 +18,8 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -125,19 +123,14 @@
Map<String, String> params = new HashMap();
- SimpleDateFormat dojoFormat = new SimpleDateFormat("yyyy-MM-dd",
getLocale());
- SimpleDateFormat stdFormat = new SimpleDateFormat("MM/dd/yy",
getLocale());
-
if(!StringUtils.isEmpty(getBean().getSearchString())) {
params.put("bean.searchString", getBean().getSearchString());
}
- if(getBean().getStartDate() != null) {
- params.put("bean.startDate",
stdFormat.format(getBean().getStartDate()));
- params.put("dojo.bean.startDate",
dojoFormat.format(getBean().getStartDate()));
+ if(!StringUtils.isEmpty(getBean().getStartDateString())) {
+ params.put("bean.startDateString", getBean().getStartDateString());
}
- if(getBean().getEndDate() != null) {
- params.put("bean.endDate",
stdFormat.format(getBean().getEndDate()));
- params.put("dojo.bean.endDate",
dojoFormat.format(getBean().getEndDate()));
+ if(!StringUtils.isEmpty(getBean().getEndDateString())) {
+ params.put("bean.endDateString", getBean().getEndDateString());
}
if(!StringUtils.isEmpty(getBean().getApprovedString())) {
params.put("bean.approvedString", getBean().getApprovedString());
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
Tue Jun 5 13:01:01 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;
@@ -32,8 +35,8 @@
public class CommentsBean {
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 page = 0;
@@ -95,6 +98,22 @@
}
}
+ 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 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 getSpamString() {
return spamString;
@@ -128,22 +147,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;
}
@@ -182,6 +185,22 @@
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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Tue Jun 5 13:01:01 2007
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -131,9 +130,6 @@
Map<String, String> params = new HashMap();
- SimpleDateFormat dojoFormat = new SimpleDateFormat("yyyy-MM-dd",
getLocale());
- SimpleDateFormat stdFormat = new SimpleDateFormat("MM/dd/yy",
getLocale());
-
if(!StringUtils.isEmpty(getBean().getCategoryPath())) {
params.put("bean.categoryPath", getBean().getCategoryPath());
}
@@ -143,13 +139,11 @@
if(!StringUtils.isEmpty(getBean().getText())) {
params.put("bean.text", getBean().getText());
}
- if(getBean().getStartDate() != null) {
- params.put("bean.startDate",
stdFormat.format(getBean().getStartDate()));
- params.put("dojo.bean.startDate",
dojoFormat.format(getBean().getStartDate()));
- }
- if(getBean().getEndDate() != null) {
- params.put("bean.endDate",
stdFormat.format(getBean().getEndDate()));
- params.put("dojo.bean.endDate",
dojoFormat.format(getBean().getEndDate()));
+ 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());
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
Tue Jun 5 13:01:01 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,8 +31,8 @@
*/
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;
@@ -50,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;
}
@@ -129,6 +132,22 @@
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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
Tue Jun 5 13:01:01 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/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Tue Jun 5 13:01:01 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(document.getElementById('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(document.getElementById('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/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp Tue
Jun 5 13:01:01 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(document.getElementById('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(document.getElementById('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/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp Tue
Jun 5 13:01:01 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(document.getElementById('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(document.getElementById('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/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Tue Jun 5
13:01:01 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(document.getElementById('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 />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=544614&r1=544613&r2=544614
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Tue Jun
5 13:01:01 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(document.getElementById('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 />
