You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by an...@apache.org on 2007/03/23 10:01:35 UTC
svn commit: r521633 - in
/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src:
context/Home.html
java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
Author: andyhot
Date: Fri Mar 23 02:01:35 2007
New Revision: 521633
URL: http://svn.apache.org/viewvc?view=rev&rev=521633
Log:
Easier preview + differ validator between start and end time
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html?view=diff&rev=521633&r1=521632&r2=521633
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html Fri Mar 23 02:01:35 2007
@@ -1,3 +1,6 @@
+<html>
+<head><link rel="stylesheet" href="css/timetracker.css"/></head>
+<body jwcid="$content$">
<span jwcid="@Border">
<p>
@@ -7,26 +10,26 @@
</p>
<form jwcid="taskForm@Form" class="container" clientValidationEnabled="true" >
-<h3><span jwcid="@Insert" value="message:new.task"/></h3>
+<h3><span jwcid="@Insert" value="message:new.task">Task Entry</span></h3>
<fieldset>
<table width="90%" class="form" cellpadding="2" cellspacing="0" >
<tr>
- <td><label jwcid="@FieldLabel" field="component:projectChoose" /></td>
- <td><label jwcid="@FieldLabel" field="component:descriptionField" /></td>
+ <td><label jwcid="@FieldLabel" field="component:projectChoose">Choose Project</label></td>
+ <td><label jwcid="@FieldLabel" field="component:descriptionField">Description</label></td>
<td><label>Duration</label></td>
<td> </td>
</tr>
<tr id="secondRow">
- <td><div class="field required"><span jwcid="projectChoose" /></div></td>
+ <td><div class="field required"><select jwcid="projectChoose" /></div></td>
<td><div class="field required"><input jwcid="descriptionField" /></div></td>
<td><div jwcid="duration@Any">18 minutes</div></td>
<td> </td>
</tr>
<tr>
- <td><label jwcid="@FieldLabel" field="component:datePicker" /></td>
- <td><label jwcid="@FieldLabel" field="component:startPicker" /></td>
- <td><label jwcid="@FieldLabel" field="component:endPicker" /></td>
+ <td><label jwcid="@FieldLabel" field="component:datePicker">Date Picker</label></td>
+ <td><label jwcid="@FieldLabel" field="component:startPicker">Start Picker</label></td>
+ <td><label jwcid="@FieldLabel" field="component:endPicker">End Picker</label></td>
<td> </td>
</tr>
@@ -83,3 +86,4 @@
</div>
</span>
+</body>
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java?view=diff&rev=521633&r1=521632&r2=521633
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java Fri Mar 23 02:01:35 2007
@@ -13,8 +13,6 @@
// limitations under the License.
package org.apache.tapestry.timetracker.page;
-import java.util.Date;
-
import org.apache.log4j.Logger;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.EventListener;
@@ -35,6 +33,8 @@
import org.apache.tapestry.timetracker.model.Project;
import org.apache.tapestry.timetracker.model.Task;
+import java.util.Date;
+
/**
* Manages entering tasks.
@@ -77,7 +77,7 @@
public abstract Date getStartTime();
@Component(bindings = {"value=endTime", "displayName=message:task.end.time",
- "validators=validators:required"})
+ "validators=validators:required,differ=startPicker"})
public abstract DropdownTimePicker getEndPicker();
public abstract Date getEndTime();