Author: gseitz
Date: Sat Oct  6 15:33:34 2007
New Revision: 582540

URL: http://svn.apache.org/viewvc?rev=582540&view=rev
Log:
no more floating for month- and year selection input elements (which caused a 
linebreak after the month selection if calendar was too narrow)

Modified:
    
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/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=582540&r1=582539&r2=582540&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
 Sat Oct  6 15:33:34 2007
@@ -19,21 +19,22 @@
        text-align: center;
 }
 
-.yui-calendar .calheader select {
-       float: left;
+.yui-calendar .calheader select {      
+       font-size: 100%
 }
 
 .yui-calendar .calheader table {
        border-width: 0px;      
        border-collapse: collapse;
-       border-spacing: 0px;
-       float: right;   
+       border-spacing: 0px;    
+       font-size: 100%;
 }
 
 .yui-calendar .calheader input {
        text-align: center;
        border: 1px solid #999;
-       vertical-align: middle;         
+       vertical-align: middle;
+       font-size: 100%         
 }
 
 .yui-calendar .calheader th {

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=582540&r1=582539&r2=582540&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
 Sat Oct  6 15:33:34 2007
@@ -214,8 +214,11 @@
        widget.buildMonthLabel = function () {
                var pageDate = 
widget.cfg.getProperty(YAHOO.widget.Calendar._DEFAULT_CONFIG.PAGEDATE.key);
 
+               var selectHtml = "<table>";
+               selectHtml += "<tr><th>";
+
                // generate month select box using localized strings
-               var selectHtml = "<select id=\"" + monthSelectId + "\">";
+               selectHtml += "<select id=\"" + monthSelectId + "\">";
                var i;
                for (i = 0; i < 12; i++) {
                        selectHtml += "<option value=\"" + i + "\"";
@@ -224,11 +227,10 @@
                        }       
                        selectHtml += ">" + widget.Locale.LOCALE_MONTHS[i] + 
"</option>";
                }
-               selectHtml += "</select>";
+               selectHtml += "</select></th>";
 
                // generate year input and spinner buttons      
-               selectHtml += "<table>";        
-               selectHtml += "<tr><th><a class='yearDown' id='" + yearDownId + 
"'/></th>";
+               selectHtml += "<th><a class='yearDown' id='" + yearDownId + 
"'/></th>";
                selectHtml += "<th><input type='text' size='4' id='" + 
yearInputId + "'/></th>";
                selectHtml += "<th><a class='yearUp' id='" + yearUpId + 
"'/></th>";                     
                selectHtml += "</tr></table>";


Reply via email to