Index: openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 2 Aug 2018 13:05:22 -0000 1.10
+++ openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 3 Aug 2018 09:50:08 -0000 1.11
@@ -287,7 +287,8 @@
cookieconsent packages, either from the local file system, or
from CDN.
- @return dict containing cdn, cdnHost, resourceDir, prefix, cssFiles, jsFiles and extraFiles.
+ @return dict containing resourceDir, resourceName, cdn,
+ cdnHost, prefix, cssFiles, jsFiles and extraFiles.
} {
#
# If no version of the cookie consent library was specified,
@@ -317,6 +318,7 @@
set cdnHost cdnjs.cloudflare.com
}
lappend result \
+ resourceName "Cookie Consent Widget" \
resourceDir $resourceDir \
cdn $cdn \
cdnHost $cdnHost \
Index: openacs-4/packages/cookie-consent/www/sitewide-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cookie-consent/www/sitewide-admin/index.adp 17 Dec 2017 19:55:03 -0000 1.1
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.adp 3 Aug 2018 09:50:08 -0000 1.2
@@ -3,18 +3,4 @@
@context;literal@
@title;noquote@
-
-The current version of the @what@ is @version@.
-This version of the @what@ is installed locally
-under @resources@
-In the current installation the @what@ is used via CDN @cdn@.
-
- Do you want to download
- version @version@ of @what@ to your file system?
-
-
- The directory @path@ is NOT writable for the server. In
- order to be able to download the @what@ via this web interface,
- please change the permissions so that OpenACS can write to it.
-
-
.
\ No newline at end of file
+
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.5 -r1.6
--- openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 2 Aug 2018 13:05:22 -0000 1.5
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 3 Aug 2018 09:50:08 -0000 1.6
@@ -5,44 +5,9 @@
} {
}
-set title "Cookie Consent Sitewide Admin"
-set context [list $title]
-
-set what "Cookie Consent Widget"
set version $::cookieconsent::version
-
-#
-# Get version info about the resource files of this package. If not
-# locally installed, offer a link for download.
-#
set resource_info [::cookieconsent::resource_info]
-set resource_dir [dict get $resource_info resourceDir]
-set cdn [dict get $resource_info cdn]
-#
-# 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
+set title "[dict get $resource_info resourceName] - Sitewide Admin"
+set context [list $title]
-} else {
- #
- # 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
- }
-}
Index: openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 2 Aug 2018 11:20:04 -0000 1.5
+++ openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 3 Aug 2018 09:50:08 -0000 1.6
@@ -9,7 +9,7 @@
f
f
-
+
manderga
Theme for OpenACS based on Twitter Bootstrap 3
2017-08-06
@@ -22,14 +22,14 @@
GPL version 2
2
-
-
+
+
-
-
+
+
Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 2 Aug 2018 13:11:39 -0000 1.3
+++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 3 Aug 2018 09:50:08 -0000 1.4
@@ -7,7 +7,8 @@
packages. The goal is to deliver resources either from the
local file system, or from CDN.
- @return dict containing cdn, cdnHost, resourceDir, prefix, cssFiles, jsFiles and extraFiles.
+ @return dict containing resourceDir, resourceName, cdn,
+ cdnHost, prefix, cssFiles, jsFiles and extraFiles.
} {
#
@@ -27,6 +28,7 @@
}
lappend result \
+ resourceName "Bootstrap 3" \
resourceDir $resourceDir \
cdn $cdn \
cdnHost $cdnHost \
Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.adp 2 Aug 2018 09:13:17 -0000 1.1
+++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.adp 3 Aug 2018 09:50:08 -0000 1.2
@@ -3,18 +3,4 @@
@context;literal@
@title;noquote@
-
-The current version of the @what@ is @version@.
-This version of the @what@ is installed locally
-under @resources@
-In the current installation the @what@ is used via CDN @cdn@.
-
- Do you want to download
- version @version@ of @what@ to your file system?
-
-
- The directory @path@ is NOT writable for the server. In
- order to be able to download the @what@ via this web interface,
- please change the permissions so that OpenACS can write to it.
-
-
.
\ No newline at end of file
+
Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 2 Aug 2018 11:20:04 -0000 1.2
+++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 3 Aug 2018 09:50:08 -0000 1.3
@@ -5,44 +5,9 @@
} {
}
-set title "Bootstrap3 Theme - Sitewide Admin"
-set context [list $title]
-
-set what "Bootstrap 3 Theme"
set version $::openacs_bootstrap3_theme::bootstrap_version
-
-#
-# Get version info about the resource files of this package. If not
-# locally installed, offer a link for download.
-#
set resource_info [::openacs_bootstrap3_theme::resource_info]
-set resource_dir [dict get $resource_info resourceDir]
-set cdn [dict get $resource_info cdn]
-#
-# 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
+set title "[dict get $resource_info resourceName] - Sitewide Admin"
+set context [list $title]
-} else {
- #
- # 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
- }
-}