Updated Rico2 and Rico3 with fixes for IE9. Updated Rico2 version to 2.3. Updated...

Still need to update min.rico.js in Rico2.

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

diff --git a/examples/ChangesSinceRico2.txt b/examples/ChangesSinceRico2.txt
index 6942e00..5f9a015 100644 (file)
--- a/examples/ChangesSinceRico2.txt
+++ b/examples/ChangesSinceRico2.txt
@@ -3,7 +3,8 @@ included:
 
 1) More themes of higher quality. This was achieved by making Rico compatible
 with jQuery Themeroller. Even better, the use of Themeroller themes does not require
-the use of jQuery.
+the use of jQuery. LiveGrid striping is defined for all of the Rico AND Themeroller
+themes.
 
 2) Break Rico's dependence on Prototype. Rico can still run with Prototype,
 but it can also run with jQuery, MooTools, dojo, ext (core), or Glow.

diff --git a/examples/asp/LoadRicoClient.asp b/examples/asp/LoadRicoClient.asp
index 8e405f5..54a9dde 100644 (file)
--- a/examples/asp/LoadRicoClient.asp
+++ b/examples/asp/LoadRicoClient.asp
@@ -106,7 +106,7 @@ sub LoadTheme(theme)
     case "r":\r
       requireRicoCSS themeFile\r
   end select\r
-  if grid_striping then Response.Write vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "striping/" & themeFile & ".css' />"\r
+  if grid_striping then Response.Write vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "striping_" & themeFile & ".css' />"\r
 end sub\r
 \r
 \r

diff --git a/examples/dotnet/LoadRicoClient.ascx b/examples/dotnet/LoadRicoClient.ascx
index f3bb9fd..a4d43c0 100644 (file)
--- a/examples/dotnet/LoadRicoClient.ascx
+++ b/examples/dotnet/LoadRicoClient.ascx
@@ -149,7 +149,7 @@ Protected sub LoadTheme(writer as HTMLTextWriter, theme as String)
     case "r":\r
       requireRicoCSS(writer, themeFile)\r
   end select\r
-  if grid_striping then writer.Write(vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "striping/" & themeFile & ".css' />")\r
+  if grid_striping then writer.Write(vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "striping_" & themeFile & ".css' />")\r
 end sub\r
 \r
 \r

diff --git a/examples/html/LoadRicoClient.js b/examples/html/LoadRicoClient.js
index c2d0306..2d01c93 100644 (file)
--- a/examples/html/LoadRicoClient.js
+++ b/examples/html/LoadRicoClient.js
@@ -64,7 +64,7 @@ Rico_CONFIG = {
         this.requireRicoCSS(theme);\r
         break;\r
     }\r
-    if (this.grid_striping) document.write("<link type='text/css' rel='stylesheet' href='"+this.cssDir+"striping/"+theme+".css' />");\r
+    if (this.grid_striping) document.write("<link type='text/css' rel='stylesheet' href='"+this.cssDir+"striping_"+theme+".css' />");\r
   },\r
 \r
   requireRicoJS: function(filename) {\r

diff --git a/examples/php/LoadRicoClient.php b/examples/php/LoadRicoClient.php
index add8257..ae580b0 100644 (file)
--- a/examples/php/LoadRicoClient.php
+++ b/examples/php/LoadRicoClient.php
@@ -96,7 +96,7 @@ function LoadTheme($theme) {
       break;\r
   }\r
   if ($grid_striping) {\r
-    echo "<link type='text/css' rel='stylesheet' href='".$cssDir."striping/".$theme.".css' />";\r
+    echo "<link type='text/css' rel='stylesheet' href='".$cssDir."striping_".$theme.".css' />";\r
   }\r
 }\r
 \r

diff --git a/plugins/dotnet/ricoResponse.ascx b/plugins/dotnet/ricoResponse.ascx
index 615de3b..dc4e965 100644 (file)
--- a/plugins/dotnet/ricoResponse.ascx
+++ b/plugins/dotnet/ricoResponse.ascx
@@ -46,7 +46,9 @@ Protected Sub Page_Init(Sender As object, e As EventArgs)
   dim sHidden as string        = trim(Request.QueryString("hidden"))\r
   if not IsNumeric(sRequestOffset) then sRequestOffset="0"\r
 \r
+  if sRequestOffset<>"" then sRequestOffset=Regex.Replace( sRequestOffset, "[^0-9-]", "" )\r
   if sRequestOffset<>"" then offset=CLng(sRequestOffset)\r
+  if sRequestSize<>"" then sRequestSize=Regex.Replace( sRequestSize, "[^0-9-]", "" )\r
   if sRequestSize<>"" then numrows=CLng(sRequestSize)\r
   if sDistinct<>"" then distinctCol=CLng(sDistinct)\r
   if sEdit<>"" then editCol=CLng(sEdit)\r
@@ -84,13 +86,21 @@ Public Sub RunQuery(writer as HTMLTextWriter)
       SendHdg=true\r
     case "xl":\r
       Response.ContentType="application/vnd.ms-excel"\r
-      writer.WriteLine("<html><head></head><body>")\r
-      closetags="</body></html>"\r
-      RowsStart=vbLf & "<table>"\r
-      RowsEnd=vbLf & "</table>"\r
+      Response.AddHeader("Content-Disposition", "attachment; filename=" & RequestId & ".xml")\r
+      writer.WriteLine("<?xml version='1.0' encoding='iso-8859-1'?>")\r
+      writer.WriteLine("<?mso-application progid='Excel.Sheet'?>")\r
+      writer.WriteLine("<s:Workbook xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:s='urn:schemas-microsoft-com:office:spreadsheet'>")\r
+      writer.WriteLine("  <s:Styles>")\r
+      writer.WriteLine("    <s:Style s:ID='sDate'><s:NumberFormat s:Format='Short Date' /></s:Style>")\r
+      writer.WriteLine("  </s:Styles>")\r
+      writer.WriteLine("  <s:Worksheet s:Name='" & RequestId & "'>")\r
+      closetags="</s:Worksheet></s:Workbook>"\r
+      RowsStart=vbLf & "<s:Table>"\r
+      RowsEnd=vbLf & "</s:Table>"\r
+\r
       gettotal=false\r
       sendDebugMsgs=false\r
-      SendHdg=true\r
+      AllRowsMax=65534  ' allow 1 row for heading\r
     case "json":\r
       Response.ContentType="application/json"\r
       writer.Write("{" & vbLf & """id"":""" & RequestId & """")\r
@@ -185,7 +195,7 @@ end sub
 \r
 ' returns the total number of rows produced by the query (or -1 if unknown)\r
 Protected Function RenderQueryRows(writer as HTMLTextWriter) As Integer\r
-  dim rowcnt as integer, fldNum as integer, dbDate as DateTime, strFieldItem as String\r
+  dim rowcnt as integer, fldNum as integer, dbDate as DateTime, strFieldItem as String, fldType as String, fldAttr as String\r
   dim firstCol as Integer=0, limitQuery as Boolean=false, eof as Boolean=false, n as String\r
   dim rdr as object\r
   dim totcnt as Integer=0\r
@@ -204,7 +214,7 @@ Protected Function RenderQueryRows(writer as HTMLTextWriter) As Integer
       oParse.ParseSelect(sqlText)\r
       ApplyQStringParms()\r
       sqlText=oParse.UnparseSelect()\r
-    elseif numrows < 0 then\r
+    elseif numrows < 0 or offset=0 then\r
       ApplyQStringParms()\r
       sqlText=oParse.UnparseSelectSkip(HiddenCols)\r
     else\r
@@ -251,81 +261,126 @@ Protected Function RenderQueryRows(writer as HTMLTextWriter) As Integer
 \r
   rowcnt=0\r
   if numrows < 0 then numrows=AllRowsMax\r
-  if fmt="json" then\r
-    if SendHdg then\r
-      writer.Write(vbLf & "[")\r
-      for fldNum=firstCol to rdr.FieldCount -1\r
-        if IsNothing(oParse) then\r
-          n=Nothing\r
-        else\r
-          n=oParse.Headings(fldNum-firstCol)\r
-        end if\r
-        if IsNothing(n) then n=rdr.GetName(fldNum)\r
-        writer.Write("""" & escapeJSON(n) & """")\r
-      next\r
-      writer.Write("]")\r
-    end if\r
-    while (rowcnt < numrows) and (not eof)\r
-      if rdr.Read() then\r
-        if rowcnt > 0 or SendHdg then writer.Write(",")\r
+  select case fmt\r
+\r
+    case "json":\r
+      if SendHdg then\r
         writer.Write(vbLf & "[")\r
-        for fldNum = firstCol to rdr.FieldCount -1\r
-          strFieldItem = ""\r
-          if not rdr.IsDBNull(fldNum) then\r
-            select case rdr.GetFieldType(fldNum).Name\r
-              case "DateTime":\r
-                dbDate=rdr.GetDateTime(fldNum)\r
-                strFieldItem = replace(dbDate.ToString("s"),"T"," ")  ' convert to ISO-8601 format\r
-              case else:\r
-                strFieldItem = escapeJSON(rdr.GetValue(fldNum))\r
-            end select\r
+        for fldNum=firstCol to rdr.FieldCount -1\r
+          if IsNothing(oParse) then\r
+            n=Nothing\r
+          else\r
+            n=oParse.Headings(fldNum-firstCol)\r
           end if\r
-          if fldNum > firstCol then writer.Write(",")\r
-          writer.Write("""" & strFieldItem & """")\r
+          if IsNothing(n) then n=rdr.GetName(fldNum)\r
+          writer.Write("""" & escapeJSON(n) & """")\r
         next\r
         writer.Write("]")\r
-        rowcnt += 1\r
-      else\r
-        eof=true\r
       end if\r
-    end while\r
-  else\r
-    if SendHdg then\r
-      writer.Write(vbLf & "<tr>")\r
-      for fldNum=firstCol to rdr.FieldCount -1\r
+      while (rowcnt < numrows) and (not eof)\r
+        if rdr.Read() then\r
+          if rowcnt > 0 or SendHdg then writer.Write(",")\r
+          writer.Write(vbLf & "[")\r
+          for fldNum = firstCol to rdr.FieldCount -1\r
+            strFieldItem = ""\r
+            if not rdr.IsDBNull(fldNum) then\r
+              select case rdr.GetFieldType(fldNum).Name\r
+                case "DateTime":\r
+                  dbDate=rdr.GetDateTime(fldNum)\r
+                  strFieldItem = replace(dbDate.ToString("s"),"T"," ")  ' convert to ISO-8601 format\r
+                case else:\r
+                  strFieldItem = escapeJSON(rdr.GetValue(fldNum))\r
+              end select\r
+            end if\r
+            if fldNum > firstCol then writer.Write(",")\r
+            writer.Write("""" & strFieldItem & """")\r
+          next\r
+          writer.Write("]")\r
+          rowcnt += 1\r
+        else\r
+          eof=true\r
+        end if\r
+      end while\r
+\r
+    case "xl":\r
+      writer.Write(vbLf & "<s:Row>")\r
+      for fldNum=firstCol to rdr.FieldCount-1\r
         if IsNothing(oParse) then\r
           n=Nothing\r
         else\r
           n=oParse.Headings(fldNum-firstCol)\r
         end if\r
         if IsNothing(n) then n=rdr.GetName(fldNum)\r
-        writer.Write("<td>" & server.HTMLEncode(n) & "</td>")\r
+        writer.Write("<s:Cell><s:Data s:Type='String'>" & server.HTMLEncode(n) & "</s:Data></s:Cell>")\r
       next\r
-      writer.Write("</tr>")\r
-    end if\r
-    while (rowcnt < numrows) and (not eof)\r
-      if rdr.Read() then\r
-        rowcnt += 1\r
-        writer.Write("<tr>")\r
-        for fldNum = firstCol to rdr.FieldCount -1\r
-          strFieldItem = ""\r
-          if not rdr.IsDBNull(fldNum) then\r
-            select case rdr.GetFieldType(fldNum).Name\r
-              case "DateTime":\r
-                dbDate=rdr.GetDateTime(fldNum)\r
-                strFieldItem = replace(dbDate.ToString("s"),"T"," ")  ' convert to ISO-8601 format\r
-              case else:\r
-                strFieldItem = server.HTMLEncode(rdr.GetValue(fldNum))\r
-            end select\r
+      writer.Write("</s:Row>")\r
+      while (rowcnt < numrows) and (not eof)\r
+        if rdr.Read() then\r
+          rowcnt += 1\r
+          writer.Write("<s:Row>")\r
+          for fldNum = firstCol to rdr.FieldCount -1\r
+            strFieldItem = ""\r
+            fldAttr = ""\r
+            fldType = "String"\r
+            if not rdr.IsDBNull(fldNum) then\r
+              select case UCase(Left(rdr.GetFieldType(fldNum).Name, 3))\r
+                case "DAT":\r
+                  dbDate=rdr.GetDateTime(fldNum)\r
+                  strFieldItem = dbDate.ToString("s")  ' convert to ISO-8601 format\r
+                  fldType = "DateTime"\r
+                  fldAttr = " s:StyleID='sDate'"\r
+                case "INT", "DOU", "DEC":\r
+                  strFieldItem = CStr(rdr.GetValue(fldNum))\r
+                  fldType = "Number"\r
+                case else:\r
+                  strFieldItem = server.HTMLEncode(rdr.GetValue(fldNum))\r
+              end select\r
+            end if\r
+            writer.Write("<s:Cell" & fldAttr & "><s:Data s:Type='" & fldType & "'>" & strFieldItem & "</s:Data></s:Cell>")\r
+          next\r
+          writer.Write("</s:Row>")\r
+        else\r
+          eof=true\r
+        end if\r
+      end while\r
+\r
+    case else:\r
+      if SendHdg then\r
+        writer.Write(vbLf & "<tr>")\r
+        for fldNum=firstCol to rdr.FieldCount -1\r
+          if IsNothing(oParse) then\r
+            n=Nothing\r
+          else\r
+            n=oParse.Headings(fldNum-firstCol)\r
           end if\r
-          writer.Write("<td>" & strFieldItem & "</td>")\r
+          if IsNothing(n) then n=rdr.GetName(fldNum)\r
+          writer.Write("<td>" & server.HTMLEncode(n) & "</td>")\r
         next\r
         writer.Write("</tr>")\r
-      else\r
-        eof=true\r
       end if\r
-    end while\r
-  end if\r
+      while (rowcnt < numrows) and (not eof)\r
+        if rdr.Read() then\r
+          rowcnt += 1\r
+          writer.Write("<tr>")\r
+          for fldNum = firstCol to rdr.FieldCount -1\r
+            strFieldItem = ""\r
+            if not rdr.IsDBNull(fldNum) then\r
+              select case rdr.GetFieldType(fldNum).Name\r
+                case "DateTime":\r
+                  dbDate=rdr.GetDateTime(fldNum)\r
+                  strFieldItem = replace(dbDate.ToString("s"),"T"," ")  ' convert to ISO-8601 format\r
+                case else:\r
+                  strFieldItem = server.HTMLEncode(rdr.GetValue(fldNum))\r
+              end select\r
+            end if\r
+            writer.Write("<td>" & strFieldItem & "</td>")\r
+          next\r
+          writer.Write("</tr>")\r
+        else\r
+          eof=true\r
+        end if\r
+      end while\r
+  end select\r
   totcnt += rowcnt\r
 \r
   if not eof and gettotal then\r

diff --git a/ricoClient/css/striping/black-tie.css b/ricoClient/css/striping/black-tie.css
deleted file mode 100644 (file)
index a7793bf..0000000
--- a/ricoClient/css/striping/black-tie.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow {  background-color: #FFF; }\r

diff --git a/ricoClient/css/striping/blitzer.css b/ricoClient/css/striping/blitzer.css
deleted file mode 100644 (file)
index da846a7..0000000
--- a/ricoClient/css/striping/blitzer.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #F9F9F9; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/coffee-with-milk.css b/ricoClient/css/striping/coffee-with-milk.css
deleted file mode 100644 (file)
index 4fd9ac1..0000000
--- a/ricoClient/css/striping/coffee-with-milk.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.ricoLG_bottom div.ricoLG_oddRow {\r
-  background-color:#F7F4EE;\r
-  border-top: 1px solid #EBE5D9;\r
-  border-bottom: 1px solid #EBE5D9;\r
-}\r
-.ricoLG_bottom div.ricoLG_evenRow {\r
-  border-top: 1px solid #FFF;\r
-  border-bottom: 1px solid #FFF;\r
-}\r

diff --git a/ricoClient/css/striping/cupertino.css b/ricoClient/css/striping/cupertino.css
deleted file mode 100644 (file)
index c9c9c0f..0000000
--- a/ricoClient/css/striping/cupertino.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #F9FAFB; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/dark-hive.css b/ricoClient/css/striping/dark-hive.css
deleted file mode 100644 (file)
index 415bd60..0000000
--- a/ricoClient/css/striping/dark-hive.css
+++ /dev/null
@@ -1,5 +0,0 @@
-\r
-.ricoLG_oddRow {  color: #64A7C4; }\r
-/*\r
-.ricoLG_oddRow {  background-color: #474747; }\r
-*/\r

diff --git a/ricoClient/css/striping/dot-luv.css b/ricoClient/css/striping/dot-luv.css
deleted file mode 100644 (file)
index 93036c9..0000000
--- a/ricoClient/css/striping/dot-luv.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow {  background-color: #0A3561; }\r

diff --git a/ricoClient/css/striping/eggplant.css b/ricoClient/css/striping/eggplant.css
deleted file mode 100644 (file)
index bf678e4..0000000
--- a/ricoClient/css/striping/eggplant.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #5C5662; }\r
-div.ricoLG_oddRow {  background-color: #3D3644; }\r

diff --git a/ricoClient/css/striping/excite-bike.css b/ricoClient/css/striping/excite-bike.css
deleted file mode 100644 (file)
index f4e9683..0000000
--- a/ricoClient/css/striping/excite-bike.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #eeeeee; }\r

diff --git a/ricoClient/css/striping/flick.css b/ricoClient/css/striping/flick.css
deleted file mode 100644 (file)
index 475fb5f..0000000
--- a/ricoClient/css/striping/flick.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow {  background-color: #F6F6F6; }\r

diff --git a/ricoClient/css/striping/grayedout.css b/ricoClient/css/striping/grayedout.css
deleted file mode 100644 (file)
index 99e588b..0000000
--- a/ricoClient/css/striping/grayedout.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.ricoLG_oddRow {\r
-       background-color: #EEE;\r
-}\r

diff --git a/ricoClient/css/striping/greenHdg.css b/ricoClient/css/striping/greenHdg.css
deleted file mode 100644 (file)
index 406b9de..0000000
--- a/ricoClient/css/striping/greenHdg.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.ricoLG_evenRow   { }\r
-.ricoLG_oddRow    { background-color: #EEE; }\r

diff --git a/ricoClient/css/striping/hot-sneaks.css b/ricoClient/css/striping/hot-sneaks.css
deleted file mode 100644 (file)
index 20ce4fa..0000000
--- a/ricoClient/css/striping/hot-sneaks.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #93C3CD; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/humanity.css b/ricoClient/css/striping/humanity.css
deleted file mode 100644 (file)
index 7dfc97a..0000000
--- a/ricoClient/css/striping/humanity.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #f8f4f0; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/le-frog.css b/ricoClient/css/striping/le-frog.css
deleted file mode 100644 (file)
index e2c4b17..0000000
--- a/ricoClient/css/striping/le-frog.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow {  background-color: #619A35; }\r

diff --git a/ricoClient/css/striping/mint-choc.css b/ricoClient/css/striping/mint-choc.css
deleted file mode 100644 (file)
index b7a9a19..0000000
--- a/ricoClient/css/striping/mint-choc.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #977C68; }\r
-div.ricoLG_oddRow {  background-color: #685648; }\r

diff --git a/ricoClient/css/striping/overcast.css b/ricoClient/css/striping/overcast.css
deleted file mode 100644 (file)
index 6ab9b17..0000000
--- a/ricoClient/css/striping/overcast.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #C9C9C9; }\r
-div.ricoLG_oddRow {  background-color: #D9D9D9; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/pepper-grinder.css b/ricoClient/css/striping/pepper-grinder.css
deleted file mode 100644 (file)
index 4870f62..0000000
--- a/ricoClient/css/striping/pepper-grinder.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow { background:#F8F7F6 url(http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png) repeat scroll 50% 50%; }\r

diff --git a/ricoClient/css/striping/redmond.css b/ricoClient/css/striping/redmond.css
deleted file mode 100644 (file)
index a97af07..0000000
--- a/ricoClient/css/striping/redmond.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #EEF5FB; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/seaglass.css b/ricoClient/css/striping/seaglass.css
deleted file mode 100644 (file)
index 857f3be..0000000
--- a/ricoClient/css/striping/seaglass.css
+++ /dev/null
@@ -1 +0,0 @@
-.ricoLG_oddRow  { background: #DBE6DD; }\r

diff --git a/ricoClient/css/striping/smoothness.css b/ricoClient/css/striping/smoothness.css
deleted file mode 100644 (file)
index 881cd6f..0000000
--- a/ricoClient/css/striping/smoothness.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #ececec; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/south-street.css b/ricoClient/css/striping/south-street.css
deleted file mode 100644 (file)
index d3ade2f..0000000
--- a/ricoClient/css/striping/south-street.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #FCFCF9; }\r
-div.ricoLG_oddRow {  background-color: #F5F3E5; }\r

diff --git a/ricoClient/css/striping/start.css b/ricoClient/css/striping/start.css
deleted file mode 100644 (file)
index a384e6a..0000000
--- a/ricoClient/css/striping/start.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #CEE6F0; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/sunny.css b/ricoClient/css/striping/sunny.css
deleted file mode 100644 (file)
index 7e5def8..0000000
--- a/ricoClient/css/striping/sunny.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #FEF8E4; }\r
-div.ricoLG_oddRow {  background-color: #FEEEBD; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/ui-darkness.css b/ricoClient/css/striping/ui-darkness.css
deleted file mode 100644 (file)
index 05369a5..0000000
--- a/ricoClient/css/striping/ui-darkness.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #000000; }\r
-div.ricoLG_oddRow {  background-color: #2c2c2c; }\r

diff --git a/ricoClient/css/striping/ui-lightness.css b/ricoClient/css/striping/ui-lightness.css
deleted file mode 100644 (file)
index c0b5be7..0000000
--- a/ricoClient/css/striping/ui-lightness.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.ricoLG_evenRow {  background-color: #ffffff; }\r
-div.ricoLG_oddRow {  background-color: #eeeeee; }\r
-.ricoLG_bottom div.ui-state-hover {\r
-  border-left: none;\r
-  border-top: none;\r
-  border-right: none;\r
-}\r

diff --git a/ricoClient/css/striping/vader.css b/ricoClient/css/striping/vader.css
deleted file mode 100644 (file)
index f0d2f4d..0000000
--- a/ricoClient/css/striping/vader.css
+++ /dev/null
@@ -1,2 +0,0 @@
-div.ricoLG_evenRow {  background-color: #000000; }\r
-div.ricoLG_oddRow {  background-color: #4c4c4c; }\r

diff --git a/ricoClient/css/striping/warmfall.css b/ricoClient/css/striping/warmfall.css
deleted file mode 100644 (file)
index 72d9bfd..0000000
--- a/ricoClient/css/striping/warmfall.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.ricoLG_oddRow {\r
-       background-color: #fffad0;\r
-       color: #101011;\r
-}\r
-\r

diff --git a/ricoClient/css/striping_black-tie.css b/ricoClient/css/striping_black-tie.css
new file mode 100644 (file)
index 0000000..a7793bf
--- /dev/null
+++ b/ricoClient/css/striping_black-tie.css
@@ -0,0 +1 @@
+.ricoLG_oddRow {  background-color: #FFF; }\r

diff --git a/ricoClient/css/striping_blitzer.css b/ricoClient/css/striping_blitzer.css
new file mode 100644 (file)
index 0000000..da846a7
--- /dev/null
+++ b/ricoClient/css/striping_blitzer.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #F9F9F9; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_coffee-with-milk.css b/ricoClient/css/striping_coffee-with-milk.css
new file mode 100644 (file)
index 0000000..4fd9ac1
--- /dev/null
+++ b/ricoClient/css/striping_coffee-with-milk.css
@@ -0,0 +1,9 @@
+.ricoLG_bottom div.ricoLG_oddRow {\r
+  background-color:#F7F4EE;\r
+  border-top: 1px solid #EBE5D9;\r
+  border-bottom: 1px solid #EBE5D9;\r
+}\r
+.ricoLG_bottom div.ricoLG_evenRow {\r
+  border-top: 1px solid #FFF;\r
+  border-bottom: 1px solid #FFF;\r
+}\r

diff --git a/ricoClient/css/striping_cupertino.css b/ricoClient/css/striping_cupertino.css
new file mode 100644 (file)
index 0000000..c9c9c0f
--- /dev/null
+++ b/ricoClient/css/striping_cupertino.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #F9FAFB; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_dark-hive.css b/ricoClient/css/striping_dark-hive.css
new file mode 100644 (file)
index 0000000..415bd60
--- /dev/null
+++ b/ricoClient/css/striping_dark-hive.css
@@ -0,0 +1,5 @@
+\r
+.ricoLG_oddRow {  color: #64A7C4; }\r
+/*\r
+.ricoLG_oddRow {  background-color: #474747; }\r
+*/\r

diff --git a/ricoClient/css/striping_dot-luv.css b/ricoClient/css/striping_dot-luv.css
new file mode 100644 (file)
index 0000000..93036c9
--- /dev/null
+++ b/ricoClient/css/striping_dot-luv.css
@@ -0,0 +1 @@
+.ricoLG_oddRow {  background-color: #0A3561; }\r

diff --git a/ricoClient/css/striping_eggplant.css b/ricoClient/css/striping_eggplant.css
new file mode 100644 (file)
index 0000000..bf678e4
--- /dev/null
+++ b/ricoClient/css/striping_eggplant.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #5C5662; }\r
+div.ricoLG_oddRow {  background-color: #3D3644; }\r

diff --git a/ricoClient/css/striping_excite-bike.css b/ricoClient/css/striping_excite-bike.css
new file mode 100644 (file)
index 0000000..f4e9683
--- /dev/null
+++ b/ricoClient/css/striping_excite-bike.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #eeeeee; }\r

diff --git a/ricoClient/css/striping_flick.css b/ricoClient/css/striping_flick.css
new file mode 100644 (file)
index 0000000..475fb5f
--- /dev/null
+++ b/ricoClient/css/striping_flick.css
@@ -0,0 +1 @@
+.ricoLG_oddRow {  background-color: #F6F6F6; }\r

diff --git a/ricoClient/css/striping_grayedout.css b/ricoClient/css/striping_grayedout.css
new file mode 100644 (file)
index 0000000..99e588b
--- /dev/null
+++ b/ricoClient/css/striping_grayedout.css
@@ -0,0 +1,3 @@
+.ricoLG_oddRow {\r
+       background-color: #EEE;\r
+}\r

diff --git a/ricoClient/css/striping_greenHdg.css b/ricoClient/css/striping_greenHdg.css
new file mode 100644 (file)
index 0000000..406b9de
--- /dev/null
+++ b/ricoClient/css/striping_greenHdg.css
@@ -0,0 +1,2 @@
+.ricoLG_evenRow   { }\r
+.ricoLG_oddRow    { background-color: #EEE; }\r

diff --git a/ricoClient/css/striping_hot-sneaks.css b/ricoClient/css/striping_hot-sneaks.css
new file mode 100644 (file)
index 0000000..20ce4fa
--- /dev/null
+++ b/ricoClient/css/striping_hot-sneaks.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #93C3CD; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_humanity.css b/ricoClient/css/striping_humanity.css
new file mode 100644 (file)
index 0000000..7dfc97a
--- /dev/null
+++ b/ricoClient/css/striping_humanity.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #f8f4f0; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_le-frog.css b/ricoClient/css/striping_le-frog.css
new file mode 100644 (file)
index 0000000..e2c4b17
--- /dev/null
+++ b/ricoClient/css/striping_le-frog.css
@@ -0,0 +1 @@
+.ricoLG_oddRow {  background-color: #619A35; }\r

diff --git a/ricoClient/css/striping_mint-choc.css b/ricoClient/css/striping_mint-choc.css
new file mode 100644 (file)
index 0000000..b7a9a19
--- /dev/null
+++ b/ricoClient/css/striping_mint-choc.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #977C68; }\r
+div.ricoLG_oddRow {  background-color: #685648; }\r

diff --git a/ricoClient/css/striping_overcast.css b/ricoClient/css/striping_overcast.css
new file mode 100644 (file)
index 0000000..6ab9b17
--- /dev/null
+++ b/ricoClient/css/striping_overcast.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #C9C9C9; }\r
+div.ricoLG_oddRow {  background-color: #D9D9D9; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_pepper-grinder.css b/ricoClient/css/striping_pepper-grinder.css
new file mode 100644 (file)
index 0000000..4870f62
--- /dev/null
+++ b/ricoClient/css/striping_pepper-grinder.css
@@ -0,0 +1 @@
+.ricoLG_oddRow { background:#F8F7F6 url(http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png) repeat scroll 50% 50%; }\r

diff --git a/ricoClient/css/striping_redmond.css b/ricoClient/css/striping_redmond.css
new file mode 100644 (file)
index 0000000..a97af07
--- /dev/null
+++ b/ricoClient/css/striping_redmond.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #EEF5FB; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_seaglass.css b/ricoClient/css/striping_seaglass.css
new file mode 100644 (file)
index 0000000..857f3be
--- /dev/null
+++ b/ricoClient/css/striping_seaglass.css
@@ -0,0 +1 @@
+.ricoLG_oddRow  { background: #DBE6DD; }\r

diff --git a/ricoClient/css/striping_smoothness.css b/ricoClient/css/striping_smoothness.css
new file mode 100644 (file)
index 0000000..881cd6f
--- /dev/null
+++ b/ricoClient/css/striping_smoothness.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #ececec; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_south-street.css b/ricoClient/css/striping_south-street.css
new file mode 100644 (file)
index 0000000..d3ade2f
--- /dev/null
+++ b/ricoClient/css/striping_south-street.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #FCFCF9; }\r
+div.ricoLG_oddRow {  background-color: #F5F3E5; }\r

diff --git a/ricoClient/css/striping_start.css b/ricoClient/css/striping_start.css
new file mode 100644 (file)
index 0000000..a384e6a
--- /dev/null
+++ b/ricoClient/css/striping_start.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #CEE6F0; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_sunny.css b/ricoClient/css/striping_sunny.css
new file mode 100644 (file)
index 0000000..7e5def8
--- /dev/null
+++ b/ricoClient/css/striping_sunny.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #FEF8E4; }\r
+div.ricoLG_oddRow {  background-color: #FEEEBD; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_ui-darkness.css b/ricoClient/css/striping_ui-darkness.css
new file mode 100644 (file)
index 0000000..05369a5
--- /dev/null
+++ b/ricoClient/css/striping_ui-darkness.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #000000; }\r
+div.ricoLG_oddRow {  background-color: #2c2c2c; }\r

diff --git a/ricoClient/css/striping_ui-lightness.css b/ricoClient/css/striping_ui-lightness.css
new file mode 100644 (file)
index 0000000..c0b5be7
--- /dev/null
+++ b/ricoClient/css/striping_ui-lightness.css
@@ -0,0 +1,7 @@
+div.ricoLG_evenRow {  background-color: #ffffff; }\r
+div.ricoLG_oddRow {  background-color: #eeeeee; }\r
+.ricoLG_bottom div.ui-state-hover {\r
+  border-left: none;\r
+  border-top: none;\r
+  border-right: none;\r
+}\r

diff --git a/ricoClient/css/striping_vader.css b/ricoClient/css/striping_vader.css
new file mode 100644 (file)
index 0000000..f0d2f4d
--- /dev/null
+++ b/ricoClient/css/striping_vader.css
@@ -0,0 +1,2 @@
+div.ricoLG_evenRow {  background-color: #000000; }\r
+div.ricoLG_oddRow {  background-color: #4c4c4c; }\r

diff --git a/ricoClient/css/striping_warmfall.css b/ricoClient/css/striping_warmfall.css
new file mode 100644 (file)
index 0000000..72d9bfd
--- /dev/null
+++ b/ricoClient/css/striping_warmfall.css
@@ -0,0 +1,5 @@
+.ricoLG_oddRow {\r
+       background-color: #fffad0;\r
+       color: #101011;\r
+}\r
+\r

diff --git a/ricoClient/js/rico.js b/ricoClient/js/rico.js
index 96c21c5..67e7e7e 100644 (file)
--- a/ricoClient/js/rico.js
+++ b/ricoClient/js/rico.js
@@ -17,7 +17,7 @@
  * @namespace Main Rico object
  */
 var Rico = {
-  Version: '3.0b1',
+  Version: '3.0b2',
   loadRequested: 1,
   loadComplete: 2,
   theme: {},
@@ -492,7 +492,7 @@ positionCtlOverIcon: function(ctl,icon) {
 createFormField: function(parent,elemTag,elemType,id,name) {
   var field;
   if (typeof name!='string') name=id;
-  if (this.isIE) {
+  if (this.isIE && this.ieVersion < 8) {
     // IE cannot set NAME attribute on dynamically created elements
     var s=elemTag+' id="'+id+'"';
     if (elemType) {

diff --git a/ricoClient/js/ricoLiveGrid.js b/ricoClient/js/ricoLiveGrid.js
index 5695253..15a08ad 100644 (file)
--- a/ricoClient/js/ricoLiveGrid.js
+++ b/ricoClient/js/ricoLiveGrid.js
@@ -495,7 +495,7 @@ Rico.LiveGrid.prototype = {
       highlightClass   : Rico.theme.gridHighlightClass || 'ricoLG_selection',
 
       // export/print parameters
-      maxPrint         : 1000,  // max # of rows that can be printed/exported, 0=disable print/export feature
+      maxPrint         : 5000,  // max # of rows that can be printed/exported, 0=disable print/export feature
 
       // heading parameters
       headingSort      : 'link', // link: make headings a link that will sort column, hover: make headings a hoverset, none: events on headings are disabled

diff --git a/ricoClient/js/ricoLiveGridAjax.js b/ricoClient/js/ricoLiveGridAjax.js
index 25f8f94..b778bd7 100644 (file)
--- a/ricoClient/js/ricoLiveGridAjax.js
+++ b/ricoClient/js/ricoLiveGridAjax.js
@@ -539,7 +539,7 @@ Rico.Buffer.AjaxSQLMethods = {
   },
 
   printAllSQL: function(exportType) {
-    var parms=this.formQueryHashSQL(0,-1,exportType);
+    var parms=this.formQueryHashSQL(0,this.liveGrid.options.maxPrint,exportType);
     parms.hidden=this.liveGrid.listInvisible('index').join(',');
     var url=this.dataSource+'?'+Rico.toQueryString(parms);
     window.open(url,'',this.liveGrid.options.exportWindow);
@@ -555,7 +555,7 @@ Rico.Buffer.AjaxSQLMethods = {
   // for datasource that is a javascript function
   _printAll: function(exportType) {
     this.liveGrid.exportStart();
-    this.ajaxOptions.parameters = this.formQueryHashSQL(0,-1);
+    this.ajaxOptions.parameters = this.formQueryHashSQL(0,this.liveGrid.options.maxPrint);
     this.ajaxOptions.onComplete = Rico.bind(this,'_jsExport',exportType);
     this.dataSource(this.ajaxOptions);
   },