--no commit message

David RENE
1 parent be009662
Showing 4 changed files with 22 additions and 7 deletions Show diff stats
web/CXM_dojo.anubis
web/CXM_jquery.anubis
web/CXM_jquery_tabs.anubis
web/CXM_making_a_web_site.anubis
@@ -825,7 +825,7 @@ public define List(HTML_Head_Tag)
   )
   =
      with theme_name =
-      if file_exists(web_dir+"js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro",
+      if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro",
         [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")) .
           [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+"_rtl.css")) . dojo_defaults ]
         ]
@@ -40,8 +40,9 @@ public define List(HTML_Head_Tag)
    String theme_name
   )
   =
-    if file_exists(web_dir+"/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css") then
+    if file_exists(web_dir+"/public/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css") then
       [ css(css_file("/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css")) . jquery_defaults ]
     else
+      println("Jquery Theme not found "+web_dir+"/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css");
       [ css(css_file("/css/jquery/redmond/jquery-ui-1.8.23.custom.css")) . jquery_defaults ]
   .
@@ -11,9 +11,20 @@ read calexium_lib/web/CXM_making_a_web_site.anubis
 read tools/basis.anubis
 public type JQuery_tab:
- jQuery_tab(String title, HTML_Off_Form content)
+ jQuery_tab(String title, HTML_Partial_Content content)
 .
+  // Helper to be compatible with the first version of JQuery_tab which
+  // take HTML_Off_Form as second argument instead of HTML_Partial_Content.
+  
+public define JQuery_tab
+  jQuery_tab
+  (
+    String        title,
+    HTML_Off_Form content
+  )=
+  jQuery_tab(title, partial_content([], content)).
+  
 define HTML_Partial_Content
   _jquery_tabs
@@ -22,6 +33,7 @@ define HTML_Partial_Content
     List(JQuery_tab)    tabs,
     String              tabs_titles,
     List(HTML_Off_Form) tabs_contents,
+    List(HTML_Head_Tag) tabs_heads,
     Int                 count
   )
   =
@@ -29,14 +41,15 @@ define HTML_Partial_Content
    {
       [ ]         then
         partial_content(
-          [],
+          reverse(tabs_heads),
           sequence([
             literal("<ul>"+tabs_titles+"</ul>"),
             sequence(reverse(tabs_contents))
           ])
         ),
       [ h . t ]   then
-        if h is jQuery_tab(title, content) then
+        if h is jQuery_tab(title, p_content) then
+        if p_content is partial_content(tags, content) then
           _jquery_tabs(
             tabs_container_id,
             t,
@@ -50,6 +63,7 @@ define HTML_Partial_Content
               .
               tabs_contents
             ],
+            tags + tabs_heads,
             count+1
           )
     }
@@ -63,7 +77,7 @@ public define HTML_Partial_Content
     List(JQuery_tab)    tabs
   )
   =
-    if _jquery_tabs(tabs_container_id, tabs, "", [], 0) is partial_content(tags, html) then
+    if _jquery_tabs(tabs_container_id, tabs, "", [], [], 0) is partial_content(tags, html) then
       partial_content(
         [
           js_inline(script("", "$(document).ready(function(){$('#"+tabs_container_id+"').tabs();});"))
@@ -4393,7 +4393,7 @@ define Printable_tree
           title(title)      then
             ["<title>"+title+"</title>" . _format_html_head(t, so_far)],
           js(jsf)           then
-            ["<script src=\""+file_name(jsf)+"\"></script>" . _format_html_head(t, so_far)],
+            [add_js_files([jsf]) . _format_html_head(t, so_far)],
           js_inline(jsi)    then
             ["<script>"+content(jsi)+"</script>" . _format_html_head(t, so_far)],
           css(cssf)         then