Changes to Rico 3 as a result of regression testing with IE6, IE7, and IE8.

git-svn-id: svn://svn.code.sf.net/p/openrico/code/trunk/rico3@83 53df2df2-7ab5-4331-af62-ea79255fa4e2

diff --git a/bin/Rico.dll b/bin/Rico.dll
index 8b357c8..a3dc4ce 100644 (file)
Binary files a/bin/Rico.dll and b/bin/Rico.dll differ

diff --git a/examples/asp/3grids.asp b/examples/asp/3grids.asp
index 7da90f1..b9ba74a 100644 (file)
--- a/examples/asp/3grids.asp
+++ b/examples/asp/3grids.asp
@@ -52,7 +52,6 @@ Rico.onLoad( function() {
                 dblclick      : Rico.eventHandle(window,'customerDrillDown'),\r
                 menuEvent     : 'contextmenu',\r
                 highlightElem : 'menuRow',\r
                 dblclick      : Rico.eventHandle(window,'customerDrillDown'),\r
                 menuEvent     : 'contextmenu',\r
                 highlightElem : 'menuRow',\r

-                saveColumnInfo: {width:true, filter:true, sort:true},\r

                 visibleRows   : 'parent'\r
              };\r
   customerGrid=new Rico.LiveGrid ('customergrid', new Rico.Buffer.AjaxSQL('ricoQuery.asp'), opts);\r
                 visibleRows   : 'parent'\r
              };\r
   customerGrid=new Rico.LiveGrid ('customergrid', new Rico.Buffer.AjaxSQL('ricoQuery.asp'), opts);\r

diff --git a/examples/asp/widgets.asp b/examples/asp/widgets.asp
index df4160b..054e3de 100644 (file)
--- a/examples/asp/widgets.asp
+++ b/examples/asp/widgets.asp
@@ -31,7 +31,7 @@ Rico.onLoad( function() {
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r

-  var cal=new Rico.CalendarControl("ricoCal",{position:'relative'});\r
+  var cal=new Rico.CalendarControl("ricoCal",{position:'auto'});\r

   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r
   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r


@@ -85,1860 +85,240 @@ The widgets are compatible with all base libraries and themes.
 <p class="ricoBookmark"><span id="population_bookmark">&nbsp;</span></p>\r
 <table class="ricoLiveGrid" id="population">\r
 <thead>\r
 <p class="ricoBookmark"><span id="population_bookmark">&nbsp;</span></p>\r
 <table class="ricoLiveGrid" id="population">\r
 <thead>\r

- <tr>\r
-  <td class='ricoFrozen'></td>\r
-  <td colspan=5>Population (thousands)</td>\r
- </tr>\r
- <tr>\r
-  <td class='ricoFrozen'>Country or area</td>\r
-  <td>1950</td>\r
-  <td>2009</td>\r
-  <td>2015</td>\r
-  <td>2025</td>\r
-  <td>2050</td>\r
- </tr>\r
+ <tr>  <td class='ricoFrozen'></td>  <td colspan=5>Population (thousands)</td> </tr>\r
+ <tr>  <td class='ricoFrozen'>Country or area</td>  <td>1950</td>  <td>2009</td>  <td>2015</td>  <td>2025</td>  <td>2050</td> </tr>\r

 </thead>\r
 <tbody>\r
 </thead>\r
 <tbody>\r

- <tr>\r
-  <td>Afghanistan</td>\r
-  <td>8151</td>\r
-  <td>28150</td>\r
-  <td>34246</td>\r
-  <td>44970</td>\r
-  <td>73938</td>\r
- </tr>\r
- <tr>\r
-  <td>Albania</td>\r
-  <td>1215</td>\r
-  <td>3155</td>\r
-  <td>3256</td>\r
-  <td>3395</td>\r
-  <td>3303</td>\r
- </tr>\r
- <tr>\r
-  <td>Algeria</td>\r
-  <td>8753</td>\r
-  <td>34895</td>\r
-  <td>38088</td>\r
-  <td>42882</td>\r
-  <td>49610</td>\r
- </tr>\r
- <tr>\r
-  <td>American Samoa</td>\r
-  <td>19</td>\r
-  <td>67</td>\r
-  <td>74</td>\r
-  <td>86</td>\r
-  <td>107</td>\r
- </tr>\r
- <tr>\r
-  <td>Andorra</td>\r
-  <td>6</td>\r
-  <td>86</td>\r
-  <td>93</td>\r
-  <td>107</td>\r
-  <td>137</td>\r
- </tr>\r
- <tr>\r
-  <td>Angola</td>\r
-  <td>4148</td>\r
-  <td>18498</td>\r
-  <td>21690</td>\r
-  <td>27441</td>\r
-  <td>42267</td>\r
- </tr>\r
- <tr>\r
-  <td>Anguilla</td>\r
-  <td>5</td>\r
-  <td>15</td>\r
-  <td>17</td>\r
-  <td>18</td>\r
-  <td>20</td>\r
- </tr>\r
- <tr>\r
-  <td>Antigua and Barbuda</td>\r
-  <td>46</td>\r
-  <td>88</td>\r
-  <td>93</td>\r
-  <td>101</td>\r
-  <td>112</td>\r
- </tr>\r
- <tr>\r
-  <td>Argentina</td>\r
-  <td>17150</td>\r
-  <td>40276</td>\r
-  <td>42548</td>\r
-  <td>45883</td>\r
-  <td>50943</td>\r
- </tr>\r
- <tr>\r
-  <td>Armenia</td>\r
-  <td>1354</td>\r
-  <td>3083</td>\r
-  <td>3139</td>\r
-  <td>3181</td>\r
-  <td>3018</td>\r
- </tr>\r
- <tr>\r
-  <td>Aruba</td>\r
-  <td>38</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>112</td>\r
-  <td>106</td>\r
- </tr>\r
- <tr>\r
-  <td>Australia</td>\r
-  <td>8219</td>\r
-  <td>21293</td>\r
-  <td>22607</td>\r
-  <td>24703</td>\r
-  <td>28724</td>\r
- </tr>\r
- <tr>\r
-  <td>Austria</td>\r
-  <td>6936</td>\r
-  <td>8364</td>\r
-  <td>8467</td>\r
-  <td>8600</td>\r
-  <td>8515</td>\r
- </tr>\r
- <tr>\r
-  <td>Azerbaijan</td>\r
-  <td>2896</td>\r
-  <td>8832</td>\r
-  <td>9426</td>\r
-  <td>10128</td>\r
-  <td>10579</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahamas</td>\r
-  <td>79</td>\r
-  <td>342</td>\r
-  <td>366</td>\r
-  <td>402</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahrain</td>\r
-  <td>116</td>\r
-  <td>791</td>\r
-  <td>882</td>\r
-  <td>1021</td>\r
-  <td>1277</td>\r
- </tr>\r
- <tr>\r
-  <td>Bangladesh</td>\r
-  <td>43595</td>\r
-  <td>162221</td>\r
-  <td>175217</td>\r
-  <td>195012</td>\r
-  <td>222495</td>\r
- </tr>\r
- <tr>\r
-  <td>Barbados</td>\r
-  <td>211</td>\r
-  <td>256</td>\r
-  <td>260</td>\r
-  <td>262</td>\r
-  <td>237</td>\r
- </tr>\r
- <tr>\r
-  <td>Belarus</td>\r
-  <td>7745</td>\r
-  <td>9634</td>\r
-  <td>9355</td>\r
-  <td>8851</td>\r
-  <td>7275</td>\r
- </tr>\r
- <tr>\r
-  <td>Belgium</td>\r
-  <td>8628</td>\r
-  <td>10647</td>\r
-  <td>10878</td>\r
-  <td>11191</td>\r
-  <td>11493</td>\r
- </tr>\r
- <tr>\r
-  <td>Belize</td>\r
-  <td>69</td>\r
-  <td>307</td>\r
-  <td>344</td>\r
-  <td>404</td>\r
-  <td>506</td>\r
- </tr>\r
- <tr>\r
-  <td>Benin</td>\r
-  <td>2050</td>\r
-  <td>8935</td>\r
-  <td>10647</td>\r
-  <td>13767</td>\r
-  <td>21982</td>\r
- </tr>\r
- <tr>\r
-  <td>Bermuda</td>\r
-  <td>37</td>\r
-  <td>65</td>\r
-  <td>65</td>\r
-  <td>66</td>\r
-  <td>63</td>\r
- </tr>\r
- <tr>\r
-  <td>Bhutan</td>\r
-  <td>168</td>\r
-  <td>697</td>\r
-  <td>770</td>\r
-  <td>865</td>\r
-  <td>1013</td>\r
- </tr>\r
- <tr>\r
-  <td>Bolivia</td>\r
-  <td>2714</td>\r
-  <td>9863</td>\r
-  <td>10854</td>\r
-  <td>12368</td>\r
-  <td>14908</td>\r
- </tr>\r
- <tr>\r
-  <td>Bosnia and Herzegovina</td>\r
-  <td>2661</td>\r
-  <td>3767</td>\r
-  <td>3727</td>\r
-  <td>3608</td>\r
-  <td>3008</td>\r
- </tr>\r
- <tr>\r
-  <td>Botswana</td>\r
-  <td>413</td>\r
-  <td>1950</td>\r
-  <td>2106</td>\r
-  <td>2337</td>\r
-  <td>2758</td>\r
- </tr>\r
- <tr>\r
-  <td>Brazil</td>\r
-  <td>53975</td>\r
-  <td>193734</td>\r
-  <td>202866</td>\r
-  <td>213802</td>\r
-  <td>218512</td>\r
- </tr>\r
- <tr>\r
-  <td>British Virgin Islands</td>\r
-  <td>7</td>\r
-  <td>23</td>\r
-  <td>24</td>\r
-  <td>26</td>\r
-  <td>28</td>\r
- </tr>\r
- <tr>\r
-  <td>Brunei Darussalam</td>\r
-  <td>48</td>\r
-  <td>400</td>\r
-  <td>443</td>\r
-  <td>513</td>\r
-  <td>658</td>\r
- </tr>\r
- <tr>\r
-  <td>Bulgaria</td>\r
-  <td>7251</td>\r
-  <td>7545</td>\r
-  <td>7263</td>\r
-  <td>6752</td>\r
-  <td>5392</td>\r
- </tr>\r
- <tr>\r
-  <td>Burkina Faso</td>\r
-  <td>4080</td>\r
-  <td>15757</td>\r
-  <td>19013</td>\r
-  <td>24837</td>\r
-  <td>40830</td>\r
- </tr>\r
- <tr>\r
-  <td>Burundi</td>\r
-  <td>2456</td>\r
-  <td>8303</td>\r
-  <td>9413</td>\r
-  <td>11161</td>\r
-  <td>14846</td>\r
- </tr>\r
- <tr>\r
-  <td>Cambodia</td>\r
-  <td>4346</td>\r
-  <td>14805</td>\r
-  <td>16357</td>\r
-  <td>18973</td>\r
-  <td>23795</td>\r
- </tr>\r
- <tr>\r
-  <td>Cameroon</td>\r
-  <td>4466</td>\r
-  <td>19522</td>\r
-  <td>22169</td>\r
-  <td>26478</td>\r
-  <td>36736</td>\r
- </tr>\r
- <tr>\r
-  <td>Canada</td>\r
-  <td>13737</td>\r
-  <td>33573</td>\r
-  <td>35493</td>\r
-  <td>38659</td>\r
-  <td>44414</td>\r
- </tr>\r
- <tr>\r
-  <td>Cape Verde</td>\r
-  <td>146</td>\r
-  <td>506</td>\r
-  <td>548</td>\r
-  <td>616</td>\r
-  <td>703</td>\r
- </tr>\r
- <tr>\r
-  <td>Cayman Islands</td>\r
-  <td>7</td>\r
-  <td>56</td>\r
-  <td>59</td>\r
-  <td>63</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Central African Republic</td>\r
-  <td>1327</td>\r
-  <td>4422</td>\r
-  <td>4927</td>\r
-  <td>5747</td>\r
-  <td>7603</td>\r
- </tr>\r
- <tr>\r
-  <td>Chad</td>\r
-  <td>2429</td>\r
-  <td>11206</td>\r
-  <td>13120</td>\r
-  <td>16906</td>\r
-  <td>27776</td>\r
- </tr>\r
- <tr>\r
-  <td>Channel Islands</td>\r
-  <td>102</td>\r
-  <td>150</td>\r
-  <td>151</td>\r
-  <td>152</td>\r
-  <td>144</td>\r
- </tr>\r
- <tr>\r
-  <td>Chile</td>\r
-  <td>6082</td>\r
-  <td>16970</td>\r
-  <td>17926</td>\r
-  <td>19266</td>\r
-  <td>20657</td>\r
- </tr>\r
- <tr>\r
-  <td>China</td>\r
-  <td>544951</td>\r
-  <td>1345751</td>\r
-  <td>1395998</td>\r
-  <td>1453140</td>\r
-  <td>1417045</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Hong Kong SAR</td>\r
-  <td>1974</td>\r
-  <td>7022</td>\r
-  <td>7398</td>\r
-  <td>7969</td>\r
-  <td>8623</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Macao SAR</td>\r
-  <td>190</td>\r
-  <td>538</td>\r
-  <td>568</td>\r
-  <td>603</td>\r
-  <td>593</td>\r
- </tr>\r
- <tr>\r
-  <td>Colombia</td>\r
-  <td>12000</td>\r
-  <td>45660</td>\r
-  <td>49385</td>\r
-  <td>54920</td>\r
-  <td>62877</td>\r
- </tr>\r
- <tr>\r
-  <td>Comoros</td>\r
-  <td>156</td>\r
-  <td>676</td>\r
-  <td>767</td>\r
-  <td>907</td>\r
-  <td>1226</td>\r
- </tr>\r
- <tr>\r
-  <td>Congo</td>\r
-  <td>808</td>\r
-  <td>3683</td>\r
-  <td>4225</td>\r
-  <td>5094</td>\r
-  <td>6863</td>\r
- </tr>\r
- <tr>\r
-  <td>Cook Islands</td>\r
-  <td>15</td>\r
-  <td>20</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>24</td>\r
- </tr>\r
- <tr>\r
-  <td>Costa Rica</td>\r
-  <td>966</td>\r
-  <td>4579</td>\r
-  <td>4957</td>\r
-  <td>5521</td>\r
-  <td>6373</td>\r
- </tr>\r
- <tr>\r
-  <td>Côte d'Ivoire</td>\r
-  <td>2505</td>\r
-  <td>21075</td>\r
-  <td>24210</td>\r
-  <td>29738</td>\r
-  <td>43373</td>\r
- </tr>\r
- <tr>\r
-  <td>Croatia</td>\r
-  <td>3850</td>\r
-  <td>4416</td>\r
-  <td>4370</td>\r
-  <td>4254</td>\r
-  <td>3825</td>\r
- </tr>\r
- <tr>\r
-  <td>Cuba</td>\r
-  <td>5920</td>\r
-  <td>11204</td>\r
-  <td>11213</td>\r
-  <td>11148</td>\r
-  <td>9725</td>\r
- </tr>\r
- <tr>\r
-  <td>Cyprus</td>\r
-  <td>494</td>\r
-  <td>871</td>\r
-  <td>925</td>\r
-  <td>1014</td>\r
-  <td>1175</td>\r
- </tr>\r
- <tr>\r
-  <td>Czech Republic</td>\r
-  <td>8925</td>\r
-  <td>10369</td>\r
-  <td>10510</td>\r
-  <td>10573</td>\r
-  <td>10294</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. People's Rep. of Korea</td>\r
-  <td>9737</td>\r
-  <td>23906</td>\r
-  <td>24399</td>\r
-  <td>25128</td>\r
-  <td>24562</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. Republic of the Congo</td>\r
-  <td>12184</td>\r
-  <td>66020</td>\r
-  <td>77419</td>\r
-  <td>98123</td>\r
-  <td>147512</td>\r
- </tr>\r
- <tr>\r
-  <td>Denmark</td>\r
-  <td>4271</td>\r
-  <td>5470</td>\r
-  <td>5523</td>\r
-  <td>5590</td>\r
-  <td>5551</td>\r
- </tr>\r
- <tr>\r
-  <td>Djibouti</td>\r
-  <td>62</td>\r
-  <td>864</td>\r
-  <td>953</td>\r
-  <td>1111</td>\r
-  <td>1469</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominica</td>\r
-  <td>51</td>\r
-  <td>67</td>\r
-  <td>67</td>\r
-  <td>68</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominican Republic</td>\r
-  <td>2427</td>\r
-  <td>10090</td>\r
-  <td>10867</td>\r
-  <td>11973</td>\r
-  <td>13441</td>\r
- </tr>\r
- <tr>\r
-  <td>Ecuador</td>\r
-  <td>3387</td>\r
-  <td>13625</td>\r
-  <td>14596</td>\r
-  <td>16074</td>\r
-  <td>17989</td>\r
- </tr>\r
- <tr>\r
-  <td>Egypt</td>\r
-  <td>21514</td>\r
-  <td>82999</td>\r
-  <td>91778</td>\r
-  <td>104970</td>\r
-  <td>129533</td>\r
- </tr>\r
- <tr>\r
-  <td>El Salvador</td>\r
-  <td>2200</td>\r
-  <td>6163</td>\r
-  <td>6383</td>\r
-  <td>6895</td>\r
-  <td>7882</td>\r
- </tr>\r
- <tr>\r
-  <td>Equatorial Guinea</td>\r
-  <td>226</td>\r
-  <td>676</td>\r
-  <td>781</td>\r
-  <td>971</td>\r
-  <td>1445</td>\r
- </tr>\r
- <tr>\r
-  <td>Eritrea</td>\r
-  <td>1141</td>\r
-  <td>5073</td>\r
-  <td>6009</td>\r
-  <td>7404</td>\r
-  <td>10787</td>\r
- </tr>\r
- <tr>\r
-  <td>Estonia</td>\r
-  <td>1101</td>\r
-  <td>1340</td>\r
-  <td>1337</td>\r
-  <td>1321</td>\r
-  <td>1233</td>\r
- </tr>\r
- <tr>\r
-  <td>Ethiopia</td>\r
-  <td>18434</td>\r
-  <td>82825</td>\r
-  <td>96237</td>\r
-  <td>119822</td>\r
-  <td>173811</td>\r
- </tr>\r
- <tr>\r
-  <td>Faeroe Islands</td>\r
-  <td>32</td>\r
-  <td>50</td>\r
-  <td>52</td>\r
-  <td>55</td>\r
-  <td>58</td>\r
- </tr>\r
- <tr>\r
-  <td>Falkland Islands (Malvinas)</td>\r
-  <td>2</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
- </tr>\r
- <tr>\r
-  <td>Fiji</td>\r
-  <td>289</td>\r
-  <td>849</td>\r
-  <td>874</td>\r
-  <td>905</td>\r
-  <td>910</td>\r
- </tr>\r
- <tr>\r
-  <td>Finland</td>\r
-  <td>4009</td>\r
-  <td>5326</td>\r
-  <td>5432</td>\r
-  <td>5533</td>\r
-  <td>5445</td>\r
- </tr>\r
- <tr>\r
-  <td>France</td>\r
-  <td>41832</td>\r
-  <td>62343</td>\r
-  <td>63900</td>\r
-  <td>65769</td>\r
-  <td>67668</td>\r
- </tr>\r
- <tr>\r
-  <td>French Guiana</td>\r
-  <td>25</td>\r
-  <td>226</td>\r
-  <td>261</td>\r
-  <td>323</td>\r
-  <td>462</td>\r
- </tr>\r
- <tr>\r
-  <td>French Polynesia</td>\r
-  <td>61</td>\r
-  <td>269</td>\r
-  <td>289</td>\r
-  <td>318</td>\r
-  <td>354</td>\r
- </tr>\r
- <tr>\r
-  <td>Gabon</td>\r
-  <td>469</td>\r
-  <td>1475</td>\r
-  <td>1639</td>\r
-  <td>1915</td>\r
-  <td>2471</td>\r
- </tr>\r
- <tr>\r
-  <td>Gambia</td>\r
-  <td>258</td>\r
-  <td>1705</td>\r
-  <td>1985</td>\r
-  <td>2478</td>\r
-  <td>3763</td>\r
- </tr>\r
- <tr>\r
-  <td>Georgia</td>\r
-  <td>3527</td>\r
-  <td>4260</td>\r
-  <td>4084</td>\r
-  <td>3888</td>\r
-  <td>3267</td>\r
- </tr>\r
- <tr>\r
-  <td>Germany</td>\r
-  <td>68376</td>\r
-  <td>82167</td>\r
-  <td>81346</td>\r
-  <td>79258</td>\r
-  <td>70504</td>\r
- </tr>\r
- <tr>\r
-  <td>Ghana</td>\r
-  <td>4981</td>\r
-  <td>23837</td>\r
-  <td>26925</td>\r
-  <td>32233</td>\r
-  <td>45213</td>\r
- </tr>\r
- <tr>\r
-  <td>Gibraltar</td>\r
-  <td>20</td>\r
-  <td>31</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>30</td>\r
- </tr>\r
- <tr>\r
-  <td>Greece</td>\r
-  <td>7566</td>\r
-  <td>11161</td>\r
-  <td>11261</td>\r
-  <td>11274</td>\r
-  <td>10939</td>\r
- </tr>\r
- <tr>\r
-  <td>Greenland</td>\r
-  <td>23</td>\r
-  <td>57</td>\r
-  <td>57</td>\r
-  <td>56</td>\r
-  <td>50</td>\r
- </tr>\r
- <tr>\r
-  <td>Grenada</td>\r
-  <td>77</td>\r
-  <td>104</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Guadeloupe</td>\r
-  <td>210</td>\r
-  <td>465</td>\r
-  <td>476</td>\r
-  <td>489</td>\r
-  <td>477</td>\r
- </tr>\r
- <tr>\r
-  <td>Guam</td>\r
-  <td>60</td>\r
-  <td>178</td>\r
-  <td>191</td>\r
-  <td>211</td>\r
-  <td>242</td>\r
- </tr>\r
- <tr>\r
-  <td>Guatemala</td>\r
-  <td>3146</td>\r
-  <td>14027</td>\r
-  <td>16227</td>\r
-  <td>19927</td>\r
-  <td>27480</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea</td>\r
-  <td>2619</td>\r
-  <td>10069</td>\r
-  <td>11844</td>\r
-  <td>15158</td>\r
-  <td>23975</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea-Bissau</td>\r
-  <td>518</td>\r
-  <td>1611</td>\r
-  <td>1848</td>\r
-  <td>2296</td>\r
-  <td>3555</td>\r
- </tr>\r
- <tr>\r
-  <td>Guyana</td>\r
-  <td>423</td>\r
-  <td>762</td>\r
-  <td>754</td>\r
-  <td>732</td>\r
-  <td>558</td>\r
- </tr>\r
- <tr>\r
-  <td>Haiti</td>\r
-  <td>3221</td>\r
-  <td>10033</td>\r
-  <td>10957</td>\r
-  <td>12476</td>\r
-  <td>15485</td>\r
- </tr>\r
- <tr>\r
-  <td>Holy See</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Honduras</td>\r
-  <td>1487</td>\r
-  <td>7466</td>\r
-  <td>8386</td>\r
-  <td>9844</td>\r
-  <td>12402</td>\r
- </tr>\r
- <tr>\r
-  <td>Hungary</td>\r
-  <td>9338</td>\r
-  <td>9993</td>\r
-  <td>9874</td>\r
-  <td>9647</td>\r
-  <td>8934</td>\r
- </tr>\r
- <tr>\r
-  <td>Iceland</td>\r
-  <td>143</td>\r
-  <td>323</td>\r
-  <td>353</td>\r
-  <td>384</td>\r
-  <td>407</td>\r
- </tr>\r
- <tr>\r
-  <td>India</td>\r
-  <td>371857</td>\r
-  <td>1198003</td>\r
-  <td>1294192</td>\r
-  <td>1431272</td>\r
-  <td>1613800</td>\r
- </tr>\r
- <tr>\r
-  <td>Indonesia</td>\r
-  <td>77152</td>\r
-  <td>229965</td>\r
-  <td>244191</td>\r
-  <td>263287</td>\r
-  <td>288110</td>\r
- </tr>\r
- <tr>\r
-  <td>Iran (Islamic Republic of)</td>\r
-  <td>16913</td>\r
-  <td>74196</td>\r
-  <td>79454</td>\r
-  <td>87134</td>\r
-  <td>96975</td>\r
- </tr>\r
- <tr>\r
-  <td>Iraq</td>\r
-  <td>5719</td>\r
-  <td>30747</td>\r
-  <td>35884</td>\r
-  <td>44692</td>\r
-  <td>63995</td>\r
- </tr>\r
- <tr>\r
-  <td>Ireland</td>\r
-  <td>2969</td>\r
-  <td>4515</td>\r
-  <td>4886</td>\r
-  <td>5370</td>\r
-  <td>6295</td>\r
- </tr>\r
- <tr>\r
-  <td>Isle of Man</td>\r
-  <td>55</td>\r
-  <td>80</td>\r
-  <td>81</td>\r
-  <td>80</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Israel</td>\r
-  <td>1258</td>\r
-  <td>7170</td>\r
-  <td>7823</td>\r
-  <td>8769</td>\r
-  <td>10649</td>\r
- </tr>\r
- <tr>\r
-  <td>Italy</td>\r
-  <td>46367</td>\r
-  <td>59870</td>\r
-  <td>60604</td>\r
-  <td>60018</td>\r
-  <td>57066</td>\r
- </tr>\r
- <tr>\r
-  <td>Jamaica</td>\r
-  <td>1403</td>\r
-  <td>2719</td>\r
-  <td>2786</td>\r
-  <td>2866</td>\r
-  <td>2683</td>\r
- </tr>\r
- <tr>\r
-  <td>Japan</td>\r
-  <td>82824</td>\r
-  <td>127156</td>\r
-  <td>125791</td>\r
-  <td>120793</td>\r
-  <td>101659</td>\r
- </tr>\r
- <tr>\r
-  <td>Jordan</td>\r
-  <td>472</td>\r
-  <td>6316</td>\r
-  <td>6957</td>\r
-  <td>8088</td>\r
-  <td>10241</td>\r
- </tr>\r
- <tr>\r
-  <td>Kazakhstan</td>\r
-  <td>6703</td>\r
-  <td>15637</td>\r
-  <td>16289</td>\r
-  <td>17025</td>\r
-  <td>17848</td>\r
- </tr>\r
- <tr>\r
-  <td>Kenya</td>\r
-  <td>6077</td>\r
-  <td>39802</td>\r
-  <td>46433</td>\r
-  <td>57573</td>\r
-  <td>85410</td>\r
- </tr>\r
- <tr>\r
-  <td>Kiribati</td>\r
-  <td>26</td>\r
-  <td>98</td>\r
-  <td>107</td>\r
-  <td>123</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Kuwait</td>\r
-  <td>152</td>\r
-  <td>2985</td>\r
-  <td>3378</td>\r
-  <td>3988</td>\r
-  <td>5240</td>\r
- </tr>\r
- <tr>\r
-  <td>Kyrgyzstan</td>\r
-  <td>1740</td>\r
-  <td>5482</td>\r
-  <td>5877</td>\r
-  <td>6378</td>\r
-  <td>6882</td>\r
- </tr>\r
- <tr>\r
-  <td>Lao People's Dem. Republic</td>\r
-  <td>1666</td>\r
-  <td>6320</td>\r
-  <td>7028</td>\r
-  <td>8273</td>\r
-  <td>10744</td>\r
- </tr>\r
- <tr>\r
-  <td>Latvia</td>\r
-  <td>1949</td>\r
-  <td>2249</td>\r
-  <td>2197</td>\r
-  <td>2101</td>\r
-  <td>1854</td>\r
- </tr>\r
- <tr>\r
-  <td>Lebanon</td>\r
-  <td>1443</td>\r
-  <td>4224</td>\r
-  <td>4426</td>\r
-  <td>4736</td>\r
-  <td>5033</td>\r
- </tr>\r
- <tr>\r
-  <td>Lesotho</td>\r
-  <td>734</td>\r
-  <td>2067</td>\r
-  <td>2168</td>\r
-  <td>2306</td>\r
-  <td>2491</td>\r
- </tr>\r
- <tr>\r
-  <td>Liberia</td>\r
-  <td>824</td>\r
-  <td>3955</td>\r
-  <td>4665</td>\r
-  <td>5858</td>\r
-  <td>8841</td>\r
- </tr>\r
- <tr>\r
-  <td>Libyan Arab Jamahiriya</td>\r
-  <td>1029</td>\r
-  <td>6420</td>\r
-  <td>7158</td>\r
-  <td>8144</td>\r
-  <td>9819</td>\r
- </tr>\r
- <tr>\r
-  <td>Liechtenstein</td>\r
-  <td>14</td>\r
-  <td>36</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
-  <td>45</td>\r
- </tr>\r
- <tr>\r
-  <td>Lithuania</td>\r
-  <td>2567</td>\r
-  <td>3287</td>\r
-  <td>3143</td>\r
-  <td>2985</td>\r
-  <td>2579</td>\r
- </tr>\r
- <tr>\r
-  <td>Luxembourg</td>\r
-  <td>296</td>\r
-  <td>486</td>\r
-  <td>520</td>\r
-  <td>582</td>\r
-  <td>733</td>\r
- </tr>\r
- <tr>\r
-  <td>Madagascar</td>\r
-  <td>4084</td>\r
-  <td>19625</td>\r
-  <td>22853</td>\r
-  <td>28595</td>\r
-  <td>42693</td>\r
- </tr>\r
- <tr>\r
-  <td>Malawi</td>\r
-  <td>2881</td>\r
-  <td>15263</td>\r
-  <td>17998</td>\r
-  <td>23194</td>\r
-  <td>36575</td>\r
- </tr>\r
- <tr>\r
-  <td>Malaysia</td>\r
-  <td>6110</td>\r
-  <td>27468</td>\r
-  <td>30041</td>\r
-  <td>33770</td>\r
-  <td>39664</td>\r
- </tr>\r
- <tr>\r
-  <td>Maldives</td>\r
-  <td>82</td>\r
-  <td>309</td>\r
-  <td>338</td>\r
-  <td>384</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Mali</td>\r
-  <td>4268</td>\r
-  <td>13010</td>\r
-  <td>14993</td>\r
-  <td>18603</td>\r
-  <td>28260</td>\r
- </tr>\r
- <tr>\r
-  <td>Malta</td>\r
-  <td>312</td>\r
-  <td>409</td>\r
-  <td>417</td>\r
-  <td>426</td>\r
-  <td>413</td>\r
- </tr>\r
- <tr>\r
-  <td>Marshall Islands</td>\r
-  <td>13</td>\r
-  <td>62</td>\r
-  <td>70</td>\r
-  <td>79</td>\r
-  <td>92</td>\r
- </tr>\r
- <tr>\r
-  <td>Martinique</td>\r
-  <td>222</td>\r
-  <td>405</td>\r
-  <td>411</td>\r
-  <td>418</td>\r
-  <td>393</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritania</td>\r
-  <td>651</td>\r
-  <td>3291</td>\r
-  <td>3732</td>\r
-  <td>4443</td>\r
-  <td>6061</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritius</td>\r
-  <td>493</td>\r
-  <td>1288</td>\r
-  <td>1337</td>\r
-  <td>1400</td>\r
-  <td>1426</td>\r
- </tr>\r
- <tr>\r
-  <td>Mayotte</td>\r
-  <td>15</td>\r
-  <td>194</td>\r
-  <td>224</td>\r
-  <td>277</td>\r
-  <td>386</td>\r
- </tr>\r
- <tr>\r
-  <td>Mexico</td>\r
-  <td>27741</td>\r
-  <td>109610</td>\r
-  <td>115528</td>\r
-  <td>123366</td>\r
-  <td>128964</td>\r
- </tr>\r
- <tr>\r
-  <td>Micronesia (Fed. States of)</td>\r
-  <td>32</td>\r
-  <td>111</td>\r
-  <td>114</td>\r
-  <td>122</td>\r
-  <td>128</td>\r
- </tr>\r
- <tr>\r
-  <td>Moldova (Republic of)</td>\r
-  <td>2341</td>\r
-  <td>3604</td>\r
-  <td>3462</td>\r
-  <td>3291</td>\r
-  <td>2734</td>\r
- </tr>\r
- <tr>\r
-  <td>Monaco</td>\r
-  <td>20</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
- </tr>\r
- <tr>\r
-  <td>Mongolia</td>\r
-  <td>761</td>\r
-  <td>2671</td>\r
-  <td>2855</td>\r
-  <td>3134</td>\r
-  <td>3446</td>\r
- </tr>\r
- <tr>\r
-  <td>Montenegro</td>\r
-  <td>399</td>\r
-  <td>624</td>\r
-  <td>627</td>\r
-  <td>633</td>\r
-  <td>618</td>\r
- </tr>\r
- <tr>\r
-  <td>Montserrat</td>\r
-  <td>14</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>7</td>\r
-  <td>7</td>\r
- </tr>\r
- <tr>\r
-  <td>Morocco</td>\r
-  <td>8953</td>\r
-  <td>31993</td>\r
-  <td>34330</td>\r
-  <td>37865</td>\r
-  <td>42583</td>\r
- </tr>\r
- <tr>\r
-  <td>Mozambique</td>\r
-  <td>6442</td>\r
-  <td>22894</td>\r
-  <td>25957</td>\r
-  <td>31190</td>\r
-  <td>44148</td>\r
- </tr>\r
- <tr>\r
-  <td>Myanmar</td>\r
-  <td>17158</td>\r
-  <td>50020</td>\r
-  <td>53087</td>\r
-  <td>57585</td>\r
-  <td>63373</td>\r
- </tr>\r
- <tr>\r
-  <td>Namibia</td>\r
-  <td>485</td>\r
-  <td>2171</td>\r
-  <td>2412</td>\r
-  <td>2810</td>\r
-  <td>3588</td>\r
- </tr>\r
- <tr>\r
-  <td>Nauru</td>\r
-  <td>3</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Nepal</td>\r
-  <td>8126</td>\r
-  <td>29331</td>\r
-  <td>32503</td>\r
-  <td>38031</td>\r
-  <td>49028</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands</td>\r
-  <td>10114</td>\r
-  <td>16592</td>\r
-  <td>16915</td>\r
-  <td>17348</td>\r
-  <td>17399</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands Antilles</td>\r
-  <td>112</td>\r
-  <td>198</td>\r
-  <td>207</td>\r
-  <td>210</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>New Caledonia</td>\r
-  <td>65</td>\r
-  <td>250</td>\r
-  <td>271</td>\r
-  <td>304</td>\r
-  <td>362</td>\r
- </tr>\r
- <tr>\r
-  <td>New Zealand</td>\r
-  <td>1908</td>\r
-  <td>4266</td>\r
-  <td>4492</td>\r
-  <td>4831</td>\r
-  <td>5349</td>\r
- </tr>\r
- <tr>\r
-  <td>Nicaragua</td>\r
-  <td>1295</td>\r
-  <td>5743</td>\r
-  <td>6265</td>\r
-  <td>7058</td>\r
-  <td>8143</td>\r
- </tr>\r
- <tr>\r
-  <td>Niger</td>\r
-  <td>2462</td>\r
-  <td>15290</td>\r
-  <td>19150</td>\r
-  <td>27388</td>\r
-  <td>58216</td>\r
- </tr>\r
- <tr>\r
-  <td>Nigeria</td>\r
-  <td>36680</td>\r
-  <td>154729</td>\r
-  <td>175928</td>\r
-  <td>210057</td>\r
-  <td>289083</td>\r
- </tr>\r
- <tr>\r
-  <td>Niue</td>\r
-  <td>5</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Northern Mariana Islands</td>\r
-  <td>7</td>\r
-  <td>87</td>\r
-  <td>96</td>\r
-  <td>111</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Norway</td>\r
-  <td>3265</td>\r
-  <td>4812</td>\r
-  <td>5036</td>\r
-  <td>5365</td>\r
-  <td>5947</td>\r
- </tr>\r
- <tr>\r
-  <td>Occupied Palestinian Territory</td>\r
-  <td>1005</td>\r
-  <td>4277</td>\r
-  <td>5090</td>\r
-  <td>6553</td>\r
-  <td>10265</td>\r
- </tr>\r
- <tr>\r
-  <td>Oman</td>\r
-  <td>456</td>\r
-  <td>2845</td>\r
-  <td>3198</td>\r
-  <td>3782</td>\r
-  <td>4878</td>\r
- </tr>\r
- <tr>\r
-  <td>Pakistan</td>\r
-  <td>41177</td>\r
-  <td>180808</td>\r
-  <td>205504</td>\r
-  <td>246286</td>\r
-  <td>335195</td>\r
- </tr>\r
- <tr>\r
-  <td>Palau</td>\r
-  <td>7</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>23</td>\r
-  <td>26</td>\r
- </tr>\r
- <tr>\r
-  <td>Panama</td>\r
-  <td>860</td>\r
-  <td>3454</td>\r
-  <td>3773</td>\r
-  <td>4267</td>\r
-  <td>5092</td>\r
- </tr>\r
- <tr>\r
-  <td>Papua New Guinea</td>\r
-  <td>1798</td>\r
-  <td>6732</td>\r
-  <td>7678</td>\r
-  <td>9265</td>\r
-  <td>12871</td>\r
- </tr>\r
- <tr>\r
-  <td>Paraguay</td>\r
-  <td>1473</td>\r
-  <td>6349</td>\r
-  <td>7007</td>\r
-  <td>8026</td>\r
-  <td>9867</td>\r
- </tr>\r
- <tr>\r
-  <td>Peru</td>\r
-  <td>7632</td>\r
-  <td>29165</td>\r
-  <td>31197</td>\r
-  <td>34528</td>\r
-  <td>39776</td>\r
- </tr>\r
- <tr>\r
-  <td>Philippines</td>\r
-  <td>19996</td>\r
-  <td>91983</td>\r
-  <td>101734</td>\r
-  <td>117270</td>\r
-  <td>146156</td>\r
- </tr>\r
- <tr>\r
-  <td>Pitcairn</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
- </tr>\r
- <tr>\r
-  <td>Poland</td>\r
-  <td>24824</td>\r
-  <td>38074</td>\r
-  <td>37788</td>\r
-  <td>36964</td>\r
-  <td>32013</td>\r
- </tr>\r
- <tr>\r
-  <td>Portugal</td>\r
-  <td>8405</td>\r
-  <td>10707</td>\r
-  <td>10787</td>\r
-  <td>10706</td>\r
-  <td>10015</td>\r
- </tr>\r
- <tr>\r
-  <td>Puerto Rico</td>\r
-  <td>2218</td>\r
-  <td>3982</td>\r
-  <td>4074</td>\r
-  <td>4176</td>\r
-  <td>4103</td>\r
- </tr>\r
- <tr>\r
-  <td>Qatar</td>\r
-  <td>25</td>\r
-  <td>1409</td>\r
-  <td>1630</td>\r
-  <td>1848</td>\r
-  <td>2316</td>\r
- </tr>\r
- <tr>\r
-  <td>Republic of Korea</td>\r
-  <td>19211</td>\r
-  <td>48333</td>\r
-  <td>49153</td>\r
-  <td>49484</td>\r
-  <td>44077</td>\r
- </tr>\r
- <tr>\r
-  <td>Réunion</td>\r
-  <td>248</td>\r
-  <td>827</td>\r
-  <td>886</td>\r
-  <td>973</td>\r
-  <td>1096</td>\r
- </tr>\r
- <tr>\r
-  <td>Romania</td>\r
-  <td>16311</td>\r
-  <td>21275</td>\r
-  <td>20787</td>\r
-  <td>19961</td>\r
-  <td>17279</td>\r
- </tr>\r
- <tr>\r
-  <td>Russian Federation</td>\r
-  <td>102702</td>\r
-  <td>140874</td>\r
-  <td>137983</td>\r
-  <td>132345</td>\r
-  <td>116097</td>\r
- </tr>\r
- <tr>\r
-  <td>Rwanda</td>\r
-  <td>2162</td>\r
-  <td>9998</td>\r
-  <td>11743</td>\r
-  <td>14676</td>\r
-  <td>22082</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Helena</td>\r
-  <td>5</td>\r
-  <td>4</td>\r
-  <td>4</td>\r
-  <td>5</td>\r
-  <td>5</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Kitts and Nevis</td>\r
-  <td>46</td>\r
-  <td>52</td>\r
-  <td>56</td>\r
-  <td>61</td>\r
-  <td>69</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Lucia</td>\r
-  <td>83</td>\r
-  <td>172</td>\r
-  <td>182</td>\r
-  <td>198</td>\r
-  <td>217</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Pierre and Miquelon</td>\r
-  <td>5</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
- </tr>\r
- <tr>\r
-  <td>St. Vincent and the Grenadines</td>\r
-  <td>67</td>\r
-  <td>109</td>\r
-  <td>110</td>\r
-  <td>111</td>\r
-  <td>119</td>\r
- </tr>\r
- <tr>\r
-  <td>Samoa</td>\r
-  <td>82</td>\r
-  <td>179</td>\r
-  <td>181</td>\r
-  <td>188</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>San Marino</td>\r
-  <td>13</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
- </tr>\r
- <tr>\r
-  <td>Sao Tome and Principe</td>\r
-  <td>60</td>\r
-  <td>163</td>\r
-  <td>180</td>\r
-  <td>216</td>\r
-  <td>296</td>\r
- </tr>\r
- <tr>\r
-  <td>Saudi Arabia</td>\r
-  <td>3201</td>\r
-  <td>25721</td>\r
-  <td>28933</td>\r
-  <td>34176</td>\r
-  <td>43658</td>\r
- </tr>\r
- <tr>\r
-  <td>Senegal</td>\r
-  <td>2416</td>\r
-  <td>12534</td>\r
-  <td>14526</td>\r
-  <td>17861</td>\r
-  <td>26102</td>\r
- </tr>\r
- <tr>\r
-  <td>Serbia</td>\r
-  <td>6732</td>\r
-  <td>9850</td>\r
-  <td>9828</td>\r
-  <td>9720</td>\r
-  <td>9193</td>\r
- </tr>\r
- <tr>\r
-  <td>Seychelles</td>\r
-  <td>36</td>\r
-  <td>84</td>\r
-  <td>86</td>\r
-  <td>91</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Sierra Leone</td>\r
-  <td>1944</td>\r
-  <td>5696</td>\r
-  <td>6557</td>\r
-  <td>8112</td>\r
-  <td>12446</td>\r
- </tr>\r
- <tr>\r
-  <td>Singapore</td>\r
-  <td>1022</td>\r
-  <td>4737</td>\r
-  <td>5059</td>\r
-  <td>5362</td>\r
-  <td>5221</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovakia</td>\r
-  <td>3463</td>\r
-  <td>5406</td>\r
-  <td>5437</td>\r
-  <td>5413</td>\r
-  <td>4917</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovenia</td>\r
-  <td>1473</td>\r
-  <td>2020</td>\r
-  <td>2044</td>\r
-  <td>2050</td>\r
-  <td>1954</td>\r
- </tr>\r
- <tr>\r
-  <td>Solomon Islands</td>\r
-  <td>90</td>\r
-  <td>523</td>\r
-  <td>599</td>\r
-  <td>725</td>\r
-  <td>1007</td>\r
- </tr>\r
- <tr>\r
-  <td>Somalia</td>\r
-  <td>2264</td>\r
-  <td>9133</td>\r
-  <td>10731</td>\r
-  <td>13922</td>\r
-  <td>23522</td>\r
- </tr>\r
- <tr>\r
-  <td>South Africa</td>\r
-  <td>13683</td>\r
-  <td>50110</td>\r
-  <td>51684</td>\r
-  <td>53766</td>\r
-  <td>56802</td>\r
- </tr>\r
- <tr>\r
-  <td>Spain</td>\r
-  <td>28009</td>\r
-  <td>44904</td>\r
-  <td>47203</td>\r
-  <td>49265</td>\r
-  <td>51260</td>\r
- </tr>\r
- <tr>\r
-  <td>Sri Lanka</td>\r
-  <td>8241</td>\r
-  <td>20238</td>\r
-  <td>21167</td>\r
-  <td>22033</td>\r
-  <td>21705</td>\r
- </tr>\r
- <tr>\r
-  <td>Sudan</td>\r
-  <td>9190</td>\r
-  <td>42272</td>\r
-  <td>47730</td>\r
-  <td>56688</td>\r
-  <td>75884</td>\r
- </tr>\r
- <tr>\r
-  <td>Suriname</td>\r
-  <td>215</td>\r
-  <td>520</td>\r
-  <td>547</td>\r
-  <td>586</td>\r
-  <td>619</td>\r
- </tr>\r
- <tr>\r
-  <td>Swaziland</td>\r
-  <td>273</td>\r
-  <td>1185</td>\r
-  <td>1287</td>\r
-  <td>1455</td>\r
-  <td>1749</td>\r
- </tr>\r
- <tr>\r
-  <td>Sweden</td>\r
-  <td>7014</td>\r
-  <td>9249</td>\r
-  <td>9498</td>\r
-  <td>9915</td>\r
-  <td>10571</td>\r
- </tr>\r
- <tr>\r
-  <td>Switzerland</td>\r
-  <td>4693</td>\r
-  <td>7568</td>\r
-  <td>7736</td>\r
-  <td>8020</td>\r
-  <td>8514</td>\r
- </tr>\r
- <tr>\r
-  <td>Syrian Arab Republic</td>\r
-  <td>3536</td>\r
-  <td>21906</td>\r
-  <td>24494</td>\r
-  <td>28592</td>\r
-  <td>36911</td>\r
- </tr>\r
- <tr>\r
-  <td>Tajikistan</td>\r
-  <td>1532</td>\r
-  <td>6952</td>\r
-  <td>7761</td>\r
-  <td>9075</td>\r
-  <td>11111</td>\r
- </tr>\r
- <tr>\r
-  <td>TFYR Macedonia</td>\r
-  <td>1230</td>\r
-  <td>2042</td>\r
-  <td>2045</td>\r
-  <td>2037</td>\r
-  <td>1857</td>\r
- </tr>\r
- <tr>\r
-  <td>Thailand</td>\r
-  <td>20607</td>\r
-  <td>67764</td>\r
-  <td>69939</td>\r
-  <td>72628</td>\r
-  <td>73361</td>\r
- </tr>\r
- <tr>\r
-  <td>Timor-Leste</td>\r
-  <td>433</td>\r
-  <td>1134</td>\r
-  <td>1385</td>\r
-  <td>1869</td>\r
-  <td>3217</td>\r
- </tr>\r
- <tr>\r
-  <td>Togo</td>\r
-  <td>1329</td>\r
-  <td>6619</td>\r
-  <td>7607</td>\r
-  <td>9282</td>\r
-  <td>13196</td>\r
- </tr>\r
- <tr>\r
-  <td>Tokelau</td>\r
-  <td>2</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Tonga</td>\r
-  <td>47</td>\r
-  <td>104</td>\r
-  <td>105</td>\r
-  <td>112</td>\r
-  <td>123</td>\r
- </tr>\r
- <tr>\r
-  <td>Trinidad and Tobago</td>\r
-  <td>636</td>\r
-  <td>1339</td>\r
-  <td>1368</td>\r
-  <td>1388</td>\r
-  <td>1278</td>\r
- </tr>\r
- <tr>\r
-  <td>Tunisia</td>\r
-  <td>3530</td>\r
-  <td>10272</td>\r
-  <td>10884</td>\r
-  <td>11797</td>\r
-  <td>12711</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkey</td>\r
-  <td>21484</td>\r
-  <td>74816</td>\r
-  <td>79966</td>\r
-  <td>87364</td>\r
-  <td>97389</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkmenistan</td>\r
-  <td>1211</td>\r
-  <td>5110</td>\r
-  <td>5509</td>\r
-  <td>6072</td>\r
-  <td>6796</td>\r
- </tr>\r
- <tr>\r
-  <td>Turks and Caicos Islands</td>\r
-  <td>5</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
- </tr>\r
- <tr>\r
-  <td>Tuvalu</td>\r
-  <td>5</td>\r
-  <td>10</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Uganda</td>\r
-  <td>5158</td>\r
-  <td>32710</td>\r
-  <td>39710</td>\r
-  <td>53406</td>\r
-  <td>91271</td>\r
- </tr>\r
- <tr>\r
-  <td>Ukraine</td>\r
-  <td>37298</td>\r
-  <td>45708</td>\r
-  <td>44165</td>\r
-  <td>41617</td>\r
-  <td>35026</td>\r
- </tr>\r
- <tr>\r
-  <td>United Arab Emirates</td>\r
-  <td>70</td>\r
-  <td>4599</td>\r
-  <td>5193</td>\r
-  <td>6109</td>\r
-  <td>8253</td>\r
- </tr>\r
- <tr>\r
-  <td>United Kingdom</td>\r
-  <td>50616</td>\r
-  <td>61565</td>\r
-  <td>63528</td>\r
-  <td>66601</td>\r
-  <td>72365</td>\r
- </tr>\r
- <tr>\r
-  <td>United Republic of Tanzania</td>\r
-  <td>7650</td>\r
-  <td>43739</td>\r
-  <td>52109</td>\r
-  <td>67394</td>\r
-  <td>109450</td>\r
- </tr>\r
- <tr>\r
-  <td>United States of America</td>\r
-  <td>157813</td>\r
-  <td>314659</td>\r
-  <td>332334</td>\r
-  <td>358735</td>\r
-  <td>403932</td>\r
- </tr>\r
- <tr>\r
-  <td>United States Virgin Islands</td>\r
-  <td>27</td>\r
-  <td>110</td>\r
-  <td>108</td>\r
-  <td>103</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Uruguay</td>\r
-  <td>2239</td>\r
-  <td>3361</td>\r
-  <td>3430</td>\r
-  <td>3546</td>\r
-  <td>3637</td>\r
- </tr>\r
- <tr>\r
-  <td>Uzbekistan</td>\r
-  <td>6314</td>\r
-  <td>27488</td>\r
-  <td>29456</td>\r
-  <td>32715</td>\r
-  <td>36439</td>\r
- </tr>\r
- <tr>\r
-  <td>Vanuatu</td>\r
-  <td>48</td>\r
-  <td>240</td>\r
-  <td>276</td>\r
-  <td>338</td>\r
-  <td>482</td>\r
- </tr>\r
- <tr>\r
-  <td>Venezuela (Bolivarian Republic of)</td>\r
-  <td>5094</td>\r
-  <td>28583</td>\r
-  <td>31292</td>\r
-  <td>35370</td>\r
-  <td>42042</td>\r
- </tr>\r
- <tr>\r
-  <td>Viet Nam</td>\r
-  <td>27367</td>\r
-  <td>88069</td>\r
-  <td>93647</td>\r
-  <td>102054</td>\r
-  <td>111666</td>\r
- </tr>\r
- <tr>\r
-  <td>Wallis and Futuna Islands</td>\r
-  <td>7</td>\r
-  <td>15</td>\r
-  <td>16</td>\r
-  <td>17</td>\r
-  <td>17</td>\r
- </tr>\r
- <tr>\r
-  <td>Western Sahara</td>\r
-  <td>14</td>\r
-  <td>513</td>\r
-  <td>625</td>\r
-  <td>775</td>\r
-  <td>938</td>\r
- </tr>\r
- <tr>\r
-  <td>Yemen</td>\r
-  <td>4316</td>\r
-  <td>23580</td>\r
-  <td>27819</td>\r
-  <td>35509</td>\r
-  <td>53689</td>\r
- </tr>\r
- <tr>\r
-  <td>Zambia</td>\r
-  <td>2340</td>\r
-  <td>12935</td>\r
-  <td>14980</td>\r
-  <td>18890</td>\r
-  <td>28957</td>\r
- </tr>\r
- <tr>\r
-  <td>Zimbabwe</td>\r
-  <td>2747</td>\r
-  <td>12523</td>\r
-  <td>14029</td>\r
-  <td>16780</td>\r
-  <td>22178</td>\r
- </tr>\r
+ <tr>  <td>Afghanistan</td>  <td>8151</td>  <td>28150</td>  <td>34246</td>  <td>44970</td>  <td>73938</td> </tr>\r
+ <tr>  <td>Albania</td>  <td>1215</td>  <td>3155</td>  <td>3256</td>  <td>3395</td>  <td>3303</td> </tr>\r
+ <tr>  <td>Algeria</td>  <td>8753</td>  <td>34895</td>  <td>38088</td>  <td>42882</td>  <td>49610</td> </tr>\r
+ <tr>  <td>American Samoa</td>  <td>19</td>  <td>67</td>  <td>74</td>  <td>86</td>  <td>107</td> </tr>\r
+ <tr>  <td>Andorra</td>  <td>6</td>  <td>86</td>  <td>93</td>  <td>107</td>  <td>137</td> </tr>\r
+ <tr>  <td>Angola</td>  <td>4148</td>  <td>18498</td>  <td>21690</td>  <td>27441</td>  <td>42267</td> </tr>\r
+ <tr>  <td>Anguilla</td>  <td>5</td>  <td>15</td>  <td>17</td>  <td>18</td>  <td>20</td> </tr>\r
+ <tr>  <td>Antigua and Barbuda</td>  <td>46</td>  <td>88</td>  <td>93</td>  <td>101</td>  <td>112</td> </tr>\r
+ <tr>  <td>Argentina</td>  <td>17150</td>  <td>40276</td>  <td>42548</td>  <td>45883</td>  <td>50943</td> </tr>\r
+ <tr>  <td>Armenia</td>  <td>1354</td>  <td>3083</td>  <td>3139</td>  <td>3181</td>  <td>3018</td> </tr>\r
+ <tr>  <td>Aruba</td>  <td>38</td>  <td>107</td>  <td>109</td>  <td>112</td>  <td>106</td> </tr>\r
+ <tr>  <td>Australia</td>  <td>8219</td>  <td>21293</td>  <td>22607</td>  <td>24703</td>  <td>28724</td> </tr>\r
+ <tr>  <td>Austria</td>  <td>6936</td>  <td>8364</td>  <td>8467</td>  <td>8600</td>  <td>8515</td> </tr>\r
+ <tr>  <td>Azerbaijan</td>  <td>2896</td>  <td>8832</td>  <td>9426</td>  <td>10128</td>  <td>10579</td> </tr>\r
+ <tr>  <td>Bahamas</td>  <td>79</td>  <td>342</td>  <td>366</td>  <td>402</td>  <td>455</td> </tr>\r
+ <tr>  <td>Bahrain</td>  <td>116</td>  <td>791</td>  <td>882</td>  <td>1021</td>  <td>1277</td> </tr>\r
+ <tr>  <td>Bangladesh</td>  <td>43595</td>  <td>162221</td>  <td>175217</td>  <td>195012</td>  <td>222495</td> </tr>\r
+ <tr>  <td>Barbados</td>  <td>211</td>  <td>256</td>  <td>260</td>  <td>262</td>  <td>237</td> </tr>\r
+ <tr>  <td>Belarus</td>  <td>7745</td>  <td>9634</td>  <td>9355</td>  <td>8851</td>  <td>7275</td> </tr>\r
+ <tr>  <td>Belgium</td>  <td>8628</td>  <td>10647</td>  <td>10878</td>  <td>11191</td>  <td>11493</td> </tr>\r
+ <tr>  <td>Belize</td>  <td>69</td>  <td>307</td>  <td>344</td>  <td>404</td>  <td>506</td> </tr>\r
+ <tr>  <td>Benin</td>  <td>2050</td>  <td>8935</td>  <td>10647</td>  <td>13767</td>  <td>21982</td> </tr>\r
+ <tr>  <td>Bermuda</td>  <td>37</td>  <td>65</td>  <td>65</td>  <td>66</td>  <td>63</td> </tr>\r
+ <tr>  <td>Bhutan</td>  <td>168</td>  <td>697</td>  <td>770</td>  <td>865</td>  <td>1013</td> </tr>\r
+ <tr>  <td>Bolivia</td>  <td>2714</td>  <td>9863</td>  <td>10854</td>  <td>12368</td>  <td>14908</td> </tr>\r
+ <tr>  <td>Bosnia and Herzegovina</td>  <td>2661</td>  <td>3767</td>  <td>3727</td>  <td>3608</td>  <td>3008</td> </tr>\r
+ <tr>  <td>Botswana</td>  <td>413</td>  <td>1950</td>  <td>2106</td>  <td>2337</td>  <td>2758</td> </tr>\r
+ <tr>  <td>Brazil</td>  <td>53975</td>  <td>193734</td>  <td>202866</td>  <td>213802</td>  <td>218512</td> </tr>\r
+ <tr>  <td>British Virgin Islands</td>  <td>7</td>  <td>23</td>  <td>24</td>  <td>26</td>  <td>28</td> </tr>\r
+ <tr>  <td>Brunei Darussalam</td>  <td>48</td>  <td>400</td>  <td>443</td>  <td>513</td>  <td>658</td> </tr>\r
+ <tr>  <td>Bulgaria</td>  <td>7251</td>  <td>7545</td>  <td>7263</td>  <td>6752</td>  <td>5392</td> </tr>\r
+ <tr>  <td>Burkina Faso</td>  <td>4080</td>  <td>15757</td>  <td>19013</td>  <td>24837</td>  <td>40830</td> </tr>\r
+ <tr>  <td>Burundi</td>  <td>2456</td>  <td>8303</td>  <td>9413</td>  <td>11161</td>  <td>14846</td> </tr>\r
+ <tr>  <td>Cambodia</td>  <td>4346</td>  <td>14805</td>  <td>16357</td>  <td>18973</td>  <td>23795</td> </tr>\r
+ <tr>  <td>Cameroon</td>  <td>4466</td>  <td>19522</td>  <td>22169</td>  <td>26478</td>  <td>36736</td> </tr>\r
+ <tr>  <td>Canada</td>  <td>13737</td>  <td>33573</td>  <td>35493</td>  <td>38659</td>  <td>44414</td> </tr>\r
+ <tr>  <td>Cape Verde</td>  <td>146</td>  <td>506</td>  <td>548</td>  <td>616</td>  <td>703</td> </tr>\r
+ <tr>  <td>Cayman Islands</td>  <td>7</td>  <td>56</td>  <td>59</td>  <td>63</td>  <td>66</td> </tr>\r
+ <tr>  <td>Central African Republic</td>  <td>1327</td>  <td>4422</td>  <td>4927</td>  <td>5747</td>  <td>7603</td> </tr>\r
+ <tr>  <td>Chad</td>  <td>2429</td>  <td>11206</td>  <td>13120</td>  <td>16906</td>  <td>27776</td> </tr>\r
+ <tr>  <td>Channel Islands</td>  <td>102</td>  <td>150</td>  <td>151</td>  <td>152</td>  <td>144</td> </tr>\r
+ <tr>  <td>Chile</td>  <td>6082</td>  <td>16970</td>  <td>17926</td>  <td>19266</td>  <td>20657</td> </tr>\r
+ <tr>  <td>China</td>  <td>544951</td>  <td>1345751</td>  <td>1395998</td>  <td>1453140</td>  <td>1417045</td> </tr>\r
+ <tr>  <td>China, Hong Kong SAR</td>  <td>1974</td>  <td>7022</td>  <td>7398</td>  <td>7969</td>  <td>8623</td> </tr>\r
+ <tr>  <td>China, Macao SAR</td>  <td>190</td>  <td>538</td>  <td>568</td>  <td>603</td>  <td>593</td> </tr>\r
+ <tr>  <td>Colombia</td>  <td>12000</td>  <td>45660</td>  <td>49385</td>  <td>54920</td>  <td>62877</td> </tr>\r
+ <tr>  <td>Comoros</td>  <td>156</td>  <td>676</td>  <td>767</td>  <td>907</td>  <td>1226</td> </tr>\r
+ <tr>  <td>Congo</td>  <td>808</td>  <td>3683</td>  <td>4225</td>  <td>5094</td>  <td>6863</td> </tr>\r
+ <tr>  <td>Cook Islands</td>  <td>15</td>  <td>20</td>  <td>20</td>  <td>21</td>  <td>24</td> </tr>\r
+ <tr>  <td>Costa Rica</td>  <td>966</td>  <td>4579</td>  <td>4957</td>  <td>5521</td>  <td>6373</td> </tr>\r
+ <tr>  <td>Côte d'Ivoire</td>  <td>2505</td>  <td>21075</td>  <td>24210</td>  <td>29738</td>  <td>43373</td> </tr>\r
+ <tr>  <td>Croatia</td>  <td>3850</td>  <td>4416</td>  <td>4370</td>  <td>4254</td>  <td>3825</td> </tr>\r
+ <tr>  <td>Cuba</td>  <td>5920</td>  <td>11204</td>  <td>11213</td>  <td>11148</td>  <td>9725</td> </tr>\r
+ <tr>  <td>Cyprus</td>  <td>494</td>  <td>871</td>  <td>925</td>  <td>1014</td>  <td>1175</td> </tr>\r
+ <tr>  <td>Czech Republic</td>  <td>8925</td>  <td>10369</td>  <td>10510</td>  <td>10573</td>  <td>10294</td> </tr>\r
+ <tr>  <td>Dem. People's Rep. of Korea</td>  <td>9737</td>  <td>23906</td>  <td>24399</td>  <td>25128</td>  <td>24562</td> </tr>\r
+ <tr>  <td>Dem. Republic of the Congo</td>  <td>12184</td>  <td>66020</td>  <td>77419</td>  <td>98123</td>  <td>147512</td> </tr>\r
+ <tr>  <td>Denmark</td>  <td>4271</td>  <td>5470</td>  <td>5523</td>  <td>5590</td>  <td>5551</td> </tr>\r
+ <tr>  <td>Djibouti</td>  <td>62</td>  <td>864</td>  <td>953</td>  <td>1111</td>  <td>1469</td> </tr>\r
+ <tr>  <td>Dominica</td>  <td>51</td>  <td>67</td>  <td>67</td>  <td>68</td>  <td>66</td> </tr>\r
+ <tr>  <td>Dominican Republic</td>  <td>2427</td>  <td>10090</td>  <td>10867</td>  <td>11973</td>  <td>13441</td> </tr>\r
+ <tr>  <td>Ecuador</td>  <td>3387</td>  <td>13625</td>  <td>14596</td>  <td>16074</td>  <td>17989</td> </tr>\r
+ <tr>  <td>Egypt</td>  <td>21514</td>  <td>82999</td>  <td>91778</td>  <td>104970</td>  <td>129533</td> </tr>\r
+ <tr>  <td>El Salvador</td>  <td>2200</td>  <td>6163</td>  <td>6383</td>  <td>6895</td>  <td>7882</td> </tr>\r
+ <tr>  <td>Equatorial Guinea</td>  <td>226</td>  <td>676</td>  <td>781</td>  <td>971</td>  <td>1445</td> </tr>\r
+ <tr>  <td>Eritrea</td>  <td>1141</td>  <td>5073</td>  <td>6009</td>  <td>7404</td>  <td>10787</td> </tr>\r
+ <tr>  <td>Estonia</td>  <td>1101</td>  <td>1340</td>  <td>1337</td>  <td>1321</td>  <td>1233</td> </tr>\r
+ <tr>  <td>Ethiopia</td>  <td>18434</td>  <td>82825</td>  <td>96237</td>  <td>119822</td>  <td>173811</td> </tr>\r
+ <tr>  <td>Faeroe Islands</td>  <td>32</td>  <td>50</td>  <td>52</td>  <td>55</td>  <td>58</td> </tr>\r
+ <tr>  <td>Falkland Islands (Malvinas)</td>  <td>2</td>  <td>3</td>  <td>3</td>  <td>3</td>  <td>3</td> </tr>\r
+ <tr>  <td>Fiji</td>  <td>289</td>  <td>849</td>  <td>874</td>  <td>905</td>  <td>910</td> </tr>\r
+ <tr>  <td>Finland</td>  <td>4009</td>  <td>5326</td>  <td>5432</td>  <td>5533</td>  <td>5445</td> </tr>\r
+ <tr>  <td>France</td>  <td>41832</td>  <td>62343</td>  <td>63900</td>  <td>65769</td>  <td>67668</td> </tr>\r
+ <tr>  <td>French Guiana</td>  <td>25</td>  <td>226</td>  <td>261</td>  <td>323</td>  <td>462</td> </tr>\r
+ <tr>  <td>French Polynesia</td>  <td>61</td>  <td>269</td>  <td>289</td>  <td>318</td>  <td>354</td> </tr>\r
+ <tr>  <td>Gabon</td>  <td>469</td>  <td>1475</td>  <td>1639</td>  <td>1915</td>  <td>2471</td> </tr>\r
+ <tr>  <td>Gambia</td>  <td>258</td>  <td>1705</td>  <td>1985</td>  <td>2478</td>  <td>3763</td> </tr>\r
+ <tr>  <td>Georgia</td>  <td>3527</td>  <td>4260</td>  <td>4084</td>  <td>3888</td>  <td>3267</td> </tr>\r
+ <tr>  <td>Germany</td>  <td>68376</td>  <td>82167</td>  <td>81346</td>  <td>79258</td>  <td>70504</td> </tr>\r
+ <tr>  <td>Ghana</td>  <td>4981</td>  <td>23837</td>  <td>26925</td>  <td>32233</td>  <td>45213</td> </tr>\r
+ <tr>  <td>Gibraltar</td>  <td>20</td>  <td>31</td>  <td>31</td>  <td>32</td>  <td>30</td> </tr>\r
+ <tr>  <td>Greece</td>  <td>7566</td>  <td>11161</td>  <td>11261</td>  <td>11274</td>  <td>10939</td> </tr>\r
+ <tr>  <td>Greenland</td>  <td>23</td>  <td>57</td>  <td>57</td>  <td>56</td>  <td>50</td> </tr>\r
+ <tr>  <td>Grenada</td>  <td>77</td>  <td>104</td>  <td>107</td>  <td>109</td>  <td>97</td> </tr>\r
+ <tr>  <td>Guadeloupe</td>  <td>210</td>  <td>465</td>  <td>476</td>  <td>489</td>  <td>477</td> </tr>\r
+ <tr>  <td>Guam</td>  <td>60</td>  <td>178</td>  <td>191</td>  <td>211</td>  <td>242</td> </tr>\r
+ <tr>  <td>Guatemala</td>  <td>3146</td>  <td>14027</td>  <td>16227</td>  <td>19927</td>  <td>27480</td> </tr>\r
+ <tr>  <td>Guinea</td>  <td>2619</td>  <td>10069</td>  <td>11844</td>  <td>15158</td>  <td>23975</td> </tr>\r
+ <tr>  <td>Guinea-Bissau</td>  <td>518</td>  <td>1611</td>  <td>1848</td>  <td>2296</td>  <td>3555</td> </tr>\r
+ <tr>  <td>Guyana</td>  <td>423</td>  <td>762</td>  <td>754</td>  <td>732</td>  <td>558</td> </tr>\r
+ <tr>  <td>Haiti</td>  <td>3221</td>  <td>10033</td>  <td>10957</td>  <td>12476</td>  <td>15485</td> </tr>\r
+ <tr>  <td>Holy See</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Honduras</td>  <td>1487</td>  <td>7466</td>  <td>8386</td>  <td>9844</td>  <td>12402</td> </tr>\r
+ <tr>  <td>Hungary</td>  <td>9338</td>  <td>9993</td>  <td>9874</td>  <td>9647</td>  <td>8934</td> </tr>\r
+ <tr>  <td>Iceland</td>  <td>143</td>  <td>323</td>  <td>353</td>  <td>384</td>  <td>407</td> </tr>\r
+ <tr>  <td>India</td>  <td>371857</td>  <td>1198003</td>  <td>1294192</td>  <td>1431272</td>  <td>1613800</td> </tr>\r
+ <tr>  <td>Indonesia</td>  <td>77152</td>  <td>229965</td>  <td>244191</td>  <td>263287</td>  <td>288110</td> </tr>\r
+ <tr>  <td>Iran (Islamic Republic of)</td>  <td>16913</td>  <td>74196</td>  <td>79454</td>  <td>87134</td>  <td>96975</td> </tr>\r
+ <tr>  <td>Iraq</td>  <td>5719</td>  <td>30747</td>  <td>35884</td>  <td>44692</td>  <td>63995</td> </tr>\r
+ <tr>  <td>Ireland</td>  <td>2969</td>  <td>4515</td>  <td>4886</td>  <td>5370</td>  <td>6295</td> </tr>\r
+ <tr>  <td>Isle of Man</td>  <td>55</td>  <td>80</td>  <td>81</td>  <td>80</td>  <td>75</td> </tr>\r
+ <tr>  <td>Israel</td>  <td>1258</td>  <td>7170</td>  <td>7823</td>  <td>8769</td>  <td>10649</td> </tr>\r
+ <tr>  <td>Italy</td>  <td>46367</td>  <td>59870</td>  <td>60604</td>  <td>60018</td>  <td>57066</td> </tr>\r
+ <tr>  <td>Jamaica</td>  <td>1403</td>  <td>2719</td>  <td>2786</td>  <td>2866</td>  <td>2683</td> </tr>\r
+ <tr>  <td>Japan</td>  <td>82824</td>  <td>127156</td>  <td>125791</td>  <td>120793</td>  <td>101659</td> </tr>\r
+ <tr>  <td>Jordan</td>  <td>472</td>  <td>6316</td>  <td>6957</td>  <td>8088</td>  <td>10241</td> </tr>\r
+ <tr>  <td>Kazakhstan</td>  <td>6703</td>  <td>15637</td>  <td>16289</td>  <td>17025</td>  <td>17848</td> </tr>\r
+ <tr>  <td>Kenya</td>  <td>6077</td>  <td>39802</td>  <td>46433</td>  <td>57573</td>  <td>85410</td> </tr>\r
+ <tr>  <td>Kiribati</td>  <td>26</td>  <td>98</td>  <td>107</td>  <td>123</td>  <td>151</td> </tr>\r
+ <tr>  <td>Kuwait</td>  <td>152</td>  <td>2985</td>  <td>3378</td>  <td>3988</td>  <td>5240</td> </tr>\r
+ <tr>  <td>Kyrgyzstan</td>  <td>1740</td>  <td>5482</td>  <td>5877</td>  <td>6378</td>  <td>6882</td> </tr>\r
+ <tr>  <td>Lao People's Dem. Republic</td>  <td>1666</td>  <td>6320</td>  <td>7028</td>  <td>8273</td>  <td>10744</td> </tr>\r
+ <tr>  <td>Latvia</td>  <td>1949</td>  <td>2249</td>  <td>2197</td>  <td>2101</td>  <td>1854</td> </tr>\r
+ <tr>  <td>Lebanon</td>  <td>1443</td>  <td>4224</td>  <td>4426</td>  <td>4736</td>  <td>5033</td> </tr>\r
+ <tr>  <td>Lesotho</td>  <td>734</td>  <td>2067</td>  <td>2168</td>  <td>2306</td>  <td>2491</td> </tr>\r
+ <tr>  <td>Liberia</td>  <td>824</td>  <td>3955</td>  <td>4665</td>  <td>5858</td>  <td>8841</td> </tr>\r
+ <tr>  <td>Libyan Arab Jamahiriya</td>  <td>1029</td>  <td>6420</td>  <td>7158</td>  <td>8144</td>  <td>9819</td> </tr>\r
+ <tr>  <td>Liechtenstein</td>  <td>14</td>  <td>36</td>  <td>38</td>  <td>40</td>  <td>45</td> </tr>\r
+ <tr>  <td>Lithuania</td>  <td>2567</td>  <td>3287</td>  <td>3143</td>  <td>2985</td>  <td>2579</td> </tr>\r
+ <tr>  <td>Luxembourg</td>  <td>296</td>  <td>486</td>  <td>520</td>  <td>582</td>  <td>733</td> </tr>\r
+ <tr>  <td>Madagascar</td>  <td>4084</td>  <td>19625</td>  <td>22853</td>  <td>28595</td>  <td>42693</td> </tr>\r
+ <tr>  <td>Malawi</td>  <td>2881</td>  <td>15263</td>  <td>17998</td>  <td>23194</td>  <td>36575</td> </tr>\r
+ <tr>  <td>Malaysia</td>  <td>6110</td>  <td>27468</td>  <td>30041</td>  <td>33770</td>  <td>39664</td> </tr>\r
+ <tr>  <td>Maldives</td>  <td>82</td>  <td>309</td>  <td>338</td>  <td>384</td>  <td>455</td> </tr>\r
+ <tr>  <td>Mali</td>  <td>4268</td>  <td>13010</td>  <td>14993</td>  <td>18603</td>  <td>28260</td> </tr>\r
+ <tr>  <td>Malta</td>  <td>312</td>  <td>409</td>  <td>417</td>  <td>426</td>  <td>413</td> </tr>\r
+ <tr>  <td>Marshall Islands</td>  <td>13</td>  <td>62</td>  <td>70</td>  <td>79</td>  <td>92</td> </tr>\r
+ <tr>  <td>Martinique</td>  <td>222</td>  <td>405</td>  <td>411</td>  <td>418</td>  <td>393</td> </tr>\r
+ <tr>  <td>Mauritania</td>  <td>651</td>  <td>3291</td>  <td>3732</td>  <td>4443</td>  <td>6061</td> </tr>\r
+ <tr>  <td>Mauritius</td>  <td>493</td>  <td>1288</td>  <td>1337</td>  <td>1400</td>  <td>1426</td> </tr>\r
+ <tr>  <td>Mayotte</td>  <td>15</td>  <td>194</td>  <td>224</td>  <td>277</td>  <td>386</td> </tr>\r
+ <tr>  <td>Mexico</td>  <td>27741</td>  <td>109610</td>  <td>115528</td>  <td>123366</td>  <td>128964</td> </tr>\r
+ <tr>  <td>Micronesia (Fed. States of)</td>  <td>32</td>  <td>111</td>  <td>114</td>  <td>122</td>  <td>128</td> </tr>\r
+ <tr>  <td>Moldova (Republic of)</td>  <td>2341</td>  <td>3604</td>  <td>3462</td>  <td>3291</td>  <td>2734</td> </tr>\r
+ <tr>  <td>Monaco</td>  <td>20</td>  <td>33</td>  <td>33</td>  <td>35</td>  <td>38</td> </tr>\r
+ <tr>  <td>Mongolia</td>  <td>761</td>  <td>2671</td>  <td>2855</td>  <td>3134</td>  <td>3446</td> </tr>\r
+ <tr>  <td>Montenegro</td>  <td>399</td>  <td>624</td>  <td>627</td>  <td>633</td>  <td>618</td> </tr>\r
+ <tr>  <td>Montserrat</td>  <td>14</td>  <td>6</td>  <td>6</td>  <td>7</td>  <td>7</td> </tr>\r
+ <tr>  <td>Morocco</td>  <td>8953</td>  <td>31993</td>  <td>34330</td>  <td>37865</td>  <td>42583</td> </tr>\r
+ <tr>  <td>Mozambique</td>  <td>6442</td>  <td>22894</td>  <td>25957</td>  <td>31190</td>  <td>44148</td> </tr>\r
+ <tr>  <td>Myanmar</td>  <td>17158</td>  <td>50020</td>  <td>53087</td>  <td>57585</td>  <td>63373</td> </tr>\r
+ <tr>  <td>Namibia</td>  <td>485</td>  <td>2171</td>  <td>2412</td>  <td>2810</td>  <td>3588</td> </tr>\r
+ <tr>  <td>Nauru</td>  <td>3</td>  <td>10</td>  <td>11</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Nepal</td>  <td>8126</td>  <td>29331</td>  <td>32503</td>  <td>38031</td>  <td>49028</td> </tr>\r
+ <tr>  <td>Netherlands</td>  <td>10114</td>  <td>16592</td>  <td>16915</td>  <td>17348</td>  <td>17399</td> </tr>\r
+ <tr>  <td>Netherlands Antilles</td>  <td>112</td>  <td>198</td>  <td>207</td>  <td>210</td>  <td>192</td> </tr>\r
+ <tr>  <td>New Caledonia</td>  <td>65</td>  <td>250</td>  <td>271</td>  <td>304</td>  <td>362</td> </tr>\r
+ <tr>  <td>New Zealand</td>  <td>1908</td>  <td>4266</td>  <td>4492</td>  <td>4831</td>  <td>5349</td> </tr>\r
+ <tr>  <td>Nicaragua</td>  <td>1295</td>  <td>5743</td>  <td>6265</td>  <td>7058</td>  <td>8143</td> </tr>\r
+ <tr>  <td>Niger</td>  <td>2462</td>  <td>15290</td>  <td>19150</td>  <td>27388</td>  <td>58216</td> </tr>\r
+ <tr>  <td>Nigeria</td>  <td>36680</td>  <td>154729</td>  <td>175928</td>  <td>210057</td>  <td>289083</td> </tr>\r
+ <tr>  <td>Niue</td>  <td>5</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Northern Mariana Islands</td>  <td>7</td>  <td>87</td>  <td>96</td>  <td>111</td>  <td>151</td> </tr>\r
+ <tr>  <td>Norway</td>  <td>3265</td>  <td>4812</td>  <td>5036</td>  <td>5365</td>  <td>5947</td> </tr>\r
+ <tr>  <td>Occupied Palestinian Territory</td>  <td>1005</td>  <td>4277</td>  <td>5090</td>  <td>6553</td>  <td>10265</td> </tr>\r
+ <tr>  <td>Oman</td>  <td>456</td>  <td>2845</td>  <td>3198</td>  <td>3782</td>  <td>4878</td> </tr>\r
+ <tr>  <td>Pakistan</td>  <td>41177</td>  <td>180808</td>  <td>205504</td>  <td>246286</td>  <td>335195</td> </tr>\r
+ <tr>  <td>Palau</td>  <td>7</td>  <td>20</td>  <td>21</td>  <td>23</td>  <td>26</td> </tr>\r
+ <tr>  <td>Panama</td>  <td>860</td>  <td>3454</td>  <td>3773</td>  <td>4267</td>  <td>5092</td> </tr>\r
+ <tr>  <td>Papua New Guinea</td>  <td>1798</td>  <td>6732</td>  <td>7678</td>  <td>9265</td>  <td>12871</td> </tr>\r
+ <tr>  <td>Paraguay</td>  <td>1473</td>  <td>6349</td>  <td>7007</td>  <td>8026</td>  <td>9867</td> </tr>\r
+ <tr>  <td>Peru</td>  <td>7632</td>  <td>29165</td>  <td>31197</td>  <td>34528</td>  <td>39776</td> </tr>\r
+ <tr>  <td>Philippines</td>  <td>19996</td>  <td>91983</td>  <td>101734</td>  <td>117270</td>  <td>146156</td> </tr>\r
+ <tr>  <td>Pitcairn</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td> </tr>\r
+ <tr>  <td>Poland</td>  <td>24824</td>  <td>38074</td>  <td>37788</td>  <td>36964</td>  <td>32013</td> </tr>\r
+ <tr>  <td>Portugal</td>  <td>8405</td>  <td>10707</td>  <td>10787</td>  <td>10706</td>  <td>10015</td> </tr>\r
+ <tr>  <td>Puerto Rico</td>  <td>2218</td>  <td>3982</td>  <td>4074</td>  <td>4176</td>  <td>4103</td> </tr>\r
+ <tr>  <td>Qatar</td>  <td>25</td>  <td>1409</td>  <td>1630</td>  <td>1848</td>  <td>2316</td> </tr>\r
+ <tr>  <td>Republic of Korea</td>  <td>19211</td>  <td>48333</td>  <td>49153</td>  <td>49484</td>  <td>44077</td> </tr>\r
+ <tr>  <td>Réunion</td>  <td>248</td>  <td>827</td>  <td>886</td>  <td>973</td>  <td>1096</td> </tr>\r
+ <tr>  <td>Romania</td>  <td>16311</td>  <td>21275</td>  <td>20787</td>  <td>19961</td>  <td>17279</td> </tr>\r
+ <tr>  <td>Russian Federation</td>  <td>102702</td>  <td>140874</td>  <td>137983</td>  <td>132345</td>  <td>116097</td> </tr>\r
+ <tr>  <td>Rwanda</td>  <td>2162</td>  <td>9998</td>  <td>11743</td>  <td>14676</td>  <td>22082</td> </tr>\r
+ <tr>  <td>Saint Helena</td>  <td>5</td>  <td>4</td>  <td>4</td>  <td>5</td>  <td>5</td> </tr>\r
+ <tr>  <td>Saint Kitts and Nevis</td>  <td>46</td>  <td>52</td>  <td>56</td>  <td>61</td>  <td>69</td> </tr>\r
+ <tr>  <td>Saint Lucia</td>  <td>83</td>  <td>172</td>  <td>182</td>  <td>198</td>  <td>217</td> </tr>\r
+ <tr>  <td>Saint Pierre and Miquelon</td>  <td>5</td>  <td>6</td>  <td>6</td>  <td>6</td>  <td>6</td> </tr>\r
+ <tr>  <td>St. Vincent and the Grenadines</td>  <td>67</td>  <td>109</td>  <td>110</td>  <td>111</td>  <td>119</td> </tr>\r
+ <tr>  <td>Samoa</td>  <td>82</td>  <td>179</td>  <td>181</td>  <td>188</td>  <td>192</td> </tr>\r
+ <tr>  <td>San Marino</td>  <td>13</td>  <td>31</td>  <td>32</td>  <td>33</td>  <td>33</td> </tr>\r
+ <tr>  <td>Sao Tome and Principe</td>  <td>60</td>  <td>163</td>  <td>180</td>  <td>216</td>  <td>296</td> </tr>\r
+ <tr>  <td>Saudi Arabia</td>  <td>3201</td>  <td>25721</td>  <td>28933</td>  <td>34176</td>  <td>43658</td> </tr>\r
+ <tr>  <td>Senegal</td>  <td>2416</td>  <td>12534</td>  <td>14526</td>  <td>17861</td>  <td>26102</td> </tr>\r
+ <tr>  <td>Serbia</td>  <td>6732</td>  <td>9850</td>  <td>9828</td>  <td>9720</td>  <td>9193</td> </tr>\r
+ <tr>  <td>Seychelles</td>  <td>36</td>  <td>84</td>  <td>86</td>  <td>91</td>  <td>97</td> </tr>\r
+ <tr>  <td>Sierra Leone</td>  <td>1944</td>  <td>5696</td>  <td>6557</td>  <td>8112</td>  <td>12446</td> </tr>\r
+ <tr>  <td>Singapore</td>  <td>1022</td>  <td>4737</td>  <td>5059</td>  <td>5362</td>  <td>5221</td> </tr>\r
+ <tr>  <td>Slovakia</td>  <td>3463</td>  <td>5406</td>  <td>5437</td>  <td>5413</td>  <td>4917</td> </tr>\r
+ <tr>  <td>Slovenia</td>  <td>1473</td>  <td>2020</td>  <td>2044</td>  <td>2050</td>  <td>1954</td> </tr>\r
+ <tr>  <td>Solomon Islands</td>  <td>90</td>  <td>523</td>  <td>599</td>  <td>725</td>  <td>1007</td> </tr>\r
+ <tr>  <td>Somalia</td>  <td>2264</td>  <td>9133</td>  <td>10731</td>  <td>13922</td>  <td>23522</td> </tr>\r
+ <tr>  <td>South Africa</td>  <td>13683</td>  <td>50110</td>  <td>51684</td>  <td>53766</td>  <td>56802</td> </tr>\r
+ <tr>  <td>Spain</td>  <td>28009</td>  <td>44904</td>  <td>47203</td>  <td>49265</td>  <td>51260</td> </tr>\r
+ <tr>  <td>Sri Lanka</td>  <td>8241</td>  <td>20238</td>  <td>21167</td>  <td>22033</td>  <td>21705</td> </tr>\r
+ <tr>  <td>Sudan</td>  <td>9190</td>  <td>42272</td>  <td>47730</td>  <td>56688</td>  <td>75884</td> </tr>\r
+ <tr>  <td>Suriname</td>  <td>215</td>  <td>520</td>  <td>547</td>  <td>586</td>  <td>619</td> </tr>\r
+ <tr>  <td>Swaziland</td>  <td>273</td>  <td>1185</td>  <td>1287</td>  <td>1455</td>  <td>1749</td> </tr>\r
+ <tr>  <td>Sweden</td>  <td>7014</td>  <td>9249</td>  <td>9498</td>  <td>9915</td>  <td>10571</td> </tr>\r
+ <tr>  <td>Switzerland</td>  <td>4693</td>  <td>7568</td>  <td>7736</td>  <td>8020</td>  <td>8514</td> </tr>\r
+ <tr>  <td>Syrian Arab Republic</td>  <td>3536</td>  <td>21906</td>  <td>24494</td>  <td>28592</td>  <td>36911</td> </tr>\r
+ <tr>  <td>Tajikistan</td>  <td>1532</td>  <td>6952</td>  <td>7761</td>  <td>9075</td>  <td>11111</td> </tr>\r
+ <tr>  <td>TFYR Macedonia</td>  <td>1230</td>  <td>2042</td>  <td>2045</td>  <td>2037</td>  <td>1857</td> </tr>\r
+ <tr>  <td>Thailand</td>  <td>20607</td>  <td>67764</td>  <td>69939</td>  <td>72628</td>  <td>73361</td> </tr>\r
+ <tr>  <td>Timor-Leste</td>  <td>433</td>  <td>1134</td>  <td>1385</td>  <td>1869</td>  <td>3217</td> </tr>\r
+ <tr>  <td>Togo</td>  <td>1329</td>  <td>6619</td>  <td>7607</td>  <td>9282</td>  <td>13196</td> </tr>\r
+ <tr>  <td>Tokelau</td>  <td>2</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Tonga</td>  <td>47</td>  <td>104</td>  <td>105</td>  <td>112</td>  <td>123</td> </tr>\r
+ <tr>  <td>Trinidad and Tobago</td>  <td>636</td>  <td>1339</td>  <td>1368</td>  <td>1388</td>  <td>1278</td> </tr>\r
+ <tr>  <td>Tunisia</td>  <td>3530</td>  <td>10272</td>  <td>10884</td>  <td>11797</td>  <td>12711</td> </tr>\r
+ <tr>  <td>Turkey</td>  <td>21484</td>  <td>74816</td>  <td>79966</td>  <td>87364</td>  <td>97389</td> </tr>\r
+ <tr>  <td>Turkmenistan</td>  <td>1211</td>  <td>5110</td>  <td>5509</td>  <td>6072</td>  <td>6796</td> </tr>\r
+ <tr>  <td>Turks and Caicos Islands</td>  <td>5</td>  <td>33</td>  <td>35</td>  <td>38</td>  <td>40</td> </tr>\r
+ <tr>  <td>Tuvalu</td>  <td>5</td>  <td>10</td>  <td>10</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Uganda</td>  <td>5158</td>  <td>32710</td>  <td>39710</td>  <td>53406</td>  <td>91271</td> </tr>\r
+ <tr>  <td>Ukraine</td>  <td>37298</td>  <td>45708</td>  <td>44165</td>  <td>41617</td>  <td>35026</td> </tr>\r
+ <tr>  <td>United Arab Emirates</td>  <td>70</td>  <td>4599</td>  <td>5193</td>  <td>6109</td>  <td>8253</td> </tr>\r
+ <tr>  <td>United Kingdom</td>  <td>50616</td>  <td>61565</td>  <td>63528</td>  <td>66601</td>  <td>72365</td> </tr>\r
+ <tr>  <td>United Republic of Tanzania</td>  <td>7650</td>  <td>43739</td>  <td>52109</td>  <td>67394</td>  <td>109450</td> </tr>\r
+ <tr>  <td>United States of America</td>  <td>157813</td>  <td>314659</td>  <td>332334</td>  <td>358735</td>  <td>403932</td> </tr>\r
+ <tr>  <td>United States Virgin Islands</td>  <td>27</td>  <td>110</td>  <td>108</td>  <td>103</td>  <td>75</td> </tr>\r
+ <tr>  <td>Uruguay</td>  <td>2239</td>  <td>3361</td>  <td>3430</td>  <td>3546</td>  <td>3637</td> </tr>\r
+ <tr>  <td>Uzbekistan</td>  <td>6314</td>  <td>27488</td>  <td>29456</td>  <td>32715</td>  <td>36439</td> </tr>\r
+ <tr>  <td>Vanuatu</td>  <td>48</td>  <td>240</td>  <td>276</td>  <td>338</td>  <td>482</td> </tr>\r
+ <tr>  <td>Venezuela (Bolivarian Republic of)</td>  <td>5094</td>  <td>28583</td>  <td>31292</td>  <td>35370</td>  <td>42042</td> </tr>\r
+ <tr>  <td>Viet Nam</td>  <td>27367</td>  <td>88069</td>  <td>93647</td>  <td>102054</td>  <td>111666</td> </tr>\r
+ <tr>  <td>Wallis and Futuna Islands</td>  <td>7</td>  <td>15</td>  <td>16</td>  <td>17</td>  <td>17</td> </tr>\r
+ <tr>  <td>Western Sahara</td>  <td>14</td>  <td>513</td>  <td>625</td>  <td>775</td>  <td>938</td> </tr>\r
+ <tr>  <td>Yemen</td>  <td>4316</td>  <td>23580</td>  <td>27819</td>  <td>35509</td>  <td>53689</td> </tr>\r
+ <tr>  <td>Zambia</td>  <td>2340</td>  <td>12935</td>  <td>14980</td>  <td>18890</td>  <td>28957</td> </tr>\r
+ <tr>  <td>Zimbabwe</td>  <td>2747</td>  <td>12523</td>  <td>14029</td>  <td>16780</td>  <td>22178</td> </tr>\r

 </tbody>\r
 </table>\r
 \r
 </tbody>\r
 </table>\r
 \r


@@ -2058,7 +438,11 @@ Department of Economic and Social Affairs of the United Nations Secretariat</a>
 \r
 <h2>Rico Calendar</h2>\r
 \r
 \r
 <h2>Rico Calendar</h2>\r
 \r

-<div id="ricoCal"></div>\r
+<table border='0' cellpadding='0' cellspacing='0'>\r
+<tr>\r
+<td id="ricoCal" style='position:relative;'></td>\r
+</tr>\r
+</table>\r

 \r
 </body>\r
 </html>\r
 \r
 </body>\r
 </html>\r

diff --git a/examples/dotnet/menu.aspx b/examples/dotnet/menu.aspx
index dc9c451..75a4a58 100644 (file)
--- a/examples/dotnet/menu.aspx
+++ b/examples/dotnet/menu.aspx
@@ -12,8 +12,6 @@
 <script src="../menu.js" type="text/javascript"></script>\r
 <link href="../menu.css" type="text/css" rel="stylesheet">\r
 \r
 <script src="../menu.js" type="text/javascript"></script>\r
 <link href="../menu.css" type="text/css" rel="stylesheet">\r
 \r

-<style type="text/css">\r
-</style>\r

 <!--[if lt IE 7]>\r
   <style type="text/css">\r
 ul li {
 <!--[if lt IE 7]>\r
   <style type="text/css">\r
 ul li {

diff --git a/examples/dotnet/widgets.aspx b/examples/dotnet/widgets.aspx
index 5aa4266..0fae9a7 100644 (file)
--- a/examples/dotnet/widgets.aspx
+++ b/examples/dotnet/widgets.aspx
@@ -27,7 +27,7 @@ Rico.onLoad( function() {
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r

-  var cal=new Rico.CalendarControl("ricoCal",{position:'relative'});\r
+  var cal=new Rico.CalendarControl("ricoCal",{position:'auto'});\r

   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r
   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r


@@ -430,7 +430,11 @@ Department of Economic and Social Affairs of the United Nations Secretariat</a>
 \r
 <h2>Rico Calendar</h2>\r
 \r
 \r
 <h2>Rico Calendar</h2>\r
 \r

-<div id="ricoCal"></div>\r
+<table border='0' cellpadding='0' cellspacing='0'>\r
+<tr>\r
+<td id="ricoCal" style='position:relative;'></td>\r
+</tr>\r
+</table>\r

 \r
 </body>\r
 </html>\r
 \r
 </body>\r
 </html>\r

diff --git a/examples/html/LoadRicoClient.js b/examples/html/LoadRicoClient.js
index 9525adb..70246f4 100644 (file)
--- a/examples/html/LoadRicoClient.js
+++ b/examples/html/LoadRicoClient.js
@@ -11,7 +11,7 @@ Rico_CONFIG = {
   initialize: function(checkQueryString) {\r
     this.transDir=this.jsDir;\r
     var theme,lib,aParm,log;\r
   initialize: function(checkQueryString) {\r
     this.transDir=this.jsDir;\r
     var theme,lib,aParm,log;\r

-    if (checkQueryString) {\r
+    if (checkQueryString && location.search.length > 1) {\r

       var s=location.search;\r
       if (s.charAt(0)=='?') s=s.substr(1);\r
       var aSearch=s.split(/&/);\r
       var s=location.search;\r
       if (s.charAt(0)=='?') s=s.substr(1);\r
       var aSearch=s.split(/&/);\r


@@ -47,9 +47,12 @@ Rico_CONFIG = {
     this.requireRicoCSS("rico");\r
     \r
     // load locale based on browser language (not accept-language)\r
     this.requireRicoCSS("rico");\r
     \r
     // load locale based on browser language (not accept-language)\r

-    var lang2=window.navigator.language.substr(0,2);\r
-    var SupportedLangs = "de,es,fr,it,ja,ko,pt,ru,uk,zh";\r
-    if (SupportedLangs.indexOf(lang2) >= 0) this.requireRicoJS("Locale_"+lang2);\r
+    var lang=window.navigator.language || window.navigator.userLanguage;\r
+    if (lang) {\r
+      var lang2=lang.substr(0,2);\r
+      var SupportedLangs = "de,es,fr,it,ja,ko,pt,ru,uk,zh";\r
+      if (SupportedLangs.indexOf(lang2) >= 0) this.requireRicoJS("Locale_"+lang2);\r
+    }\r

   },\r
 \r
   // set theme\r
   },\r
 \r
   // set theme\r

diff --git a/examples/html/popups.html b/examples/html/popups.html
index 3fa2e11..2401992 100644 (file)
--- a/examples/html/popups.html
+++ b/examples/html/popups.html
@@ -60,7 +60,7 @@ Base Library:
 document.write(Rico.Lib+' '+Rico.LibVersion);\r
 </script>\r
 <hr>\r
 document.write(Rico.Lib+' '+Rico.LibVersion);\r
 </script>\r
 <hr>\r

-<p>This example displays an dialog window, then allows you to change the window contents - demonstrating how the window automatically resizes.\r
+<p>This example displays a dialog window, then allows you to change the window contents - demonstrating how the window automatically resizes.\r

 </p>\r
 </div>\r
 \r
 </p>\r
 </div>\r
 \r

diff --git a/examples/php/widgets.php b/examples/php/widgets.php
index 8264817..cc53522 100644 (file)
--- a/examples/php/widgets.php
+++ b/examples/php/widgets.php
@@ -25,7 +25,7 @@ Rico.onLoad( function() {
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r
   ex1.menu=new Rico.GridMenu();\r
   new Rico.Accordion( 'accExample', {panelHeight:160});\r
   new Rico.TabbedPanel( 'tabsExample', {panelHeight:160});\r

-  var cal=new Rico.CalendarControl("ricoCal",{position:'relative'});\r
+  var cal=new Rico.CalendarControl("ricoCal",{position:'auto'});\r

   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r
   cal.atLoad();\r
   cal.selectNow();\r
   cal.openPopup();\r


@@ -2058,7 +2058,11 @@ Department of Economic and Social Affairs of the United Nations Secretariat</a>
 \r
 <h2>Rico Calendar</h2>\r
 \r
 \r
 <h2>Rico Calendar</h2>\r
 \r

-<div id="ricoCal"></div>\r
+<table border='0' cellpadding='0' cellspacing='0'>\r
+<tr>\r
+<td id="ricoCal" style='position:relative;'></td>\r
+</tr>\r
+</table>\r

 \r
 </body>\r
 </html>\r
 \r
 </body>\r
 </html>\r

diff --git a/minsrc/ricoCalendar.js b/minsrc/ricoCalendar.js
index 64b099a..28e4bce 100644 (file)
--- a/minsrc/ricoCalendar.js
+++ b/minsrc/ricoCalendar.js
@@ -95,9 +95,15 @@ Rico.CalendarControl.prototype = {
 
   atLoad : function() {
     Rico.log('Calendar#atLoad: '+this.id);
 
   atLoad : function() {
     Rico.log('Calendar#atLoad: '+this.id);

-    this.createContainer();
-    this.container.id=this.id;
-    Rico.addClass(this.container, Rico.theme.calendar || 'ricoCalContainer');
+    var div=Rico.$(this.id);
+    if (div) {
+      this.setDiv(div);
+    } else {
+      this.createContainer();
+      this.container.id=this.id;
+    }
+    Rico.addClass(this.content, Rico.theme.calendar || 'ricoCalContainer');
+    this.content.style.display='block';  // override jquery ui

 
     this.maintab=document.createElement("table");
     this.maintab.cellSpacing=2;
 
     this.maintab=document.createElement("table");
     this.maintab.cellSpacing=2;


@@ -108,7 +114,7 @@ Rico.CalendarControl.prototype = {
     if (Rico.theme.calendarTable) Rico.addClass(this.maintab,Rico.theme.calendarTable)
     this.tbody=Rico.getTBody(this.maintab);
 
     if (Rico.theme.calendarTable) Rico.addClass(this.maintab,Rico.theme.calendarTable)
     this.tbody=Rico.getTBody(this.maintab);
 

-    var r,c,d,i,j,img,dow,a,s,tab;
+    var r,c,i,j,img,dow,a,s,tab;

     this.colStart=this.options.showWeekNumber ? 1 : 0;
     for (i=0; i<7; i++) {
       r=this.tbody.insertRow(-1);
     this.colStart=this.options.showWeekNumber ? 1 : 0;
     for (i=0; i<7; i++) {
       r=this.tbody.insertRow(-1);


@@ -132,20 +138,17 @@ Rico.CalendarControl.prototype = {
       this.styles[i]='ricoCal'+dow;
     }
     
       this.styles[i]='ricoCal'+dow;
     }
     

-    // table header (navigation controls)
-    this.thead=this.maintab.createTHead();
-    r=this.thead.insertRow(-1);
-    c=r.appendChild(document.createElement("th"));
-    c.colSpan=7+this.colStart;
-    d=c.appendChild(document.createElement("div"));
-    //d.style.padding='3px';
-    d.className=Rico.theme.calendarHeading || 'RicoCalHeading';
-    
-    d.appendChild(this._createTitleSection('Month'));
-    d.appendChild(this._createTitleSection('Year'));
-    new Rico.HoverSet(d.getElementsByTagName('a'));
+    // Navigation controls
+    this.heading=this.content.appendChild(document.createElement("div"));
+    this.heading.className='RicoCalHeading';
+    if (Rico.theme.calendarHeading) Rico.addClass(this.heading,Rico.theme.calendarHeading)
+    var d2=this.heading.appendChild(document.createElement("div"));
+    d2.className='RicoCalHeadingInner';
+    d2.appendChild(this._createTitleSection('Month'));
+    d2.appendChild(this._createTitleSection('Year'));
+    new Rico.HoverSet(this.heading.getElementsByTagName('a'));

     new Rico.HoverSet(this.tbody.getElementsByTagName('td'),{ hoverNodes: function(e) { return e.innerHTML.match(/^\d+$/) ? [e] : []; } });
     new Rico.HoverSet(this.tbody.getElementsByTagName('td'),{ hoverNodes: function(e) { return e.innerHTML.match(/^\d+$/) ? [e] : []; } });

-    d.appendChild(Rico.closeButton(Rico.eventHandle(this,'close')));
+    if (this.position == 'absolute') this.heading.appendChild(Rico.closeButton(Rico.eventHandle(this,'close')));

 
     // table footer (today)
     if (this.options.showToday) {
 
     // table footer (today)
     if (this.options.showToday) {


@@ -157,11 +160,9 @@ Rico.CalendarControl.prototype = {
       Rico.eventBind(this.todayCell,"click", Rico.eventHandle(this,'selectNow'), false);
     }
     this.content.appendChild(this.maintab);
       Rico.eventBind(this.todayCell,"click", Rico.eventHandle(this,'selectNow'), false);
     }
     this.content.appendChild(this.maintab);

-    var ie6=Rico.isIE && Rico.ieVersion < 7;
-    var selectOptions={shadow: !ie6};

     
     // month selector
     
     // month selector

-    this.monthPopup=new Rico.Popup(document.createElement("div"),selectOptions);
+    this.monthPopup=new Rico.Popup(document.createElement("div"));

     this.monthPopup.closePopup();
     tab=document.createElement("table");
     tab.className='ricoCalMenu';
     this.monthPopup.closePopup();
     tab=document.createElement("table");
     tab.className='ricoCalMenu';


@@ -185,10 +186,10 @@ Rico.CalendarControl.prototype = {
     }
     new Rico.HoverSet(tab.getElementsByTagName('a'));
     this.monthPopup.content.appendChild(tab);
     }
     new Rico.HoverSet(tab.getElementsByTagName('a'));
     this.monthPopup.content.appendChild(tab);

-    this.content.appendChild(this.monthPopup.container);
+    this.container.appendChild(this.monthPopup.container);

     
     // year selector
     
     // year selector

-    this.yearPopup=new Rico.Popup(document.createElement("div"),selectOptions);
+    this.yearPopup=new Rico.Popup(document.createElement("div"));

     this.yearPopup.closePopup();
     this.yearPopup.content.className='ricoCalYearPrompt';
     if (Rico.theme.calendarPopdown) Rico.addClass(this.yearPopup.content,Rico.theme.calendarPopdown);
     this.yearPopup.closePopup();
     this.yearPopup.content.className='ricoCalYearPrompt';
     if (Rico.theme.calendarPopdown) Rico.addClass(this.yearPopup.content,Rico.theme.calendarPopdown);


@@ -201,12 +202,13 @@ Rico.CalendarControl.prototype = {
     r=tab.insertRow(-1);
     this.yearLabel=r.insertCell(-1);
     this.yearLabel.colSpan=3;
     r=tab.insertRow(-1);
     this.yearLabel=r.insertCell(-1);
     this.yearLabel.colSpan=3;

+    this.yearLabel.innerHTML=Rico.getPhraseById("calYearRange",this.options.minDate.getFullYear(),this.options.maxDate.getFullYear());

     r=tab.insertRow(-1);
     c=r.insertCell(-1);
     this.yearInput=c.appendChild(document.createElement("input"));
     this.yearInput.maxlength=4;
     this.yearInput.size=4;
     r=tab.insertRow(-1);
     c=r.insertCell(-1);
     this.yearInput=c.appendChild(document.createElement("input"));
     this.yearInput.maxlength=4;
     this.yearInput.size=4;

-    Rico.eventBind(this.yearInput,"keypress", Rico.eventHandle(this,'yearKey'), false);
+    Rico.eventBind(this.yearInput,"keyup", Rico.eventHandle(this,'yearKey'), false);

     c=r.insertCell(-1);
     var a=Rico.floatButton('Checkmark', Rico.eventHandle(this,'processPopUpYear'));
     Rico.setStyle(a.firstChild,{ margin:"0px", padding:"0px", border:"none" });
     c=r.insertCell(-1);
     var a=Rico.floatButton('Checkmark', Rico.eventHandle(this,'processPopUpYear'));
     Rico.setStyle(a.firstChild,{ margin:"0px", padding:"0px", border:"none" });


@@ -216,9 +218,10 @@ Rico.CalendarControl.prototype = {
     Rico.setStyle(a.firstChild,{ margin:"0px", padding:"0px", border:"none" });
     c.appendChild(a);
     this.yearPopup.content.appendChild(tab);
     Rico.setStyle(a.firstChild,{ margin:"0px", padding:"0px", border:"none" });
     c.appendChild(a);
     this.yearPopup.content.appendChild(tab);

-    this.content.appendChild(this.yearPopup.container);
-
-    //this.yearLabel.className='ricoCalYearPromptText';
+    this.container.appendChild(this.yearPopup.container);
+    this.yearPopup.container.style.left='';
+    this.yearPopup.container.style.right='5px';
+    this.yearPopup.container.style.zIndex=10;

 
     // fix anchors so they work in IE6
     a=this.content.getElementsByTagName('a');
 
     // fix anchors so they work in IE6
     a=this.content.getElementsByTagName('a');


@@ -234,6 +237,7 @@ Rico.CalendarControl.prototype = {
   _createTitleSection : function(section) {
     var s=document.createElement("span");
     s.className='RicoCal'+section+'Heading';
   _createTitleSection : function(section) {
     var s=document.createElement("span");
     s.className='RicoCal'+section+'Heading';

+    if (Rico.theme.calendarSubheading) Rico.addClass(s,Rico.theme.calendarSubheading);

 
     var a=s.appendChild(document.createElement("a"));
     a.className='Rico_leftArrow';
 
     var a=s.appendChild(document.createElement("a"));
     a.className='Rico_leftArrow';


@@ -316,13 +320,19 @@ Rico.CalendarControl.prototype = {
   },
 
   popUpMonth : function(e) {
   },
 
   popUpMonth : function(e) {

+    Rico.eventStop(e);

     if (this.monthPopup.visible()) {
       this.popDownMonth();
       return;
     }
     this.popDownYear();
     if (this.monthPopup.visible()) {
       this.popDownMonth();
       return;
     }
     this.popDownYear();

-    this.monthPopup.openPopup(this.titleMonth.parentNode.offsetLeft, this.thead.offsetHeight+2);
-    Rico.eventStop(e);
+    if (Rico.isIE && Rico.ieVersion < 7) {
+      // fix position absolute inside container without hasLayout
+      this.monthPopup.openPopup(null, this.heading.offsetHeight+2);
+      this.monthPopup.container.style.left='';
+    } else {
+      this.monthPopup.openPopup(3, this.heading.offsetHeight+2);
+    }

     return false;
   },
 
     return false;
   },
 


@@ -339,17 +349,16 @@ Rico.CalendarControl.prototype = {
  * Prompt for year
  */
   popUpYear : function(e) {
  * Prompt for year
  */
   popUpYear : function(e) {

+    Rico.eventStop(e);

     if (this.yearPopup.visible()) {
       this.popDownYear();
       return;
     }
     this.popDownMonth();
     if (this.yearPopup.visible()) {
       this.popDownYear();
       return;
     }
     this.popDownMonth();

-    this.yearPopup.openPopup(90, this.thead.offsetHeight+2);
-    this.yearLabel.innerHTML=Rico.getPhraseById("calYearRange",this.options.minDate.getFullYear(),this.options.maxDate.getFullYear());
+    this.yearPopup.openPopup(null, this.heading.offsetHeight+2);

     this.yearInput.disabled=false;
     this.yearInput.value='';   // this.yearSelected
     this.yearInput.focus();
     this.yearInput.disabled=false;
     this.yearInput.value='';   // this.yearSelected
     this.yearInput.focus();

-    Rico.eventStop(e);

     return false;
   },
   
     return false;
   },
   

diff --git a/minsrc/ricoGridCommon.js b/minsrc/ricoGridCommon.js
index e790692..2ec1975 100644 (file)
--- a/minsrc/ricoGridCommon.js
+++ b/minsrc/ricoGridCommon.js
@@ -214,7 +214,7 @@ Rico.GridCommon = {
   createDivs: function() {
     Rico.log("createDivs start");
     this.outerDiv   = this.createDiv("outer");
   createDivs: function() {
     Rico.log("createDivs start");
     this.outerDiv   = this.createDiv("outer");

-    if (Rico.theme.widget) Rico.addClass(this.outerDiv,Rico.theme.widget);
+    if (Rico.theme.gridContainer) Rico.addClass(this.outerDiv,Rico.theme.gridContainer);

     if (this.outerDiv.firstChild && this.outerDiv.firstChild.tagName && this.outerDiv.firstChild.tagName.toUpperCase()=='TABLE') {
       this.structTab=this.outerDiv.firstChild;
       this.structTabLeft=this.structTab.rows[0].cells[0];
     if (this.outerDiv.firstChild && this.outerDiv.firstChild.tagName && this.outerDiv.firstChild.tagName.toUpperCase()=='TABLE') {
       this.structTab=this.outerDiv.firstChild;
       this.structTabLeft=this.structTab.rows[0].cells[0];

diff --git a/minsrc/ricoLiveGridForms.js b/minsrc/ricoLiveGridForms.js
index 1f4c4c1..8bad314 100644 (file)
--- a/minsrc/ricoLiveGridForms.js
+++ b/minsrc/ricoLiveGridForms.js
@@ -73,7 +73,7 @@ Rico.TableEdit.prototype = {
 
     this.requestCount=1;
     this.formPopup=this.createWindow();
 
     this.requestCount=1;
     this.formPopup=this.createWindow();

-    Rico.addClass(this.formPopup.content,'ricoLG_editDiv');
+    Rico.addClass(this.formPopup.content.parentNode,'ricoLG_editDiv');

     if (this.options.canEdit || this.options.canAdd) {
       this.startForm();
       this.createForm(this.form);
     if (this.options.canEdit || this.options.canAdd) {
       this.startForm();
       this.createForm(this.form);

diff --git a/minsrc/ricoSimpleGrid.js b/minsrc/ricoSimpleGrid.js
index e5462b8..dc6a050 100644 (file)
--- a/minsrc/ricoSimpleGrid.js
+++ b/minsrc/ricoSimpleGrid.js
@@ -1,6 +1,6 @@
 /*
 /*

- *  (c) 2005-2009 Richard Cowin (http://openrico.org)
- *  (c) 2005-2009 Matt Brown (http://dowdybrown.com)
+ *  (c) 2005-2011 Richard Cowin (http://openrico.org)
+ *  (c) 2005-2011 Matt Brown (http://dowdybrown.com)

  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
  *  file except in compliance with the License. You may obtain a copy of the License at
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
  *  file except in compliance with the License. You may obtain a copy of the License at


@@ -241,7 +241,7 @@ Rico.SimpleGrid.prototype = {
       }
       this.exportRows.push(exportText);
     }
       }
       this.exportRows.push(exportText);
     }

-    this.exportFinish(exportType);
+    this.exportFinish();

   },
 
   /**
   },
 
   /**

diff --git a/minsrc/ricoUI.js b/minsrc/ricoUI.js
index 2edd0f4..e5e47b7 100644 (file)
--- a/minsrc/ricoUI.js
+++ b/minsrc/ricoUI.js
@@ -99,42 +99,34 @@ Rico.Popup.prototype = {
     } else {
       this.position=this.container.style.position=this.options.position;
     }
     } else {
       this.position=this.container.style.position=this.options.position;
     }

-    if (this.position != 'absolute') {
-      this.content=this.container;
-      return;
+    this.content=document.createElement('div');
+    while (this.container.firstChild) {
+      this.content.appendChild(this.container.firstChild);

     }
     }

-    if (this.options.zIndex >= 0) this.container.style.zIndex=this.options.zIndex;
+    this.container.appendChild(this.content);
+    this.content.className='RicoPopupContent';
+    this.content.style.position='relative';
+    if (this.position != 'absolute') return;
+

     if (this.options.closeFunc) {
       this.closeFunc=this.options.closeFunc;
     } else {
       var self=this;
       this.closeFunc=function() { self.closePopup(); };
     }
     if (this.options.closeFunc) {
       this.closeFunc=this.options.closeFunc;
     } else {
       var self=this;
       this.closeFunc=function() { self.closePopup(); };
     }

-    //this.container.style.overflow='hidden';

     this.container.style.top='0px';
     this.container.style.left='0px';
     this.container.style.display='none';
     this.container.style.top='0px';
     this.container.style.left='0px';
     this.container.style.display='none';

-
-    this.content=document.createElement('div');
-    while (this.container.firstChild) {
-      this.content.appendChild(this.container.firstChild);
-    }
-    this.container.appendChild(this.content);
-    this.content.className='RicoPopupContent';
-    this.content.style.position='relative';
+    if (this.options.zIndex >= 0) this.container.style.zIndex=this.options.zIndex;
+    this.content.style.zIndex=2;

 
     if (Rico.isIE && Rico.ieVersion < 7) {
       // create iframe shim
       this.ifr = document.createElement('iframe');
 
     if (Rico.isIE && Rico.ieVersion < 7) {
       // create iframe shim
       this.ifr = document.createElement('iframe');

-      this.ifr.style.position="absolute";
-      this.ifr.style.top     = '0px';
-      this.ifr.style.left    = '0px';
-      this.ifr.style.width   = '2000px';
-      this.ifr.style.height  = '2000px';
-      this.ifr.style.zIndex  = -1;
-      this.ifr.frameBorder   = 0;
-      this.ifr.src="javascript:false;";
-      this.content.appendChild(this.ifr);
+      this.ifr.className='RicoShim';
+      this.ifr.frameBorder=0;
+      this.ifr.src="javascript:'';";
+      this.container.appendChild(this.ifr);

     }
     Rico.applyShadow(this.container,this.options.shadow);
 
     }
     Rico.applyShadow(this.container,this.options.shadow);
 


@@ -228,13 +220,13 @@ Rico.Popup.prototype = {
  * Display popup at specified position
  */
   openPopup: function(left,top) {
  * Display popup at specified position
  */
   openPopup: function(left,top) {

-    this.container.style.display=this.position=='absolute' ? "block" : Rico.isIE && Rico.ieVersion<8 ? "inline" : "inline-block";

     if (typeof left=='number') this.container.style.left=left+'px';
     if (typeof top=='number') this.container.style.top=top+'px';
     if (typeof left=='number') this.container.style.left=left+'px';
     if (typeof top=='number') this.container.style.top=top+'px';

+    this.container.style.display=''; //this.position=='absolute' ? "block" : Rico.isIE && Rico.ieVersion<8 ? "inline" : "inline-block";

     if (this.container.id) Rico.log('openPopup '+this.container.id+' at '+left+','+top);
     Rico._AddOpenPopup(this);
   },
     if (this.container.id) Rico.log('openPopup '+this.container.id+' at '+left+','+top);
     Rico._AddOpenPopup(this);
   },

-
+  

   centerPopup: function() {
     this.openPopup();
     var msgWidth=this.container.offsetWidth;
   centerPopup: function() {
     this.openPopup();
     var msgWidth=this.container.offsetWidth;


@@ -340,12 +332,13 @@ Rico.Window.prototype = {
     if (options.overflow) this.contentDiv.style.overflow=options.overflow;
     Rico.addClass(this.content,'ricoWindow');
     if (Rico.theme.dialog) Rico.addClass(this.content,Rico.theme.dialog);
     if (options.overflow) this.contentDiv.style.overflow=options.overflow;
     Rico.addClass(this.content,'ricoWindow');
     if (Rico.theme.dialog) Rico.addClass(this.content,Rico.theme.dialog);

+    /*

     if (Rico.isIE) {
       // fix float'ed content in IE
       this.titleDiv.style.zoom=1;
       this.contentDiv.style.zoom=1;
     }
     if (Rico.isIE) {
       // fix float'ed content in IE
       this.titleDiv.style.zoom=1;
       this.contentDiv.style.zoom=1;
     }

-
+    */

     this.content=this.contentDiv;
   },
 
     this.content=this.contentDiv;
   },
 


@@ -457,7 +450,7 @@ Rico.Menu.prototype = {
     arrowdiv.style[dir]='0px';
     a.RicoSubmenu=submenu;
     Rico.eventBind(a,"mouseover", Rico.eventHandle(this,'showSubMenu'));
     arrowdiv.style[dir]='0px';
     a.RicoSubmenu=submenu;
     Rico.eventBind(a,"mouseover", Rico.eventHandle(this,'showSubMenu'));

-    Rico.eventBind(a,"mouseout", Rico.eventHandle(this,'subMenuOut'));
+    //Rico.eventBind(a,"mouseout", Rico.eventHandle(this,'subMenuOut'));

   },
 
   showSubMenu: function(e) {
   },
 
   showSubMenu: function(e) {


@@ -474,6 +467,7 @@ Rico.Menu.prototype = {
     a.RicoSubmenu.openmenu(parseInt(this.container.style.left)+a.offsetWidth, parseInt(this.container.style.top)+a.offsetTop, a.offsetWidth-2, a.offsetHeight+2,true);
   },
 
     a.RicoSubmenu.openmenu(parseInt(this.container.style.left)+a.offsetWidth, parseInt(this.container.style.top)+a.offsetTop, a.offsetWidth-2, a.offsetHeight+2,true);
   },
 

+  /*

   subMenuOut: function(e) {
     if (!this.openSubMenu) return;
     Rico.eventStop(e);
   subMenuOut: function(e) {
     if (!this.openSubMenu) return;
     Rico.eventStop(e);


@@ -486,6 +480,7 @@ Rico.Menu.prototype = {
     if (reltg == this.openSubMenu.div) return;
     this.hideSubMenu();
   },
     if (reltg == this.openSubMenu.div) return;
     this.hideSubMenu();
   },

+  */

 
   hideSubMenu: function() {
     if (this.openMenuAnchor) {
 
   hideSubMenu: function() {
     if (this.openMenuAnchor) {


@@ -542,6 +537,7 @@ Rico.Menu.prototype = {
       this.highlightElem=null;
     }
     var elem=Rico.eventElement(e);
       this.highlightElem=null;
     }
     var elem=Rico.eventElement(e);

+    if (elem.parentNode == this.openMenuAnchor) elem=elem.parentNode;

     if (this.openMenuAnchor && this.openMenuAnchor!=elem)
       this.hideSubMenu();
     if (elem.className=='enabled') {
     if (this.openMenuAnchor && this.openMenuAnchor!=elem)
       this.hideSubMenu();
     if (elem.className=='enabled') {

diff --git a/plugins/asp/LoadRicoClient.asp b/plugins/asp/LoadRicoClient.asp
index 3f35828..8e89bfa 100644 (file)
--- a/plugins/asp/LoadRicoClient.asp
+++ b/plugins/asp/LoadRicoClient.asp
@@ -44,12 +44,17 @@ End Sub
 ' jquery themes start with j-, rico themes start with r-\r
 Private theme         \r
 Public Property Let ricoTheme(ThemeName)\r
 ' jquery themes start with j-, rico themes start with r-\r
 Private theme         \r
 Public Property Let ricoTheme(ThemeName)\r

-  theme = "r-" & ThemeName\r
-  if ThemeName="grayedout" then imgHeading="grayedout.gif"\r
+  SetTheme "r-" & ThemeName\r

 End Property \r
 Public Property Let jTheme(ThemeName)\r
 End Property \r
 Public Property Let jTheme(ThemeName)\r

-  theme = "j-" & ThemeName\r
-End Property \r
+  SetTheme "j-" & ThemeName\r
+End Property\r
+\r
+\r
+Private Sub SetTheme(ByVal PrefixedTheme)\r
+  theme = PrefixedTheme\r
+  If PrefixedTheme = "r-grayedout" Then imgHeading = "grayedout.gif"\r
+End Sub\r

 \r
 \r
 Public Sub SetRicoClientPaths(ByVal jsPath, cssPath, imgPath)\r
 \r
 \r
 Public Sub SetRicoClientPaths(ByVal jsPath, cssPath, imgPath)\r


@@ -69,7 +74,7 @@ End Sub
 ' Do no call in production\r
 Public Sub CheckQueryString()\r
   BaseLib=LCase(Request.QueryString("lib"))\r
 ' Do no call in production\r
 Public Sub CheckQueryString()\r
   BaseLib=LCase(Request.QueryString("lib"))\r

-  theme=trim(Request.QueryString("theme"))\r
+  SetTheme trim(Request.QueryString("theme"))\r

   ricoLogging=CBool(trim(Request.QueryString("log")) <> "")\r
 end Sub\r
 \r
   ricoLogging=CBool(trim(Request.QueryString("log")) <> "")\r
 end Sub\r
 \r

diff --git a/ricoClient/css/coffee-with-milk.css b/ricoClient/css/coffee-with-milk.css
index 4a4ae12..4dda072 100644 (file)
--- a/ricoClient/css/coffee-with-milk.css
+++ b/ricoClient/css/coffee-with-milk.css
@@ -3,7 +3,7 @@ Based on "Coffee with milk" table design by Roger Johansson, 456 Berea Street
 www.456bereastreet.com\r
 ================================================*/\r
 \r
 www.456bereastreet.com\r
 ================================================*/\r
 \r

-.ricoLG_table, tr.ricoLG_hdg .ricoLG_cell, .ricoTitle, a.RicoButton, .Rico_tabTitle , .Rico_accTitle, div.ricoCalContainer *, .ricoTree *, .ricoBookmark {\r
+.ricoLG_table, tr.ricoLG_hdg .ricoLG_cell, .ricoTitle, a.RicoButton, .Rico_tabTitle , .Rico_accTitle, .ricoCalContainer *, .ricoTree *, .ricoBookmark {\r

   font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;\r
 }\r
 \r
   font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;\r
 }\r
 \r


@@ -157,37 +157,37 @@ a.RicoButton.hover {
   background-color: #ffffee;\r
 }\r
 \r
   background-color: #ffffee;\r
 }\r
 \r

-div.ricoCalContainer table.ricoCalTab {\r
+.ricoCalContainer {\r

   border : 1px solid #523A0B;\r
 }\r
   border : 1px solid #523A0B;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th span a {\r
+div.RicoCalHeading {\r

   font-size: 10pt !important;\r
   font-size: 10pt !important;\r

-}\r
-div.ricoCalContainer table.ricoCalTab thead th {\r
+  font-weight: normal;\r
+  color:#000;\r

   background-color: #EBE5D9;\r
   background-color: #EBE5D9;\r

+  border-bottom : 1px solid #523A0B;\r
+}\r
+div.RicoCalHeading a.hover {\r
+  background-color: #F7F4EE !important;\r
+}\r
+div.RicoCalHeading a:link, div.RicoCalHeading a:visited {\r

   color:#000;\r
   color:#000;\r

-  font-weight: normal;\r

 }\r
 }\r

-div.ricoCalContainer tfoot td {\r
+.ricoCalContainer  .RicoCalHeadingInner {\r
+  width: 15em;\r
+}\r
+.ricoCalContainer tfoot td {\r

   border-top : 1px solid #523A0B;\r
   background-color:#EBE5D9;\r
   color:#000;\r
 }\r
   border-top : 1px solid #523A0B;\r
   background-color:#EBE5D9;\r
   color:#000;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th {\r
-  border-bottom : 1px solid #523A0B;\r
-}\r
-div.ricoCalContainer table.ricoCalTab, div.ricoCalContainer td.ricoCalEmpty, div.ricoCalContainer tr.ricoCalDayNames td {\r
+.ricoCalContainer table.ricoCalTab, .ricoCalContainer td.ricoCalEmpty, .ricoCalContainer tr.ricoCalDayNames td {\r

   background-color:#F7F4EE;\r
 }\r
   background-color:#F7F4EE;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th a.hover {\r
-  background-color: #F7F4EE !important;\r
-}\r
-div.ricoCalContainer tbody td.hover {\r
+.ricoCalContainer tbody td.hover {\r

   background-color: #ffffcc;\r
 }\r
   background-color: #ffffcc;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead a:link, div.ricoCalContainer table.ricoCalTab thead a:visited {\r
-  color:#000;\r
-}\r
+\r

 .ricoTree a.hover {\r
   text-decoration: underline;\r
   cursor:pointer;\r
 .ricoTree a.hover {\r
   text-decoration: underline;\r
   cursor:pointer;\r

diff --git a/ricoClient/css/grayedout.css b/ricoClient/css/grayedout.css
index b31a553..277fc23 100644 (file)
--- a/ricoClient/css/grayedout.css
+++ b/ricoClient/css/grayedout.css
@@ -87,7 +87,7 @@ caption {
   cursor: auto;\r
 }\r
 .Rico_tabContent, .noTabContent {\r
   cursor: auto;\r
 }\r
 .Rico_tabContent, .noTabContent {\r

-  background: #F8F8F8;\r
+  background: #F4F4F4;\r

 }\r
 \r
 .Rico_tabContentContainer, .noTabContent {\r
 }\r
 \r
 .Rico_tabContentContainer, .noTabContent {\r


@@ -134,14 +134,12 @@ caption {
 .Rico_accordion  {\r
   border : 1px solid #CCC;\r
 }\r
 .Rico_accordion  {\r
   border : 1px solid #CCC;\r
 }\r

-\r
-div.ricoCalContainer table.ricoCalTab thead th {\r
+div.RicoCalHeading, .ricoCalContainer tfoot td {\r

   background-color: #999;\r
   color:#FFFFFF;\r
 }\r
   background-color: #999;\r
   color:#FFFFFF;\r
 }\r

-div.ricoCalContainer tfoot td {\r
-  background-color:#999;\r
-  color:#FFFFFF;\r
+.ricoCalContainer table.ricoCalTab, .ricoCalContainer td.ricoCalEmpty, .ricoCalContainer tr.ricoCalDayNames td  {\r
+  background-color:#DDD;\r

 }\r
 span.Rico_leftArrow {\r
   background-position: -10px -1077px;\r
 }\r
 span.Rico_leftArrow {\r
   background-position: -10px -1077px;\r


@@ -149,13 +147,13 @@ span.Rico_leftArrow {
 span.Rico_rightArrow {\r
   background-position: -10px -1139px;\r
 }\r
 span.Rico_rightArrow {\r
   background-position: -10px -1139px;\r
 }\r

-.RicoCalHeading span.RicoClose {\r
+div.RicoCalHeading span.RicoClose {\r

   background-position: -10px -155px;\r
 }\r
   background-position: -10px -155px;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th a.hover {\r
+div.RicoCalHeading a.hover {\r

   background-color: #AAA !important;\r
 }\r
   background-color: #AAA !important;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead a:link, div.ricoCalContainer table.ricoCalTab thead a:visited {\r
+div.RicoCalHeading a:link, div.RicoCalHeading a:visited {\r

   color:#FFFFFF;\r
 }\r
 .ricoTree a.hover {\r
   color:#FFFFFF;\r
 }\r
 .ricoTree a.hover {\r

diff --git a/ricoClient/css/greenHdg.css b/ricoClient/css/greenHdg.css
index 3e241f3..b468e3c 100644 (file)
--- a/ricoClient/css/greenHdg.css
+++ b/ricoClient/css/greenHdg.css
@@ -94,13 +94,13 @@ a.RicoButton.hover {
 .Rico_accordion  {\r
   border : 1px solid #1f669b;\r
 }\r
 .Rico_accordion  {\r
   border : 1px solid #1f669b;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th {\r
-  background-color: #cedebd;\r
+div.RicoCalHeading {\r
+  background-color: #becead;\r

 }\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th a.hover {\r
+div.RicoCalHeading a.hover {\r

   background-color: #deeecd !important;\r
 }\r
   background-color: #deeecd !important;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead a:link, div.ricoCalContainer table.ricoCalTab thead a:visited {\r
+div.RicoCalHeading a:link, div.RicoCalHeading a:visited {\r

   color:blue;\r
 }\r
 .ricoTree a.hover {\r
   color:blue;\r
 }\r
 .ricoTree a.hover {\r

diff --git a/ricoClient/css/rico.css b/ricoClient/css/rico.css
index f876431..897eb83 100644 (file)
--- a/ricoClient/css/rico.css
+++ b/ricoClient/css/rico.css
@@ -499,138 +499,136 @@ a.RicoButtonAnchorNative:hover {
 \r
 /* ricoCalendar */\r
 \r
 \r
 /* ricoCalendar */\r
 \r

-table.ricoCalTab, table.ricoCalTab *, .ricoCalYearPrompt *, div.ricoTreeContainer * {\r
+table.ricoCalTab, table.ricoCalTab *, .ricoCalYearPrompt * {\r

   font-size:8pt !important;\r
 }\r
 \r
   font-size:8pt !important;\r
 }\r
 \r

+.RicoCalHeading {\r
+  font-size:8pt !important;\r
+  font-weight: bold;\r
+  text-align:center;\r
+}\r
+\r
+.RicoCalHeading a {\r
+  text-decoration: none;\r
+}\r
+\r
+.ui-datepicker .RicoCalHeadingInner {\r
+  height: 1.8em;\r
+  position: relative;\r
+  width: 16em;\r
+}\r
+\r
+.ricoCalContainer  .RicoCalHeadingInner {\r
+  height: 1.3em;\r
+  position: relative;\r
+  width: 16em;\r
+  padding: 2px;\r
+}\r
+\r
+.RicoCalHeading  > .RicoCalHeadingInner {\r
+  margin: auto;\r
+}\r
+\r

 table.ricoCalTab {\r
   width: auto !important;\r
 }\r
 \r
 table.ricoCalTab {\r
   width: auto !important;\r
 }\r
 \r

-div.ricoCalContainer table.ricoCalTab, div.ricoCalContainer td.ricoCalEmpty, div.ricoCalContainer tr.ricoCalDayNames td  {\r
+.ricoCalContainer table.ricoCalTab, .ricoCalContainer td.ricoCalEmpty, .ricoCalContainer tr.ricoCalDayNames td  {\r

   background-color:#eee;\r
 }\r
 \r
   background-color:#eee;\r
 }\r
 \r

-div.ricoCalContainer  .ricoCalToday {\r
+.ricoCalContainer  .ricoCalToday {\r

   font-weight:bold;\r
   background-color: #33FFFF !important;\r
 }\r
 \r
   font-weight:bold;\r
   background-color: #33FFFF !important;\r
 }\r
 \r

-div.ricoCalContainer .ricoSelectedDay {\r
+.ricoCalContainer .ricoSelectedDay {\r

   font-weight:bold;\r
   background-color: #FFFF66 !important;\r
 }\r
 \r
   font-weight:bold;\r
   background-color: #FFFF66 !important;\r
 }\r
 \r

-div.ricoCalContainer tbody td.hover {\r
+.ricoCalContainer tbody td.hover {\r

   background-color: #FDD;\r
 }\r
 \r
   background-color: #FDD;\r
 }\r
 \r

-table.ricoCalTab thead a {\r
-  text-decoration: none;\r
-}\r
-\r

 span.RicoCalMonthHeading {\r
 span.RicoCalMonthHeading {\r

-  position:relative;\r
-  margin: 0px 1.6em;\r
-  display: block;\r
+  position:absolute;\r
+  left: 0px;\r
+  font-weight:bold;\r
+  margin: 0px 1em !important;\r

   padding: 0px;\r
   padding: 0px;\r

-  width: 6em;\r
+  display: block;\r
+  width: 6.5em;\r

   text-align: center;\r
   text-align: center;\r

-  float: left;\r

 }\r
 \r
 span.RicoCalYearHeading {\r
 }\r
 \r
 span.RicoCalYearHeading {\r

-  position:relative;\r
+  position:absolute;\r
+  right: 0px;\r
+  font-weight:bold;\r
+  margin: 0px 1em !important;\r
+  padding: 0px;\r

   display: block;\r
   width: 7em;\r
   text-align: center;\r
   display: block;\r
   width: 7em;\r
   text-align: center;\r

-  float: left;\r

 }\r
 \r
 span.Rico_leftArrow {\r
   background-position: -10px -1046px;\r
 }\r
 \r
 span.Rico_leftArrow {\r
   background-position: -10px -1046px;\r

-  position: absolute;\r
-  top: 4px;\r
-  left: 0px;\r
-  width: 11px;\r
+  display: inline-block;\r
+  width: 10px;\r

   height: 11px;\r
 }\r
 \r
 a.Rico_leftArrow {\r
   height: 11px;\r
 }\r
 \r
 a.Rico_leftArrow {\r

-  position: absolute;\r
-  top: -3px !important;\r
-  left: 0px !important;\r
-  width: 12px;\r
-  height: 1.6em;\r
+  display: inline-block;\r
+  width: 15px;\r
+  height: 1.1em;\r

 }\r
 \r
 span.Rico_rightArrow {\r
   background-position: -10px -1108px;\r
 }\r
 \r
 span.Rico_rightArrow {\r
   background-position: -10px -1108px;\r

-  position: absolute;\r
-  top: 4px;\r
-  right: 0px;\r
-  width: 11px;\r
+  display: inline-block;\r
+  width: 10px;\r

   height: 11px;\r
 }\r
 \r
 a.Rico_rightArrow {\r
   height: 11px;\r
 }\r
 \r
 a.Rico_rightArrow {\r

-  position: absolute;\r
-  top: -3px !important;\r
-  right: 0px !important;\r
-  width: 12px;\r
-  height: 1.6em;\r
-}\r
-\r
-table.ricoCalTab thead img {\r
-  border:none;\r
-/*  padding-left: 0.3em;\r
-  padding-right: 0.3em;*/\r
+  display: inline-block;\r
+  width: 15px;\r
+  height: 1.1em;\r

 }\r
 \r
 table.ricoCalTab thead a.hover {\r
   cursor:pointer;\r
 }\r
 \r
 }\r
 \r
 table.ricoCalTab thead a.hover {\r
   cursor:pointer;\r
 }\r
 \r

-.ricoCalYearPrompt td {\r
-  white-space: nowrap;\r
-}\r
-\r

 div.ricoCalYearPrompt {\r
   margin: 0px;\r
   padding: 3px;\r
 div.ricoCalYearPrompt {\r
   margin: 0px;\r
   padding: 3px;\r

-}\r
-\r
-div.ricoCalContainer  div.ricoCalYearPrompt {\r
+  display: block;\r

   border:1px solid #666666;\r
   background-color: #FEE;\r
 }\r
 \r
   border:1px solid #666666;\r
   background-color: #FEE;\r
 }\r
 \r

-div.ricoCalContainer  .ricoCalYearPrompt img {\r
+.ricoCalYearPrompt td {\r
+  white-space: nowrap;\r
+}\r
+\r
+.ricoCalYearPrompt img {\r

   border: 1px solid black;\r
   margin-left: 3px;\r
   vertical-align: middle;\r
 }\r
 \r
   border: 1px solid black;\r
   margin-left: 3px;\r
   vertical-align: middle;\r
 }\r
 \r

-div.ricoCalContainer table.ricoCalTab thead th {\r
-  background-color: #D4D0C8;\r
-  font-weight: bold;\r
-  text-align:center;\r
-  padding: 2px;\r
-}\r
-\r
-.RicoCalHeading {\r
-  position: relative;\r
-  padding: 1px 0px;\r
-  height: 1%;\r
-}\r
-\r

 table.ricoCalTab tfoot td {\r
   text-align:center;\r
   padding: 2px;\r
   cursor:pointer;\r
 }\r
 \r
 table.ricoCalTab tfoot td {\r
   text-align:center;\r
   padding: 2px;\r
   cursor:pointer;\r
 }\r
 \r

-div.ricoCalContainer  tfoot td {\r
+.ricoCalContainer  tfoot td {\r

   color:#FFF;\r
   background-color: #666666;\r
 }\r
   color:#FFF;\r
   background-color: #666666;\r
 }\r


@@ -640,7 +638,7 @@ table.ricoCalTab tfoot span {
   cursor:pointer;\r
 }\r
 \r
   cursor:pointer;\r
 }\r
 \r

-div.ricoCalContainer table.ricoCalTab tbody {\r
+.ricoCalContainer table.ricoCalTab tbody {\r

   background-color: white;\r
 }\r
 \r
   background-color: white;\r
 }\r
 \r


@@ -667,13 +665,13 @@ td.ricoCal0, td.ricoCal1, td.ricoCal2, td.ricoCal3, td.ricoCal4, td.ricoCal5, td
 }\r
 \r
 /* Monday-Friday */\r
 }\r
 \r
 /* Monday-Friday */\r

-div.ricoCalContainer td.ricoCal1, div.ricoCalContainer td.ricoCal2, div.ricoCalContainer td.ricoCal3, div.ricoCalContainer td.ricoCal4, div.ricoCalContainer td.ricoCal5 {\r
+.ricoCalContainer td.ricoCal1, .ricoCalContainer td.ricoCal2, .ricoCalContainer td.ricoCal3, .ricoCalContainer td.ricoCal4, .ricoCalContainer td.ricoCal5 {\r

   color:black;\r
   background-color:#fff;\r
 }\r
 \r
 /* Sunday, Saturday */\r
   color:black;\r
   background-color:#fff;\r
 }\r
 \r
 /* Sunday, Saturday */\r

-div.ricoCalContainer td.ricoCal0, div.ricoCalContainer td.ricoCal6 {\r
+.ricoCalContainer td.ricoCal0, .ricoCalContainer td.ricoCal6 {\r

   color:#999;\r
   background-color:#fff;\r
 }\r
   color:#999;\r
   background-color:#fff;\r
 }\r


@@ -692,14 +690,12 @@ td.ricoCalWeekNum {
 \r
 .ricoCalMenu {\r
   width:12em !important;\r
 \r
 .ricoCalMenu {\r
   width:12em !important;\r

-}\r
-div.ricoCalContainer .ricoCalMenu {\r

   background-color: #FEE;\r
   border-bottom:1px solid #666666;\r
   border-right:1px solid #666666;\r
 }\r
 \r
   background-color: #FEE;\r
   border-bottom:1px solid #666666;\r
   border-right:1px solid #666666;\r
 }\r
 \r

-div.ricoCalContainer .ricoCalMenu td {\r
+.ricoCalMenu td {\r

   border-top:1px solid #666666;\r
   border-left:1px solid #666666;\r
 }\r
   border-top:1px solid #666666;\r
   border-left:1px solid #666666;\r
 }\r


@@ -710,13 +706,10 @@ div.ricoCalContainer .ricoCalMenu td {
   cursor:pointer;\r
   font-size:8pt;\r
   text-align: center !important;\r
   cursor:pointer;\r
   font-size:8pt;\r
   text-align: center !important;\r

-}\r
-\r
-div.ricoCalContainer .ricoCalMenu a {\r

   color:black;\r
 }\r
 \r
   color:black;\r
 }\r
 \r

-div.ricoCalContainer .ricoCalMenu a:hover {\r
+.ricoCalMenu a:hover {\r

   background-color: #FCC;\r
 }\r
 \r
   background-color: #FCC;\r
 }\r
 \r


@@ -979,7 +972,8 @@ span.RicoCancel {
 .RicoCloseAnchor {\r
   cursor: pointer;\r
   position: absolute;\r
 .RicoCloseAnchor {\r
   cursor: pointer;\r
   position: absolute;\r

-  top: 1px;\r
+  display: block;\r
+  top: 2px;\r

   right: 2px;\r
   border: 0px none !important;\r
 }\r
   right: 2px;\r
   border: 0px none !important;\r
 }\r


@@ -989,3 +983,14 @@ span.RicoClose {
   width: 16px;\r
   background-position: -10px -122px;\r
 }\r
   width: 16px;\r
   background-position: -10px -122px;\r
 }\r

+\r
+/* ie6 only */\r
+* html iframe.RicoShim {\r
+  position: absolute;\r
+  display:block;\r
+  top: 0px;\r
+  left: 0px;\r
+  width: expression( this.previousSibling.offsetWidth+'px' );\r
+  height: expression( this.previousSibling.offsetHeight+'px' );\r
+  z-index: 1;\r
+}\r

diff --git a/ricoClient/css/seaglass.css b/ricoClient/css/seaglass.css
index 8d8dbb5..4a6763f 100644 (file)
--- a/ricoClient/css/seaglass.css
+++ b/ricoClient/css/seaglass.css
@@ -109,26 +109,26 @@ a.RicoButton.hover {
   border : 1px solid #1f669b;
 }
 
   border : 1px solid #1f669b;
 }
 

-div.ricoCalContainer table.ricoCalTab thead th {
+div.RicoCalHeading {

   background-color: #2C5755;
   color:#FFFFFF;
 }
   background-color: #2C5755;
   color:#FFFFFF;
 }

-div.ricoCalContainer tfoot td {
+.ricoCalContainer tfoot td {

   background-color:#1C4745;
   color:#FFFFFF;
 }
   background-color:#1C4745;
   color:#FFFFFF;
 }

-div.ricoCalContainer table.ricoCalTab, div.ricoCalContainer td.ricoCalEmpty, div.ricoCalContainer tr.ricoCalDayNames td {
+.ricoCalContainer table.ricoCalTab, .ricoCalContainer td.ricoCalEmpty, .ricoCalContainer tr.ricoCalDayNames td {

   background-color:#DBE6DD;
 }
 .ricoCal0, .ricoCal1, .ricoCal2, .ricoCal3, .ricoCal4, .ricoCal4, .ricoCal6 {
   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
 }
   background-color:#DBE6DD;
 }
 .ricoCal0, .ricoCal1, .ricoCal2, .ricoCal3, .ricoCal4, .ricoCal4, .ricoCal6 {
   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
 }

-div.ricoCalContainer div.ricoCalYearPrompt {
+.ricoCalContainer div.ricoCalYearPrompt {

   background-color:#f1f8ee;
   border:1px solid #2C5755;
   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
 }
   background-color:#f1f8ee;
   border:1px solid #2C5755;
   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
 }

-div.ricoCalContainer .ricoCalMenu {
+.ricoCalContainer .ricoCalMenu {

   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
   background-color:#f1f8ee;
   border-bottom:1px solid #2C5755;
   font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
   background-color:#f1f8ee;
   border-bottom:1px solid #2C5755;


@@ -143,10 +143,10 @@ span.Rico_rightArrow {
 span.RicoClose {
   background-position: -10px -155px;
 }
 span.RicoClose {
   background-position: -10px -155px;
 }

-div.ricoCalContainer table.ricoCalTab thead th a.hover {
+div.RicoCalHeading a.hover {

   background-color: #4C7775 !important;
 }
   background-color: #4C7775 !important;
 }

-div.ricoCalContainer table.ricoCalTab thead a:link, div.ricoCalContainer table.ricoCalTab thead a:visited {
+div.RicoCalHeading a:link, div.RicoCalHeading a:visited {

   color:#FFFFFF;
 }
 .ricoTree a.hover {
   color:#FFFFFF;
 }
 .ricoTree a.hover {

diff --git a/ricoClient/css/warmfall.css b/ricoClient/css/warmfall.css
index aec9247..32a9e95 100644 (file)
--- a/ricoClient/css/warmfall.css
+++ b/ricoClient/css/warmfall.css
@@ -9,18 +9,18 @@ div.ricoLG_outerDiv *, div.ricoLG_outerDiv div.ricoLG_cell, div.ricoLG_editDiv *
 }\r
 \r
 .ricoLG_table thead {\r
 }\r
 \r
 .ricoLG_table thead {\r

-       border-top: 1px solid #84785e;\r
-       border-right: 1px solid #84785e;\r
+  border-top: 1px solid #84785e;\r
+  border-right: 1px solid #84785e;\r

 }\r
 \r
 tr.ricoLG_hdg .ricoLG_cell, tr.ricoLG_hdg .ricoLG_cell a, tr.ricoLG_hdg .ricoLG_cell a:visited, tr.ricoLG_hdg th, tr.ricoLG_hdg td, table.ricoLiveGrid thead td, table.ricoLiveGrid thead th {  /* td/th required for IE */\r
 }\r
 \r
 tr.ricoLG_hdg .ricoLG_cell, tr.ricoLG_hdg .ricoLG_cell a, tr.ricoLG_hdg .ricoLG_cell a:visited, tr.ricoLG_hdg th, tr.ricoLG_hdg td, table.ricoLiveGrid thead td, table.ricoLiveGrid thead th {  /* td/th required for IE */\r

-       background-color: #a24116 !important;\r
+  background-color: #a24116 !important;\r

   color: #ffffff !important;  \r
   color: #ffffff !important;  \r

-       text-decoration: none;\r
+  text-decoration: none;\r

 }\r
 \r
 .ricoLG_table th, .ricoLG_table td {\r
 }\r
 \r
 .ricoLG_table th, .ricoLG_table td {\r

-       border-left: 1px solid #84785e;\r
+  border-left: 1px solid #84785e;\r

 }\r
 \r
 .ricoLG_bottom div.ricoLG_cell, .ricoLG_top th, .ricoLG_top td {\r
 }\r
 \r
 .ricoLG_bottom div.ricoLG_cell, .ricoLG_top th, .ricoLG_top td {\r


@@ -28,20 +28,20 @@ tr.ricoLG_hdg .ricoLG_cell, tr.ricoLG_hdg .ricoLG_cell a, tr.ricoLG_hdg .ricoLG_
 }\r
 \r
 tr.ricoLG_hdg .ricoLG_cell {\r
 }\r
 \r
 tr.ricoLG_hdg .ricoLG_cell {\r

-       background-color: #a24116;\r
+  background-color: #a24116;\r

   border: 0px none;\r
   color: #ffffff;  \r
   border: 0px none;\r
   color: #ffffff;  \r

-       padding: 0.75em;\r
+  padding: 0.75em;\r

   font-weight: bold;\r
 }\r
 \r
 div.ricoLG_bottom a:visited, div.ricoLG_bottom a:link, div.ricoLG_bottom a:active {\r
   font-weight: bold;\r
 }\r
 \r
 div.ricoLG_bottom a:visited, div.ricoLG_bottom a:link, div.ricoLG_bottom a:active {\r

-       color: #101011;\r
-       text-decoration: none;\r
+  color: #101011;\r
+  text-decoration: none;\r

 }\r
 \r
 div.ricoLG_outerDiv a:hover {\r
 }\r
 \r
 div.ricoLG_outerDiv a:hover {\r

-       text-decoration: underline;\r
+  text-decoration: underline;\r

 }\r
 \r
 div.ricoLG_outerDiv tbody a:visited {\r
 }\r
 \r
 div.ricoLG_outerDiv tbody a:visited {\r


@@ -95,7 +95,7 @@ caption {
   cursor: auto;\r
 }\r
 .Rico_tabContent {\r
   cursor: auto;\r
 }\r
 .Rico_tabContent {\r

-  background-color: #fffbd8;\r
+  background-color: #fffee1;\r

 }\r
 \r
 .Rico_tabContentContainer {\r
 }\r
 \r
 .Rico_tabContentContainer {\r


@@ -141,22 +141,22 @@ caption {
 }\r
 \r
 \r
 }\r
 \r
 \r

-div.ricoCalContainer table.ricoCalTab thead th {\r
+div.RicoCalHeading {\r

   background-color: #a24116;\r
   color:#FFFFFF;\r
 }\r
   background-color: #a24116;\r
   color:#FFFFFF;\r
 }\r

-div.ricoCalContainer tfoot td {\r
+.ricoCalContainer tfoot td {\r

   background-color:#923106;\r
   color:#FFFFFF;\r
 }\r
   background-color:#923106;\r
   color:#FFFFFF;\r
 }\r

-div.ricoCalContainer table.ricoCalTab, div.ricoCalContainer td.ricoCalEmpty, div.ricoCalContainer tr.ricoCalDayNames td {\r
+.ricoCalContainer table.ricoCalTab, .ricoCalContainer td.ricoCalEmpty, .ricoCalContainer tr.ricoCalDayNames td {\r

   background-color:#f8f3d0;\r
 }\r
   background-color:#f8f3d0;\r
 }\r

-div.ricoCalContainer div.ricoCalYearPrompt {\r
+div.ricoCalYearPrompt {\r

   background-color:#fffbd8;\r
   border:1px solid #923106;\r
 }\r
   background-color:#fffbd8;\r
   border:1px solid #923106;\r
 }\r

-div.ricoCalContainer .ricoCalMenu {\r
+table.ricoCalMenu {\r

   background-color:#fffbd8;\r
   border-bottom:1px solid #923106;\r
   border-right:1px solid #923106;\r
   background-color:#fffbd8;\r
   border-bottom:1px solid #923106;\r
   border-right:1px solid #923106;\r


@@ -170,10 +170,10 @@ span.Rico_rightArrow {
 span.RicoClose {\r
   background-position: -10px -155px;\r
 }\r
 span.RicoClose {\r
   background-position: -10px -155px;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead th a.hover {\r
+div.RicoCalHeading a.hover {\r

   background-color: #c26136 !important;\r
 }\r
   background-color: #c26136 !important;\r
 }\r

-div.ricoCalContainer table.ricoCalTab thead a:link, div.ricoCalContainer table.ricoCalTab thead a:visited {\r
+div.RicoCalHeading a:link, div.RicoCalHeading a:visited {\r

   color:#FFFFFF;\r
 }\r
 .ricoTree a.hover {\r
   color:#FFFFFF;\r
 }\r
 .ricoTree a.hover {\r

diff --git a/ricoClient/js/rico.js b/ricoClient/js/rico.js
index 38d9e78..86f6c9d 100644 (file)
--- a/ricoClient/js/rico.js
+++ b/ricoClient/js/rico.js
@@ -54,7 +54,13 @@ var Rico = {
     this.addCssRule(s,'.rico-icon',Rico_CONFIG.imgIcons,'no-repeat');
     this.addCssRule(s,'.ricoLG_Resize',Rico_CONFIG.imgResize,'repeat');
     if (Rico_CONFIG.imgHeading) {
     this.addCssRule(s,'.rico-icon',Rico_CONFIG.imgIcons,'no-repeat');
     this.addCssRule(s,'.ricoLG_Resize',Rico_CONFIG.imgResize,'repeat');
     if (Rico_CONFIG.imgHeading) {

-      this.addCssRule(s,'tr.ricoLG_hdg th, tr.ricoLG_hdg td, table.ricoLiveGrid thead td, table.ricoLiveGrid thead th, .ricoTitle, .Rico_accTitle',Rico_CONFIG.imgHeading,'repeat-x scroll center left');
+      var repeat='repeat-x scroll left center';
+      this.addCssRule(s,'tr.ricoLG_hdg th',Rico_CONFIG.imgHeading,repeat);
+      this.addCssRule(s,'tr.ricoLG_hdg td',Rico_CONFIG.imgHeading,repeat);
+      this.addCssRule(s,'table.ricoLiveGrid thead td',Rico_CONFIG.imgHeading,repeat);
+      this.addCssRule(s,'table.ricoLiveGrid thead th',Rico_CONFIG.imgHeading,repeat);
+      this.addCssRule(s,'.ricoTitle',Rico_CONFIG.imgHeading,repeat);
+      this.addCssRule(s,'.Rico_accTitle',Rico_CONFIG.imgHeading,repeat);

     }
   },
 
     }
   },
 

diff --git a/ricoClient/js/ricoThemeroller.js b/ricoClient/js/ricoThemeroller.js
index aafde1f..308daa2 100644 (file)
--- a/ricoClient/js/ricoThemeroller.js
+++ b/ricoClient/js/ricoThemeroller.js
@@ -16,7 +16,6 @@
 // Connects Rico to jQuery Themeroller css classes\r
 \r
  Rico.theme = {\r
 // Connects Rico to jQuery Themeroller css classes\r
 \r
  Rico.theme = {\r

-  //widget: 'ui-widget',  // causes display issues in 3grids example in FF4\r

   gridheader: 'ui-widget-header',\r
   gridcontent:'ui-widget-content',\r
   gridMessage:'ui-state-highlight ui-corner-all',\r
   gridheader: 'ui-widget-header',\r
   gridcontent:'ui-widget-content',\r
   gridMessage:'ui-state-highlight ui-corner-all',\r


@@ -35,8 +34,9 @@
   tabContent:'ui-tabs-panel ui-widget-content ui-corner-bottom',\r
   tabCornerOptions: {corners:'top',nativeCorners:true},\r
   tabSelected:'ui-tabs-selected ui-state-active',\r
   tabContent:'ui-tabs-panel ui-widget-content ui-corner-bottom',\r
   tabCornerOptions: {corners:'top',nativeCorners:true},\r
   tabSelected:'ui-tabs-selected ui-state-active',\r

-  calendar:'ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all',\r
-  calendarHeading:'ui-datepicker-header ui-widget-header ui-helper-clearfix',\r
+  calendar:'ui-datepicker ui-widget-content',\r
+  calendarHeading:'ui-datepicker-header ui-widget-header',\r
+  calendarSubheading:'ui-datepicker-title',\r

   calendarTable:'ui-datepicker-calendar',\r
   calendarDay:'ui-state-default',\r
   calendarFooter:'ui-widget-footer',\r
   calendarTable:'ui-datepicker-calendar',\r
   calendarDay:'ui-state-default',\r
   calendarFooter:'ui-widget-footer',\r

diff --git a/ricoClient/js/rico_min.js b/ricoClient/js/rico_min.js
index 788ea0e..b48b3fa 100644 (file)
--- a/ricoClient/js/rico_min.js
+++ b/ricoClient/js/rico_min.js
@@ -29,9 +29,12 @@ if(a&&a.parent){a.parent.appendChild(this.container)
 this.container=Rico.$(c);
 if(this.options.position=="auto"){this.position=Rico.getStyle(this.container,"position").toLowerCase()
 }else{this.position=this.container.style.position=this.options.position
 this.container=Rico.$(c);
 if(this.options.position=="auto"){this.position=Rico.getStyle(this.container,"position").toLowerCase()
 }else{this.position=this.container.style.position=this.options.position

-}if(this.position!="absolute"){this.content=this.container;
-return
-}if(this.options.zIndex>=0){this.container.style.zIndex=this.options.zIndex
+}this.content=document.createElement("div");
+while(this.container.firstChild){this.content.appendChild(this.container.firstChild)
+}this.container.appendChild(this.content);
+this.content.className="RicoPopupContent";
+this.content.style.position="relative";
+if(this.position!="absolute"){return

 }if(this.options.closeFunc){this.closeFunc=this.options.closeFunc
 }else{var a=this;
 this.closeFunc=function(){a.closePopup()
 }if(this.options.closeFunc){this.closeFunc=this.options.closeFunc
 }else{var a=this;
 this.closeFunc=function(){a.closePopup()


@@ -39,21 +42,13 @@ this.closeFunc=function(){a.closePopup()
 }this.container.style.top="0px";
 this.container.style.left="0px";
 this.container.style.display="none";
 }this.container.style.top="0px";
 this.container.style.left="0px";
 this.container.style.display="none";

-this.content=document.createElement("div");
-while(this.container.firstChild){this.content.appendChild(this.container.firstChild)
-}this.container.appendChild(this.content);
-this.content.className="RicoPopupContent";
-this.content.style.position="relative";
+if(this.options.zIndex>=0){this.container.style.zIndex=this.options.zIndex
+}this.content.style.zIndex=2;

 if(Rico.isIE&&Rico.ieVersion<7){this.ifr=document.createElement("iframe");
 if(Rico.isIE&&Rico.ieVersion<7){this.ifr=document.createElement("iframe");

-this.ifr.style.position="absolute";
-this.ifr.style.top="0px";
-this.ifr.style.left="0px";
-this.ifr.style.width="2000px";
-this.ifr.style.height="2000px";
-this.ifr.style.zIndex=-1;
+this.ifr.className="RicoShim";

 this.ifr.frameBorder=0;
 this.ifr.frameBorder=0;

-this.ifr.src="javascript:false;";
-this.content.appendChild(this.ifr)
+this.ifr.src="javascript:'';";
+this.container.appendChild(this.ifr)

 }Rico.applyShadow(this.container,this.options.shadow);
 if(this.options.hideOnClick){Rico.eventBind(document,"click",Rico.eventHandle(this,"_docClick"))
 }this.dragEnabled=false;
 }Rico.applyShadow(this.container,this.options.shadow);
 if(this.options.hideOnClick){Rico.eventBind(document,"click",Rico.eventHandle(this,"_docClick"))
 }this.dragEnabled=false;


@@ -94,10 +89,10 @@ Rico.eventStop(d)
 },_endDrag:function(){this.container.style.cursor="";
 Rico.eventUnbind(document,"mousemove",this.dragHandler);
 Rico.eventUnbind(document,"mouseup",this.dropHandler)
 },_endDrag:function(){this.container.style.cursor="";
 Rico.eventUnbind(document,"mousemove",this.dragHandler);
 Rico.eventUnbind(document,"mouseup",this.dropHandler)

-},openPopup:function(b,a){this.container.style.display=this.position=="absolute"?"block":Rico.isIE&&Rico.ieVersion<8?"inline":"inline-block";
-if(typeof b=="number"){this.container.style.left=b+"px"
+},openPopup:function(b,a){if(typeof b=="number"){this.container.style.left=b+"px"

 }if(typeof a=="number"){this.container.style.top=a+"px"
 }if(typeof a=="number"){this.container.style.top=a+"px"

-}if(this.container.id){Rico.log("openPopup "+this.container.id+" at "+b+","+a)
+}this.container.style.display="";
+if(this.container.id){Rico.log("openPopup "+this.container.id+" at "+b+","+a)

 }Rico._AddOpenPopup(this)
 },centerPopup:function(){this.openPopup();
 var d=this.container.offsetWidth;
 }Rico._AddOpenPopup(this)
 },centerPopup:function(){this.openPopup();
 var d=this.container.offsetWidth;


@@ -170,8 +165,6 @@ if(a.height){this.contentDiv.style.height=a.height
 }if(a.overflow){this.contentDiv.style.overflow=a.overflow
 }Rico.addClass(this.content,"ricoWindow");
 if(Rico.theme.dialog){Rico.addClass(this.content,Rico.theme.dialog)
 }if(a.overflow){this.contentDiv.style.overflow=a.overflow
 }Rico.addClass(this.content,"ricoWindow");
 if(Rico.theme.dialog){Rico.addClass(this.content,Rico.theme.dialog)

-}if(Rico.isIE){this.titleDiv.style.zoom=1;
-this.contentDiv.style.zoom=1

 }this.content=this.contentDiv
 },setTitle:function(a){this.titleContent.innerHTML=a
 }};
 }this.content=this.contentDiv
 },setTitle:function(a){this.titleContent.innerHTML=a
 }};


@@ -232,8 +225,7 @@ f.className="rico-icon rico-"+d+"-"+this.options.arrowColor;
 Rico.setStyle(f,{position:"absolute",top:"2px"});
 f.style[d]="0px";
 c.RicoSubmenu=e;
 Rico.setStyle(f,{position:"absolute",top:"2px"});
 f.style[d]="0px";
 c.RicoSubmenu=e;

-Rico.eventBind(c,"mouseover",Rico.eventHandle(this,"showSubMenu"));
-Rico.eventBind(c,"mouseout",Rico.eventHandle(this,"subMenuOut"))
+Rico.eventBind(c,"mouseover",Rico.eventHandle(this,"showSubMenu"))

 },showSubMenu:function(c){if(this.openSubMenu){this.hideSubMenu()
 }var b=Rico.eventElement(c);
 if(!b.RicoSubmenu){b=b.parentNode
 },showSubMenu:function(c){if(this.openSubMenu){this.hideSubMenu()
 }var b=Rico.eventElement(c);
 if(!b.RicoSubmenu){b=b.parentNode


@@ -243,13 +235,6 @@ this.openMenuAnchor=b;
 if(Rico.hasClass(b,"ricoSubMenu")){Rico.removeClass(b,"ricoSubMenu");
 Rico.addClass(b,"ricoSubMenuOpen")
 }b.RicoSubmenu.openmenu(parseInt(this.container.style.left)+b.offsetWidth,parseInt(this.container.style.top)+b.offsetTop,b.offsetWidth-2,b.offsetHeight+2,true)
 if(Rico.hasClass(b,"ricoSubMenu")){Rico.removeClass(b,"ricoSubMenu");
 Rico.addClass(b,"ricoSubMenuOpen")
 }b.RicoSubmenu.openmenu(parseInt(this.container.style.left)+b.offsetWidth,parseInt(this.container.style.top)+b.offsetTop,b.offsetWidth-2,b.offsetHeight+2,true)

-},subMenuOut:function(d){if(!this.openSubMenu){return
-}Rico.eventStop(d);
-var c=Rico.eventElement(d);
-var a=Rico.eventRelatedTarget(d)||d.toElement;
-try{while(a!=null&&a!=this.openSubMenu.div){a=a.parentNode
-}}catch(b){}if(a==this.openSubMenu.div){return
-}this.hideSubMenu()

 },hideSubMenu:function(){if(this.openMenuAnchor){Rico.removeClass(this.openMenuAnchor,"ricoSubMenuOpen");
 Rico.addClass(this.openMenuAnchor,"ricoSubMenu");
 this.openMenuAnchor=null
 },hideSubMenu:function(){if(this.openMenuAnchor){Rico.removeClass(this.openMenuAnchor,"ricoSubMenuOpen");
 Rico.addClass(this.openMenuAnchor,"ricoSubMenu");
 this.openMenuAnchor=null


@@ -277,7 +262,8 @@ return c
 },mouseOver:function(b){if(this.highlightElem&&this.highlightElem.className=="enabled-hover"){this.highlightElem.className="enabled";
 this.highlightElem=null
 }var a=Rico.eventElement(b);
 },mouseOver:function(b){if(this.highlightElem&&this.highlightElem.className=="enabled-hover"){this.highlightElem.className="enabled";
 this.highlightElem=null
 }var a=Rico.eventElement(b);

-if(this.openMenuAnchor&&this.openMenuAnchor!=a){this.hideSubMenu()
+if(a.parentNode==this.openMenuAnchor){a=a.parentNode
+}if(this.openMenuAnchor&&this.openMenuAnchor!=a){this.hideSubMenu()

 }if(a.className=="enabled"){a.className="enabled-hover";
 this.highlightElem=a
 }},mouseOut:function(b){var a=Rico.eventElement(b);
 }if(a.className=="enabled"){a.className="enabled-hover";
 this.highlightElem=a
 }},mouseOut:function(b){var a=Rico.eventElement(b);


@@ -723,9 +709,12 @@ this.dateParts[RegExp.$5]=2
 }},addHoliday:function(f,a,g,e,c,b){this.Holidays[this.holidayKey(g,a-1,f)]={desc:e,txtColor:b,bgColor:c||"#DDF"}
 },holidayKey:function(c,a,b){return"h"+Rico.zFill(c,4)+Rico.zFill(a,2)+Rico.zFill(b,2)
 },atLoad:function(){Rico.log("Calendar#atLoad: "+this.id);
 }},addHoliday:function(f,a,g,e,c,b){this.Holidays[this.holidayKey(g,a-1,f)]={desc:e,txtColor:b,bgColor:c||"#DDF"}
 },holidayKey:function(c,a,b){return"h"+Rico.zFill(c,4)+Rico.zFill(a,2)+Rico.zFill(b,2)
 },atLoad:function(){Rico.log("Calendar#atLoad: "+this.id);

-this.createContainer();
-this.container.id=this.id;
-Rico.addClass(this.container,Rico.theme.calendar||"ricoCalContainer");
+var e=Rico.$(this.id);
+if(e){this.setDiv(e)
+}else{this.createContainer();
+this.container.id=this.id
+}Rico.addClass(this.content,Rico.theme.calendar||"ricoCalContainer");
+this.content.style.display="block";

 this.maintab=document.createElement("table");
 this.maintab.cellSpacing=2;
 this.maintab.cellPadding=0;
 this.maintab=document.createElement("table");
 this.maintab.cellSpacing=2;
 this.maintab.cellPadding=0;


@@ -734,49 +723,46 @@ this.maintab.style.borderCollapse="separate";
 this.maintab.className="ricoCalTab";
 if(Rico.theme.calendarTable){Rico.addClass(this.maintab,Rico.theme.calendarTable)
 }this.tbody=Rico.getTBody(this.maintab);
 this.maintab.className="ricoCalTab";
 if(Rico.theme.calendarTable){Rico.addClass(this.maintab,Rico.theme.calendarTable)
 }this.tbody=Rico.getTBody(this.maintab);

-var b,n,m,k,h,l,p,o,q,f;
+var d,l,h,g,k,n,m,o,f;

 this.colStart=this.options.showWeekNumber?1:0;
 this.colStart=this.options.showWeekNumber?1:0;

-for(k=0;
-k<7;
-k++){b=this.tbody.insertRow(-1);
-b.className="row"+k;
-for(n=0;
-n<7+this.colStart;
-n++){b.insertCell(-1)
-}}b=this.tbody.rows[0];
-b.className="ricoCalDayNames";
-if(this.options.showWeekNumber){b.cells[0].innerHTML=this.weekString;
-for(k=0;
-k<7;
-k++){this.tbody.rows[k].cells[0].className="ricoCalWeekNum"
+for(h=0;
+h<7;
+h++){d=this.tbody.insertRow(-1);
+d.className="row"+h;
+for(l=0;
+l<7+this.colStart;
+l++){d.insertCell(-1)
+}}d=this.tbody.rows[0];
+d.className="ricoCalDayNames";
+if(this.options.showWeekNumber){d.cells[0].innerHTML=this.weekString;
+for(h=0;
+h<7;
+h++){this.tbody.rows[h].cells[0].className="ricoCalWeekNum"

 }}this.styles=[];
 }}this.styles=[];

-for(k=0;
-k<7;
-k++){p=(k+this.options.startAt)%7;
-b.cells[k+this.colStart].innerHTML=Rico.dayAbbr(p);
-this.styles[k]="ricoCal"+p
-}this.thead=this.maintab.createTHead();
-b=this.thead.insertRow(-1);
-n=b.appendChild(document.createElement("th"));
-n.colSpan=7+this.colStart;
-m=n.appendChild(document.createElement("div"));
-m.className=Rico.theme.calendarHeading||"RicoCalHeading";
-m.appendChild(this._createTitleSection("Month"));
-m.appendChild(this._createTitleSection("Year"));
-new Rico.HoverSet(m.getElementsByTagName("a"));
+for(h=0;
+h<7;
+h++){n=(h+this.options.startAt)%7;
+d.cells[h+this.colStart].innerHTML=Rico.dayAbbr(n);
+this.styles[h]="ricoCal"+n
+}this.heading=this.content.appendChild(document.createElement("div"));
+this.heading.className="RicoCalHeading";
+if(Rico.theme.calendarHeading){Rico.addClass(this.heading,Rico.theme.calendarHeading)
+}var b=this.heading.appendChild(document.createElement("div"));
+b.className="RicoCalHeadingInner";
+b.appendChild(this._createTitleSection("Month"));
+b.appendChild(this._createTitleSection("Year"));
+new Rico.HoverSet(this.heading.getElementsByTagName("a"));

 new Rico.HoverSet(this.tbody.getElementsByTagName("td"),{hoverNodes:function(a){return a.innerHTML.match(/^\d+$/)?[a]:[]
 }});
 new Rico.HoverSet(this.tbody.getElementsByTagName("td"),{hoverNodes:function(a){return a.innerHTML.match(/^\d+$/)?[a]:[]
 }});

-m.appendChild(Rico.closeButton(Rico.eventHandle(this,"close")));
-if(this.options.showToday){this.tfoot=this.maintab.createTFoot();
-b=this.tfoot.insertRow(-1);
-this.todayCell=b.insertCell(-1);
+if(this.position=="absolute"){this.heading.appendChild(Rico.closeButton(Rico.eventHandle(this,"close")))
+}if(this.options.showToday){this.tfoot=this.maintab.createTFoot();
+d=this.tfoot.insertRow(-1);
+this.todayCell=d.insertCell(-1);

 this.todayCell.colSpan=7+this.colStart;
 if(Rico.theme.calendarFooter){Rico.addClass(this.todayCell,Rico.theme.calendarFooter)
 }Rico.eventBind(this.todayCell,"click",Rico.eventHandle(this,"selectNow"),false)
 }this.content.appendChild(this.maintab);
 this.todayCell.colSpan=7+this.colStart;
 if(Rico.theme.calendarFooter){Rico.addClass(this.todayCell,Rico.theme.calendarFooter)
 }Rico.eventBind(this.todayCell,"click",Rico.eventHandle(this,"selectNow"),false)
 }this.content.appendChild(this.maintab);

-var g=Rico.isIE&&Rico.ieVersion<7;
-var e={shadow:!g};
-this.monthPopup=new Rico.Popup(document.createElement("div"),e);
+this.monthPopup=new Rico.Popup(document.createElement("div"));

 this.monthPopup.closePopup();
 f=document.createElement("table");
 f.className="ricoCalMenu";
 this.monthPopup.closePopup();
 f=document.createElement("table");
 f.className="ricoCalMenu";


@@ -786,22 +772,22 @@ f.cellSpacing=0;
 f.border=0;
 f.style.borderCollapse="separate";
 f.style.margin="0px";
 f.border=0;
 f.style.borderCollapse="separate";
 f.style.margin="0px";

-for(k=0;
-k<4;
-k++){b=f.insertRow(-1);

 for(h=0;
 for(h=0;

-h<3;
-h++){n=b.insertCell(-1);
-o=document.createElement("a");
-o.innerHTML=Rico.monthAbbr(k*3+h);
-o.name=k*3+h;
-if(Rico.theme.calendarDay){Rico.addClass(o,Rico.theme.calendarDay)
-}n.appendChild(o);
-Rico.eventBind(o,"click",Rico.eventHandle(this,"selectMonth"),false)
+h<4;
+h++){d=f.insertRow(-1);
+for(g=0;
+g<3;
+g++){l=d.insertCell(-1);
+m=document.createElement("a");
+m.innerHTML=Rico.monthAbbr(h*3+g);
+m.name=h*3+g;
+if(Rico.theme.calendarDay){Rico.addClass(m,Rico.theme.calendarDay)
+}l.appendChild(m);
+Rico.eventBind(m,"click",Rico.eventHandle(this,"selectMonth"),false)

 }}new Rico.HoverSet(f.getElementsByTagName("a"));
 this.monthPopup.content.appendChild(f);
 }}new Rico.HoverSet(f.getElementsByTagName("a"));
 this.monthPopup.content.appendChild(f);

-this.content.appendChild(this.monthPopup.container);
-this.yearPopup=new Rico.Popup(document.createElement("div"),e);
+this.container.appendChild(this.monthPopup.container);
+this.yearPopup=new Rico.Popup(document.createElement("div"));

 this.yearPopup.closePopup();
 this.yearPopup.content.className="ricoCalYearPrompt";
 if(Rico.theme.calendarPopdown){Rico.addClass(this.yearPopup.content,Rico.theme.calendarPopdown)
 this.yearPopup.closePopup();
 this.yearPopup.content.className="ricoCalYearPrompt";
 if(Rico.theme.calendarPopdown){Rico.addClass(this.yearPopup.content,Rico.theme.calendarPopdown)


@@ -811,35 +797,40 @@ f.cellSpacing=0;
 f.border=0;
 f.style.borderCollapse="separate";
 f.style.margin="0px";
 f.border=0;
 f.style.borderCollapse="separate";
 f.style.margin="0px";

-b=f.insertRow(-1);
-this.yearLabel=b.insertCell(-1);
+d=f.insertRow(-1);
+this.yearLabel=d.insertCell(-1);

 this.yearLabel.colSpan=3;
 this.yearLabel.colSpan=3;

-b=f.insertRow(-1);
-n=b.insertCell(-1);
-this.yearInput=n.appendChild(document.createElement("input"));
+this.yearLabel.innerHTML=Rico.getPhraseById("calYearRange",this.options.minDate.getFullYear(),this.options.maxDate.getFullYear());
+d=f.insertRow(-1);
+l=d.insertCell(-1);
+this.yearInput=l.appendChild(document.createElement("input"));

 this.yearInput.maxlength=4;
 this.yearInput.size=4;
 this.yearInput.maxlength=4;
 this.yearInput.size=4;

-Rico.eventBind(this.yearInput,"keypress",Rico.eventHandle(this,"yearKey"),false);
-n=b.insertCell(-1);
-var o=Rico.floatButton("Checkmark",Rico.eventHandle(this,"processPopUpYear"));
-Rico.setStyle(o.firstChild,{margin:"0px",padding:"0px",border:"none"});
-n.appendChild(o);
-n=b.insertCell(-1);
-o=Rico.floatButton("Cancel",Rico.eventHandle(this,"popDownYear"));
-Rico.setStyle(o.firstChild,{margin:"0px",padding:"0px",border:"none"});
-n.appendChild(o);
+Rico.eventBind(this.yearInput,"keyup",Rico.eventHandle(this,"yearKey"),false);
+l=d.insertCell(-1);
+var m=Rico.floatButton("Checkmark",Rico.eventHandle(this,"processPopUpYear"));
+Rico.setStyle(m.firstChild,{margin:"0px",padding:"0px",border:"none"});
+l.appendChild(m);
+l=d.insertCell(-1);
+m=Rico.floatButton("Cancel",Rico.eventHandle(this,"popDownYear"));
+Rico.setStyle(m.firstChild,{margin:"0px",padding:"0px",border:"none"});
+l.appendChild(m);

 this.yearPopup.content.appendChild(f);
 this.yearPopup.content.appendChild(f);

-this.content.appendChild(this.yearPopup.container);
-o=this.content.getElementsByTagName("a");
-for(k=0;
-k<o.length;
-k++){o[k].href="javascript:void(0)"
+this.container.appendChild(this.yearPopup.container);
+this.yearPopup.container.style.left="";
+this.yearPopup.container.style.right="5px";
+this.yearPopup.container.style.zIndex=10;
+m=this.content.getElementsByTagName("a");
+for(h=0;
+h<m.length;
+h++){m[h].href="javascript:void(0)"

 }Rico.eventBind(this.tbody,"click",Rico.eventHandle(this,"saveAndClose"));
 this.close();
 this.bPageLoaded=true
 },_createTitleSection:function(d){var c=document.createElement("span");
 c.className="RicoCal"+d+"Heading";
 }Rico.eventBind(this.tbody,"click",Rico.eventHandle(this,"saveAndClose"));
 this.close();
 this.bPageLoaded=true
 },_createTitleSection:function(d){var c=document.createElement("span");
 c.className="RicoCal"+d+"Heading";

-var b=c.appendChild(document.createElement("a"));
+if(Rico.theme.calendarSubheading){Rico.addClass(c,Rico.theme.calendarSubheading)
+}var b=c.appendChild(document.createElement("a"));

 b.className="Rico_leftArrow";
 if(Rico.theme.leftArrowAnchor){Rico.addClass(b,Rico.theme.leftArrowAnchor)
 }b.appendChild(this.createNavArrow("dec"+d,"left"));
 b.className="Rico_leftArrow";
 if(Rico.theme.leftArrowAnchor){Rico.addClass(b,Rico.theme.leftArrowAnchor)
 }b.appendChild(this.createNavArrow("dec"+d,"left"));


@@ -888,24 +879,25 @@ this.constructCalendar()
 this.monthSelected=parseInt(a.name,10);
 this.constructCalendar();
 Rico.eventStop(b)
 this.monthSelected=parseInt(a.name,10);
 this.constructCalendar();
 Rico.eventStop(b)

-},popUpMonth:function(a){if(this.monthPopup.visible()){this.popDownMonth();
+},popUpMonth:function(a){Rico.eventStop(a);
+if(this.monthPopup.visible()){this.popDownMonth();

 return
 }this.popDownYear();
 return
 }this.popDownYear();

-this.monthPopup.openPopup(this.titleMonth.parentNode.offsetLeft,this.thead.offsetHeight+2);
-Rico.eventStop(a);
-return false
+if(Rico.isIE&&Rico.ieVersion<7){this.monthPopup.openPopup(null,this.heading.offsetHeight+2);
+this.monthPopup.container.style.left=""
+}else{this.monthPopup.openPopup(3,this.heading.offsetHeight+2)
+}return false

 },popDownMonth:function(){this.monthPopup.closePopup()
 },popDownYear:function(){this.yearPopup.closePopup();
 this.yearInput.disabled=true
 },popDownMonth:function(){this.monthPopup.closePopup()
 },popDownYear:function(){this.yearPopup.closePopup();
 this.yearInput.disabled=true

-},popUpYear:function(a){if(this.yearPopup.visible()){this.popDownYear();
+},popUpYear:function(a){Rico.eventStop(a);
+if(this.yearPopup.visible()){this.popDownYear();

 return
 }this.popDownMonth();
 return
 }this.popDownMonth();

-this.yearPopup.openPopup(90,this.thead.offsetHeight+2);
-this.yearLabel.innerHTML=Rico.getPhraseById("calYearRange",this.options.minDate.getFullYear(),this.options.maxDate.getFullYear());
+this.yearPopup.openPopup(null,this.heading.offsetHeight+2);

 this.yearInput.disabled=false;
 this.yearInput.value="";
 this.yearInput.focus();
 this.yearInput.disabled=false;
 this.yearInput.value="";
 this.yearInput.focus();

-Rico.eventStop(a);

 return false
 },yearKey:function(a){switch(Rico.eventKey(a)){case 27:this.popDownYear();
 Rico.eventStop(a);
 return false
 },yearKey:function(a){switch(Rico.eventKey(a)){case 27:this.popDownYear();
 Rico.eventStop(a);


@@ -1648,7 +1640,7 @@ a<this.columns.length;
 a++){this.columns[a].insertResizer()
 }},createDivs:function(){Rico.log("createDivs start");
 this.outerDiv=this.createDiv("outer");
 a++){this.columns[a].insertResizer()
 }},createDivs:function(){Rico.log("createDivs start");
 this.outerDiv=this.createDiv("outer");

-if(Rico.theme.widget){Rico.addClass(this.outerDiv,Rico.theme.widget)
+if(Rico.theme.gridContainer){Rico.addClass(this.outerDiv,Rico.theme.gridContainer)

 }if(this.outerDiv.firstChild&&this.outerDiv.firstChild.tagName&&this.outerDiv.firstChild.tagName.toUpperCase()=="TABLE"){this.structTab=this.outerDiv.firstChild;
 this.structTabLeft=this.structTab.rows[0].cells[0];
 this.structTabUR=this.structTab.rows[0].cells[1];
 }if(this.outerDiv.firstChild&&this.outerDiv.firstChild.tagName&&this.outerDiv.firstChild.tagName.toUpperCase()=="TABLE"){this.structTab=this.outerDiv.firstChild;
 this.structTabLeft=this.structTab.rows[0].cells[0];
 this.structTabUR=this.structTab.rows[0].cells[1];


@@ -2245,7 +2237,7 @@ if(b.format.exportPrefix){a=b.format.exportPrefix+a
 }if(a==""){a="&nbsp;"
 }d+="<td style='"+this.exportStyle(b.cell(e),f)+"'>"+a+"</td>"
 }}this.exportRows.push(d)
 }if(a==""){a="&nbsp;"
 }d+="<td style='"+this.exportStyle(b.cell(e),f)+"'>"+a+"</td>"
 }}this.exportRows.push(d)

-}this.exportFinish(exportType)
+}this.exportFinish()

 },hideRow:function(a){if(this.columns[0].cell(a).style.display=="none"){return
 }for(var b=0;
 b<this.columns.length;
 },hideRow:function(a){if(this.columns[0].cell(a).style.display=="none"){return
 }for(var b=0;
 b<this.columns.length;


@@ -4300,7 +4292,7 @@ a<this.grid.columns.length;
 a++){if(this.grid.columns[a].format&&this.grid.columns[a].format.isKey){this.keys.push({colidx:a})
 }}},createEditDiv:function(){this.requestCount=1;
 this.formPopup=this.createWindow();
 a++){if(this.grid.columns[a].format&&this.grid.columns[a].format.isKey){this.keys.push({colidx:a})
 }}},createEditDiv:function(){this.requestCount=1;
 this.formPopup=this.createWindow();

-Rico.addClass(this.formPopup.content,"ricoLG_editDiv");
+Rico.addClass(this.formPopup.content.parentNode,"ricoLG_editDiv");

 if(this.options.canEdit||this.options.canAdd){this.startForm();
 this.createForm(this.form)
 }else{var a=this.createButton(Rico.getPhraseById("close"));
 if(this.options.canEdit||this.options.canAdd){this.startForm();
 this.createForm(this.form)
 }else{var a=this.createButton(Rico.getPhraseById("close"));