From 05e672b9c00d4131d5a7bad6ee6543e8dc93feea Mon Sep 17 00:00:00 2001 From: Matt Brown Date: Sat, 30 Apr 2011 17:50:12 +0000 Subject: [PATCH] Fixed Rico.Corner.round to be compatible with latest browsers/CSS3 - in both Rico2 and Rico3 Rico3: Eliminated Rico.loadModule. Rico must now be loaded using the minimized version. Scripts that get minimized were moved to js/minsrc. Elimiated Rico.bind. All calls to Rico.bind were replaced with closures. This eliminates any potential conflict with Ecmascript 5's bind. Fixes to calendar to make it work better with jQuery themes. Rico.Shadow changed to a pure CSS solution. Shadow images removed. LoadRicoClient.asp made generic and moved to plugins directory. git-svn-id: svn://svn.code.sf.net/p/openrico/code/trunk/rico3@74 53df2df2-7ab5-4331-af62-ea79255fa4e2 --- examples/asp/LoadRicoClient.asp | 122 - examples/asp/RicoDbViewerDetail.asp | 12 +- examples/asp/ShipperEdit.asp | 14 +- examples/asp/ex1.asp | 12 +- examples/asp/ex2editfilter.asp | 12 +- examples/asp/ex2editfilterKW.asp | 12 +- examples/asp/ex2json.asp | 11 +- examples/asp/ex2nosession.asp | 11 +- examples/asp/ex2xml.asp | 11 +- examples/asp/menu.html | 8 +- examples/asp/simplegrid.asp | 12 +- examples/asp/tree1.asp | 11 +- examples/asp/widgets.asp | 12 +- examples/dotnet/LoadRicoClient.ascx | 170 - examples/dotnet/ex1.aspx | 4 +- examples/dotnet/index.html | 2 +- examples/dotnet/{menu.html => menu.aspx} | 12 +- examples/html/LoadRicoClient.js | 9 +- examples/html/accordion-grid.html | 2 - examples/html/accordion0.html | 3 - examples/html/accordion3.html | 3 - examples/html/accordion4.html | 3 - examples/html/controls.html | 1 - examples/html/corners.html | 2 - examples/html/corners2.html | 2 - examples/html/drag-and-drop-dyn.html | 2 - examples/html/drag-and-drop-grid.html | 2 - examples/html/drag-and-drop-log.html | 2 - examples/html/drag-and-drop-simple.html | 1 - examples/html/drag-and-drop-zones.html | 2 - examples/html/gridFromJSarray.html | 2 - examples/html/gridFromTable.html | 2 - examples/html/gridFromTableResize.html | 2 - examples/html/gridJSbuffer.html | 2 - examples/html/gridJSbuffer2.html | 2 - examples/html/menu.html | 8 +- examples/html/panel1.html | 1 - examples/html/panel2.html | 1 - examples/menu.js | 23 +- examples/php/LoadRicoClient.php | 14 +- examples/php/RicoDbViewerDetail.php | 2 - examples/php/ShipperEdit.php | 3 - examples/php/ex1.php | 2 - examples/php/ex2editfilter.php | 1 - examples/php/ex2json.php | 1 - examples/php/ex2nosession.php | 1 - examples/php/ex2xml.php | 2 - examples/php/menu.html | 8 +- examples/php/photos.php | 1 - examples/php/simplegrid.php | 2 - examples/php/tree1.php | 1 - examples/php/widgets.php | 1 - plugins/asp/LoadRicoClient.asp | 155 + plugins/asp/dbClass3.vbs | 4 +- ricoClient/css/rico.css | 11 + ricoClient/images/aline.gif | Bin 47 -> 0 bytes ricoClient/images/shadow_l.png | Bin 165 -> 0 bytes ricoClient/images/shadow_ll.png | Bin 274 -> 0 bytes ricoClient/images/shadow_lr.png | Bin 229 -> 0 bytes ricoClient/images/shadow_r.png | Bin 443 -> 0 bytes ricoClient/js/baselibs/prototype.js | 3496 ++++++++---- .../js/{export-owc.html => export_owc.html} | 0 .../{export-plain.html => export_plain.html} | 0 ricoClient/js/glow_min.js | 5 + ricoClient/js/minsrc/ricoCalendar.js | 549 ++ ricoClient/js/minsrc/ricoColorPicker.js | 110 + ricoClient/js/minsrc/ricoDragDrop.js | 577 ++ ricoClient/js/minsrc/ricoGridCommon.js | 987 ++++ ricoClient/js/minsrc/ricoLiveGrid.js | 2439 ++++++++ ricoClient/js/minsrc/ricoLiveGridAjax.js | 577 ++ ricoClient/js/minsrc/ricoLiveGridControls.js | 423 ++ ricoClient/js/minsrc/ricoLiveGridForms.js | 1130 ++++ ricoClient/js/minsrc/ricoLiveGridMenu.js | 136 + ricoClient/js/minsrc/ricoSearch.js | 134 + ricoClient/js/minsrc/ricoSimpleGrid.js | 401 ++ ricoClient/js/minsrc/ricoTree.js | 325 ++ ricoClient/js/minsrc/ricoUI.js | 1379 +++++ ricoClient/js/proto_min.js | 8 + ricoClient/js/rico.js | 62 +- ricoClient/js/rico2doj.js | 9 +- ricoClient/js/rico2ext.js | 12 +- ricoClient/js/rico2glo.js | 7 +- ricoClient/js/rico2jqu.js | 15 +- ricoClient/js/rico2moo.js | 7 +- ricoClient/js/rico2pro.js | 2 + ricoClient/js/ricoThemeroller.js | 2 +- ricoClient/js/rico_min.js | 5052 +++++++++++++++++ 87 files changed, 16935 insertions(+), 1643 deletions(-) delete mode 100644 examples/asp/LoadRicoClient.asp delete mode 100644 examples/dotnet/LoadRicoClient.ascx rename examples/dotnet/{menu.html => menu.aspx} (90%) create mode 100644 plugins/asp/LoadRicoClient.asp delete mode 100644 ricoClient/images/aline.gif delete mode 100644 ricoClient/images/shadow_l.png delete mode 100644 ricoClient/images/shadow_ll.png delete mode 100644 ricoClient/images/shadow_lr.png delete mode 100644 ricoClient/images/shadow_r.png rename ricoClient/js/{export-owc.html => export_owc.html} (100%) rename ricoClient/js/{export-plain.html => export_plain.html} (100%) create mode 100644 ricoClient/js/glow_min.js create mode 100644 ricoClient/js/minsrc/ricoCalendar.js create mode 100644 ricoClient/js/minsrc/ricoColorPicker.js create mode 100644 ricoClient/js/minsrc/ricoDragDrop.js create mode 100644 ricoClient/js/minsrc/ricoGridCommon.js create mode 100644 ricoClient/js/minsrc/ricoLiveGrid.js create mode 100644 ricoClient/js/minsrc/ricoLiveGridAjax.js create mode 100644 ricoClient/js/minsrc/ricoLiveGridControls.js create mode 100644 ricoClient/js/minsrc/ricoLiveGridForms.js create mode 100644 ricoClient/js/minsrc/ricoLiveGridMenu.js create mode 100644 ricoClient/js/minsrc/ricoSearch.js create mode 100644 ricoClient/js/minsrc/ricoSimpleGrid.js create mode 100644 ricoClient/js/minsrc/ricoTree.js create mode 100644 ricoClient/js/minsrc/ricoUI.js create mode 100644 ricoClient/js/proto_min.js create mode 100644 ricoClient/js/rico_min.js diff --git a/examples/asp/LoadRicoClient.asp b/examples/asp/LoadRicoClient.asp deleted file mode 100644 index 54a9dde..0000000 --- a/examples/asp/LoadRicoClient.asp +++ /dev/null @@ -1,122 +0,0 @@ -<% - -' *********************************************************** -' This generates the link and script tags for the Rico client -' *********************************************************** - -Dim jsDir,cssDir,imgDir,transDir,baselibsDir -Dim ricoLib,ricoTheme,ricoLogging -const grid_striping = true ' apply row striping to LiveGrids? -const checkQueryString = true ' load settings from QueryString? true for demo, false for production -const LoadBaseLib = true ' load base Javascript library (prototype, jQuery, etc) from Rico directory? -const jQuery_theme_path = "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/" - - -jsDir="../../ricoClient/js/" ' directory containing Rico's javascript files -cssDir="../../ricoClient/css/" ' directory containing Rico's css files -imgDir="../../ricoClient/images/" ' directory containing Rico's image files -transDir=jsDir & "translations/" -baselibsDir=jsDir & "baselibs/" - - -if checkQueryString then - ricoLib=LCase(Request.QueryString("lib")) - ricoTheme=trim(Request.QueryString("theme")) - ricoLogging=CBool(trim(Request.QueryString("log")) <> "") -else - ' set your production values here - ricoLib="prototype-1.6" ' base library - ricoTheme="j-ui-lightness" ' jquery themes start with j-, rico themes start with r- - ricoLogging=false -end if - -SetConfig -LoadLib ricoLib, LoadBaseLib -setLang -if ricoTheme<>"" then - LoadTheme ricoTheme -end if - - -' initialize Rico -sub SetConfig() - Response.Write vbLf & "" -end sub - - -sub LoadLib(baseLib, baseLoadFlag) - if baseLoadFlag then - if InStr(baseLib,"/") > 0 then - Response.Write vbLf & "" - else - Response.Write vbLf & "" - end if - end if - requireRicoJS "" - requireRicoJS "2" & left(baseLib,3) - Response.Write vbLf & "" - requireRicoCSS "rico" - requireRicoJS "UI" -end sub - - - -' ------------------------------------------------------------- -' Check languages accepted by browser -' and see if there is a match -' ------------------------------------------------------------- -sub setLang() - dim fso,lang,lang2,fname,i - - Set fso=Server.CreateObject("Scripting.FileSystemObject") - lang=lcase(Request.ServerVariables("HTTP_ACCEPT_LANGUAGE")) - arLang=split(lang,",") - for i=0 to ubound(arLang) - lang2=lcase(left(trim(arLang(i)),2)) - if lang2="en" then exit for - fname=transDir & "ricoLocale_" & lang2 & ".js" - if fso.FileExists(Server.MapPath(fname)) then - Response.Write "" - exit for - end if - next - set fso=nothing -end sub - - -' set theme -' "j-ui-lightness" for a Themeroller theme -' "r-greenHdg" for a native Rico theme -sub LoadTheme(theme) - dim prefix,themeFile - prefix=left(theme,1) - themeFile=mid(theme,3) - select case prefix - case "j": - requireRicoJS "Themeroller" - 'Response.Write vbLf & "" - Response.Write vbLf & "" - case "r": - requireRicoCSS themeFile - end select - if grid_striping then Response.Write vbLf & "" -end sub - - -sub requireRicoJS(filename) - Response.Write vbLf & "" -end sub - - -sub requireRicoCSS(filename) - Response.Write vbLf & "" -end sub - -%> diff --git a/examples/asp/RicoDbViewerDetail.asp b/examples/asp/RicoDbViewerDetail.asp index 0f6f709..be33278 100644 --- a/examples/asp/RicoDbViewerDetail.asp +++ b/examples/asp/RicoDbViewerDetail.asp @@ -7,7 +7,15 @@ - + +<% +Dim RicoClient +set RicoClient = new LoadRicoClient +RicoClient.SetRicoClientParentPath "../../ricoClient/" +RicoClient.CheckQueryString ' just for demo +RicoClient.CreateLinks +set RicoClient = Nothing +%> <% @@ -35,8 +43,6 @@ session.contents(id)="select " & columnlist & " from [" & id & "] order by " & a %> + +<% +Dim RicoClient +set RicoClient = new LoadRicoClient +RicoClient.SetRicoClientParentPath "../../ricoClient/" +RicoClient.CheckQueryString ' just for demo +RicoClient.CreateLinks +set RicoClient = Nothing +%>