You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/08/23 21:49:27 UTC
svn commit: r569129 - in
/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar:
DatePicker.java assets/wicket-calendar.css wicket-date.js
Author: ehillenius
Date: Thu Aug 23 12:49:26 2007
New Revision: 569129
URL: http://svn.apache.org/viewvc?rev=569129&view=rev
Log:
WICKET-806
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=569129&r1=569128&r2=569129&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Thu Aug 23 12:49:26 2007
@@ -36,12 +36,12 @@
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.StringHeaderContributor;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.extensions.yui.YuiLib;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
-import org.apache.wicket.markup.html.resources.CompressedResourceReference;
import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converters.DateConverter;
@@ -151,8 +151,12 @@
YuiLib.load(response);
if (enableMonthYearSelection())
{
- response.renderCSSReference(new CompressedResourceReference(DatePicker.class,
- "assets/wicket-calendar.css"));
+ response.renderCSSReference(new ResourceReference(YuiLib.class,
+ "calendar/assets/wicket-calendar.css"));
+ String idSelector = "#" + getEscapedComponentMarkupId() + "DpJs";
+ new StringHeaderContributor("<style>" + idSelector + ".yui-calendar .calnavleft, "
+ + idSelector + ".yui-calendar .calnavright {display: none;}</style>")
+ .renderHead(response);
}
// variables for the initialization script
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css?rev=569129&r1=569128&r2=569129&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/wicket-calendar.css Thu Aug 23 12:49:26 2007
@@ -14,35 +14,40 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-.yui-calendar .calnavleft {
- display: none;
-}
-
-.yui-calendar .calnavright {
- display: none;
-}
-
-.yui.calendar {
+.yui-calendar {
border-width: 0px;
- text-align: center;
+ text-align: center;
}
-.yearInputContainer {
- border: 1px solid #999;
+.yui-calendar .calheader select {
+ float: left;
}
-.yearInputContainer span {
- cursor: default;
- background-color: #EEE;
- padding: 0em 0.4em;
- font-weight: normal;
+.yui-calendar .calheader table {
+ border-width: 0px;
+ border-collapse: collapse;
+ border-spacing: 0px;
+ float: right;
}
-.yearInputContainer span:hover {
- background-color: #E0E0E0;
+.yui-calendar input {
+ text-align: center;
+ border: 1px solid #999;
+ vertical-align: middle;
}
-.yearInputContainer input {
- text-align: center;
- border-width: 0px;
+.yui-calendar input.yearDown {
+ background: url(../../assets/skins/sam/sprite.png) no-repeat 0 -400px;
+ border-width: 0px;
+ width: 15px;
+ height: 15px;
+ cursor: pointer;
}
+
+.yui-calendar input.yearUp {
+ background: url(../../assets/skins/sam/sprite.png) no-repeat 0 -350px;
+ border-width: 0px;
+ width: 15px;
+ height: 15px;
+ cursor: pointer;
+}
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js?rev=569129&r1=569128&r2=569129&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js Thu Aug 23 12:49:26 2007
@@ -172,19 +172,6 @@
var field = YAHOO.util.Dom.get(yearInputId);
processNumber(-1);
});
-
- // disable text selection for the up/down spinner"buttons"
- var ua = YAHOO.env.ua;
- if (ua.gecko) {
- YAHOO.util.Dom.get(yearUpId).style.MozUserSelect = "none";
- YAHOO.util.Dom.get(yearDownId).style.MozUserSelect = "none";
- } else if (ua.ie) {
- E.on(yearUpId, "selectstart", function() { return false; });
- E.on(yearDownId, "selectstart", function() { return false; });
- } else {
- E.on(yearUpId, "mousedown", function() { return false; });
- E.on(yearDownId, "mousedown", function() { return false; });
- }
}
// override the function which is used to generate the month label and render two select boxes instead
@@ -203,12 +190,12 @@
}
selectHtml += "</select>";
- // generate year input and spinner buttons
- selectHtml += "<span class=\"yearInputContainer\">";
- selectHtml += "<span id=\"" + yearDownId + "\">–</span>";
- selectHtml += "<input type=\"text\" id=\"" + yearInputId +"\" size=\"4\" onchange=\"\"/>";
- selectHtml += "<span id=\"" + yearUpId + "\">+</span>";
- selectHtml += "</span>";
+ // generate year input and spinner buttons
+ selectHtml += "<table class='yearInputContainer'>";
+ selectHtml += "<tr><td><input type='button' class='yearDown' id='" + yearDownId + "'/></td>";
+ selectHtml += "<td><input type='text' size='4' id='" + yearInputId + "'/></td>";
+ selectHtml += "<td><input type='button' class='yearUp' id='" + yearUpId + "'/></td>";
+ selectHtml += "</tr></table>";
return selectHtml;
}
-}
\ No newline at end of file
+}