"
@@ -344,9 +344,9 @@
TreeRenderer=listdnd proc include_head_entries {args} {
set ajaxhelper 0
- ::xowiki::Includelet require_YUI_JS -ajaxhelper $ajaxhelper "utilities/utilities.js"
- ::xowiki::Includelet require_YUI_JS -ajaxhelper $ajaxhelper "selector/selector-min.js"
- ::xo::Page requireJS "/resources/xowiki/yui-page-order-region.js"
+ ::xo::Page requireJS urn:ad:js:yui2:utilities/utilities
+ ::xo::Page requireJS urn:ad:js:yui2:selector/selector-min
+ ::xo::Page requireJS "/resources/xowiki/yui-page-order-region.js"
}
TreeRenderer=listdnd proc render {tree} {
array set "" ${:context}
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.340 -r1.341
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 1 Feb 2018 22:16:44 -0000 1.340
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 14 Mar 2018 15:40:49 -0000 1.341
@@ -396,7 +396,8 @@
if {$compare_id == 0} {
return ""
}
- ::xo::Page requireCSS /resources/xowiki/xowiki.css
+ ::xo::Page requireCSS urn:ad:css:xowiki
+
set my_page [::xowiki::Package instantiate_page_from_id -revision_id ${:revision_id}]
$my_page volatile
@@ -439,10 +440,10 @@
::xo::Page set_property doc title $title
array set property_doc [::xo::Page get_property doc]
- set header_stuff [::xo::Page header_stuff]
+ ::xo::Page header_stuff
${:package_id} return_page -adp /packages/xowiki/www/diff -variables {
- content title context header_stuff
+ content title context
time1 time2 user1 user2 revision_id1 revision_id2 property_doc
}
}
@@ -1206,7 +1207,7 @@
set label [ns_quotehtml "$tag ($nr)"]
lappend entries "$label"
}
- ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
+ ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
}
#
@@ -1538,12 +1539,12 @@
# }
#:log "--after context delete_link=$delete_link "
- #$context_package_id instvar folder_id ;# this is the root folder
- #set template [$folder_id get_payload template]
set template [$context_package_id get_parameter "template" ""]
set page [self]
- foreach css [$context_package_id get_parameter extra_css ""] {::xo::Page requireCSS -order 10 $css}
+ foreach css [$context_package_id get_parameter extra_css ""] {
+ ::xo::Page requireCSS -order 10 $css
+ }
# refetch template_file, since it might have been changed via set-parameter
# the cache flush (next line) is not pretty here and should be supported from xotcl-core
::xo::cc unset -nocomplain cache([list $context_package_id get_parameter template_file])
@@ -1554,7 +1555,6 @@
# standard location
#
if {![regexp {^[./]} $template_file]} {
- #set template_file /packages/xowiki/www/$template_file
set template_file [${:package_id} get_adp_template $template_file]
}
@@ -1563,7 +1563,7 @@
# a. adp_compile/ adp_eval
# b. return_page/ adp_include
#
- ::xo::Page requireCSS /resources/xowiki/xowiki.css
+ ::xo::Page requireCSS urn:ad:css:xowiki
if {$footer ne ""} {
template::add_body_script -script {
function get_popular_tags(popular_tags_link, prefix) {
@@ -1584,8 +1584,14 @@
}
}
}
- set header_stuff [::xo::Page header_stuff]
- #:log "HEADER STUFF <$header_stuff>"
+
+ #
+ # The method header_stuff performs the requried
+ # template::head::add_script and template::head::add_css
+ # etc. operations
+ #
+ ::xo::Page header_stuff
+
if {![info exists :description]} {
set :description [:get_description $content]
}
@@ -1652,7 +1658,7 @@
set name ${:name}
set item_id ${:item_id}
$context_package_id return_page -adp $template_file -variables {
- name title item_id context header_stuff return_url
+ name title item_id context return_url
content footer package_id page_package_id page_context
rev_link edit_link delete_link new_link admin_link index_link view_link
notification_subscribe_link notification_image
Index: openacs-4/packages/xowiki/tcl/yui-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-init.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/tcl/yui-init.tcl 14 Mar 2018 15:40:49 -0000 1.1
@@ -0,0 +1,79 @@
+#
+# URN registry for YUI2 resources, either from ajaxhelper or from CDN
+#
+
+set YUI_CSS_PATHS {
+ assets/skins/sam/skin
+ base/base
+ button/assets/skins/sam/button
+ container/assets/container
+ datatable/assets/skins/sam/datatable
+ fonts/fonts-min
+ grids/grids
+ menu/assets/skins/sam/menu
+ reset/reset
+ reset-fonts-grids/reset-fonts-grids
+ treeview/assets/skins/sam/treeview
+}
+
+#
+# Not all yui 2 files are available minified, so we have to specify
+# manually, where we can get it
+#
+set YUI_JS_PATHS {
+ animation/animation-min
+ autocomplete/autocomplete-min
+ button/button-min
+ connection/connection-min
+ container/container-min
+ datasource/datasource-min
+ datatable/datatable-min
+ menu/menu-min
+ selector/selector-min
+ treeview/treeview-min
+ utilities/utilities
+ yahoo-dom-event/yahoo-dom-event
+}
+
+
+#
+# The following asset files is up to my knowledge not available via CDN
+#
+template::register_urn \
+ -urn urn:ad:css:yui2:treeview/assets/tree \
+ -resource /resources/ajaxhelper/yui/treeview/assets/tree.css
+template::register_urn \
+ -urn urn:ad:css:yui2:treeview/assets/folders/tree \
+ -resource /resources/ajaxhelper/yui/treeview/assets/folders/tree.css
+template::register_urn \
+ -urn urn:ad:css:yui2:treeview/assets/menu/tree \
+ -resource /resources/ajaxhelper/yui/treeview/assets/menu/tree.css
+
+if {[file isdirectory $::acs::rootdir/packages/ajaxhelper/www/resources]} {
+
+ foreach path $YUI_CSS_PATHS {
+ template::register_urn \
+ -urn urn:ad:css:yui2:$path \
+ -resource /resources/ajaxhelper/yui/$path.css
+ }
+
+ foreach path $YUI_JS_PATHS {
+ template::register_urn \
+ -urn urn:ad:js:yui2:$path \
+ -resource /resources/ajaxhelper/yui/$path.js
+ }
+
+} else {
+ set version 2.7.0
+ foreach path $YUI_CSS_PATHS {
+ template::register_urn \
+ -urn urn:ad:css:yui2:$path \
+ -resource //yui.yahooapis.com/$version/build/$path.css
+ }
+
+ foreach path $YUI_JS_PATHS {
+ template::register_urn \
+ -urn urn:ad:js:yui2:$path \
+ -resource //yui.yahooapis.com/$version/build/$path.js
+ }
+}
Index: openacs-4/packages/xowiki/tcl/yui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/xowiki/tcl/yui-procs.tcl 21 Oct 2017 15:58:14 -0000 1.7
+++ openacs-4/packages/xowiki/tcl/yui-procs.tcl 14 Mar 2018 15:40:49 -0000 1.8
@@ -339,8 +339,8 @@
# Drag & Drop Utility, Animation Utility, YUI Loader and the Get Utility.
# Use this file to reduce HTTP requests whenever you are including more
# than three of its constituent components.
- ::xowiki::Includelet require_YUI_JS -ajaxhelper ${:ajaxhelper} "yahoo-dom-event/yahoo-dom-event.js"
- ::xowiki::Includelet require_YUI_JS -ajaxhelper ${:ajaxhelper} "utilities/utilities.js"
+ ::xo::Page requireJS urn:ad:js:yui2:yahoo-dom-event/yahoo-dom-event
+ ::xo::Page requireJS urn:ad:js:yui2:utilities/utilities
}
menubar {
#
@@ -358,78 +358,76 @@
:require -module "utilities"
# todo : this is more than necessary
foreach jsFile {
- "container/container-min.js"
- "treeview/treeview-min.js"
- "button/button-min.js"
- "menu/menu-min.js"
- "datasource/datasource-min.js"
- "autocomplete/autocomplete-min.js"
- "datatable/datatable-min.js"
- "selector/selector-min.js"
+ container/container-min
+ treeview/treeview-min
+ button/button-min
+ menu/menu-min
+ datasource/datasource-min
+ autocomplete/autocomplete-min
+ datatable/datatable-min
+ selector/selector-min
} {
- ::xowiki::Includelet require_YUI_JS -ajaxhelper ${:ajaxhelper} $jsFile
+ ::xo::Page requireJS urn:ad:js:yui2:$jsFile
}
:require -module "reset-fonts-grids"
:require -module "base"
foreach cssFile {
- "container/assets/container.css"
- "datatable/assets/skins/sam/datatable.css"
- "button/assets/skins/sam/button.css"
- "assets/skins/sam/skin.css"
- "menu/assets/skins/sam/menu.css"
+ container/assets/container
+ datatable/assets/skins/sam/datatable
+ button/assets/skins/sam/button
+ assets/skins/sam/skin
+ menu/assets/skins/sam/menu
+ treeview/assets/folders/tree
} {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} $cssFile
+ ::xo::Page requireCSS urn:ad:css:yui2:$cssFile
}
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper 1 "treeview/assets/folders/tree.css"
}
datatable {
# see comment above
:require -module "utilities"
# todo : this is more than necessary
foreach jsFile {
- "container/container-min.js"
- "treeview/treeview-min.js"
- "button/button-min.js"
- "menu/menu-min.js"
- "datasource/datasource-min.js"
- "autocomplete/autocomplete-min.js"
- "datatable/datatable-min.js"
- "selector/selector-min.js"
+ container/container-min
+ treeview/treeview-min
+ button/button-min
+ menu/menu-min
+ datasource/datasource-min
+ autocomplete/autocomplete-min
+ datatable/datatable-min
+ selector/selector-min
} {
- ::xowiki::Includelet require_YUI_JS -version "2.7.0b" -ajaxhelper ${:ajaxhelper} $jsFile
+ ::xo::Page requireJS urn:ad:js:yui2:$jsFile
}
:require -module "reset-fonts-grids"
:require -module "base"
foreach cssFile {
- "container/assets/container.css"
- "datatable/assets/skins/sam/datatable.css"
- "button/assets/skins/sam/button.css"
- "assets/skins/sam/skin.css"
- "menu/assets/skins/sam/menu.css"
+ container/assets/container
+ datatable/assets/skins/sam/datatable
+ button/assets/skins/sam/button
+ assets/skins/sam/skin
+ menu/assets/skins/sam/menu
} {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} $cssFile
+ ::xo::Page requireCSS urn:ad:css:yui2:$cssFile
}
- #::xowiki::Includelet require_YUI_CSS -ajaxhelper 1 "treeview/assets/skins/sam/treeview.css"
- #::xowiki::Includelet require_YUI_CSS -ajaxhelper 1 "treeview/assets/folders/tree.css"
}
reset {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} "reset/reset.css"
+ ::xo::Page requireCSS urn:ad:css:yui2:reset/reset
}
fonts {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} "fonts/fonts.css"
+ ::xo::Page requireCSS urn:ad:css:yui2:fonts/fonts-min
}
grids {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} "grids/grids.css"
+ ::xo::Page requireCSS urn:ad:css:yui2:grids/grids
}
base {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} "base/base.css"
+ ::xo::Page requireCSS urn:ad:css:yui2:base/base
}
"reset-fonts-grids" {
- ::xowiki::Includelet require_YUI_CSS -ajaxhelper ${:ajaxhelper} "reset-fonts-grids/reset-fonts-grids.css"
+ ::xo::Page requireCSS urn:ad:css:yui2:reset-fonts-grids/reset-fonts-grids
}
}
}
Index: openacs-4/packages/xowiki/www/error-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/error-template.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/xowiki/www/error-template.adp 7 Jul 2015 12:15:32 -0000 1.9
+++ openacs-4/packages/xowiki/www/error-template.adp 14 Mar 2018 15:40:49 -0000 1.10
@@ -1,10 +1,6 @@
@title;literal@
- @title;literal@@context;literal@
- @header_stuff;literal@
-
-
Index: openacs-4/packages/xowiki/www/portlet-ajax.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlet-ajax.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/portlet-ajax.tcl 7 Aug 2017 23:48:31 -0000 1.6
+++ openacs-4/packages/xowiki/www/portlet-ajax.tcl 14 Mar 2018 15:40:49 -0000 1.7
@@ -1,6 +1,8 @@
# like portlet, except with background loading via ajax
# gustaf neumann, fecit may 2006
-::xo::Page requireJS "/resources/xowiki/get-http-object.js"
+
+::xo::Page requireJS urn:ad:js:get-http-object
+
if {![string match "/*" $portlet]} {
set folder_id [$__including_page set parent_id]
set package_id [$folder_id set package_id]