Index: openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl	11 Jun 2018 09:41:40 -0000	1.4
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl	2 Aug 2018 13:05:22 -0000	1.5
@@ -1,46 +1,48 @@
+ad_page_contract {
+    @author Gustaf Neumann
+
+    @creation-date Dec 22, 2017
+} {
+}
+
 set title "Cookie Consent Sitewide Admin"
 set context [list $title]
 
-set resource_prefix [acs_package_root_dir cookie-consent/www/resources]
 set what "Cookie Consent Widget"
 set version $::cookieconsent::version
 
-
-if {$::tcl_version eq "8.5"} {
-    #
-    # In Tcl 8.5, "::try" was not yet a built-in of Tcl
-    #
-    package require try 
-}
-
-
 #
 # Get version info about the resource files of this package. If not
 # locally installed, offer a link for download.
 #
-set version_info [::cookieconsent::version_info]
-set first_css [lindex [dict get $version_info cssFiles] 0]
-set cdn [dict get $version_info cdn]
+set resource_info [::cookieconsent::resource_info]
+set resource_dir  [dict get $resource_info resourceDir]
+set cdn           [dict get $resource_info cdn]
 
-set writable 1
-if {![file isdirectory $resource_prefix]} {
-    try {
-	file mkdir $resource_prefix
-    } on error {errorMsg} {
-	set writable 0
-    }
-}
+#
+# Check, if the resources are already installed.
+#
+set is_installed [::util::resources::is_installed_locally \
+		      -resource_info $resource_info \
+		      -version_dir $version ]
+if {$is_installed} {
+    #
+    # Tell the users, where the resources are installed.
+    #
+    set resources $resource_dir/$version
 
-if {$writable} {
-    if {[file exists $resource_prefix/$version/$first_css]} {
-	set resources $resource_prefix/$version
-    }
-    set path $resource_prefix/$version
-    if {![file exists $path]} {
-	catch {file mkdir $path}
-    }
-    set writable [file writable $path]
 } else {
-    set path $resource_prefix
+    #
+    # Check, if we can install the resources locally.
+    #
+    set writable [util::resources::can_install_locally \
+		      -resource_info $resource_info \
+		      -version_dir $version]
+    if {!$writable} {
+	#
+	# If we cannot install locally, tell the user were we want to
+	# install.
+	#
+	set path $resource_dir/$version
+    }
 }
-