Most base libraries now loaded from googleapis. Changes to the way LiveGridForms...

[infodrom/rico3] / examples / dotnet / LoadRicoClient.ascx

diff --git a/examples/dotnet/LoadRicoClient.ascx b/examples/dotnet/LoadRicoClient.ascx
index 73221f4..f3bb9fd 100644 (file)
--- a/examples/dotnet/LoadRicoClient.ascx
+++ b/examples/dotnet/LoadRicoClient.ascx
@@ -8,14 +8,14 @@ Public imgDir as String ="../../ricoClient/images/"  ' directory containing Rico
 Public transDir as String =jsDir & "translations/"\r
 Public baselibsDir as String =jsDir & "baselibs/"\r
 \r
-Public jslib as String = "proto"           ' base library (proto, jquery, moo, dojo, ext, or glow)\r
+Public jslib as String = "prototype-1.6"   ' base library\r
 Public modules as String                   ' comma separated list of Rico modules to load\r
 Public ricoLogging as Boolean = false      ' enable javascript console logging?\r
 Public language as String                  ' if left unset, language will be set automatically based on request's HTTP_ACCEPT_LANGUAGE\r
 Public checkQueryString as Boolean = true  ' load settings from QueryString?  true for demo, false for production\r
 Public LoadBaseLib as Boolean = true       ' load base Javascript library (prototype, jQuery, etc) from Rico directory?\r
 Public grid_striping as Boolean = true     ' apply row striping to LiveGrids?\r
-Public jQuery_theme_path as String = "http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/"\r
+Public jQuery_theme_path as String = "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/"\r
 \r
 Protected theme as String = "j-ui-lightness"  ' jquery themes start with j-, rico themes start with r-\r
 \r
@@ -86,6 +86,16 @@ Public WriteOnly Property ricoTheme() As String
 End Property\r
 \r
 \r
+' -------------------------------------------------------------\r
+' disable themes\r
+' -------------------------------------------------------------\r
+Public WriteOnly Property noTheme() As String\r
+  Set(ByVal ThemeName As String)\r
+    theme=""\r
+  End Set\r
+End Property\r
+\r
+\r
 ' -------------------------------------------------------------\r
 ' Check specifed languages and see if there is a ricoLocale file to match\r
 ' -------------------------------------------------------------\r
@@ -106,33 +116,15 @@ end sub
 \r
 \r
 Protected sub LoadLib(writer as HTMLTextWriter, baseLib as String)\r
-  dim baseFile,adapter\r
-  select case baseLib\r
-    case "proto":\r
-      baseFile="prototype"\r
-      adapter="2Proto"\r
-    case "jquery":\r
-      baseFile="jquery"\r
-      adapter="2jQuery"\r
-    case "moo":\r
-      baseFile="mootools"\r
-      adapter="2Moo"\r
-    case "dojo":\r
-      baseFile="dojo"\r
-      adapter="2Dojo"\r
-    case "ext":\r
-      baseFile="ext-core"\r
-      adapter="2Ext"\r
-    case "glow":\r
-      baseFile="glow.core"\r
-      adapter="2Glow"\r
-    case else:\r
-      Response.End\r
-  end select\r
-\r
-  if LoadBaseLib then writer.Write(vbLf & "<script src='" & baselibsDir & baseFile & ".js' type='text/javascript'></" & "script>")\r
+  if LoadBaseLib then\r
+    if InStr(baseLib,"/") > 0 then\r
+      writer.Write(vbLf & "<script src='http://ajax.googleapis.com/ajax/libs/" & baseLib & "' type='text/javascript'></" & "script>")\r
+    else\r
+      writer.Write(vbLf & "<script src='" & baselibsDir & baseLib & ".js' type='text/javascript'></" & "script>")\r
+    end if\r
+  end if\r
   requireRicoJS(writer, "")\r
-  requireRicoJS(writer, adapter)\r
+  requireRicoJS(writer, "2" & left(baseLib,3))\r
   writer.Write(vbLf & "<script src='" & transDir & "ricoLocale_en.js' type='text/javascript'></" & "script>")\r
   requireRicoCSS(writer, "rico")\r
   requireRicoJS(writer, "UI")\r
@@ -152,7 +144,7 @@ Protected sub LoadTheme(writer as HTMLTextWriter, theme as String)
   select case prefix\r
     case "j":\r
       requireRicoJS(writer, "Themeroller")\r
-      writer.Write(vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "jquery-base/ui.base.css' />")\r
+      'writer.Write(vbLf & "<link type='text/css' rel='stylesheet' href='" & cssDir & "jquery-base/ui.base.css' />")\r
       writer.Write(vbLf & "<link type='text/css' rel='Stylesheet' href='" & jQuery_theme_path & themeFile & "/jquery-ui.css' />")\r
     case "r":\r
       requireRicoCSS(writer, themeFile)\r