Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.70 -r1.71
--- openacs-4/packages/acs-templating/acs-templating.info 24 Oct 2024 17:02:23 -0000 1.70
+++ openacs-4/packages/acs-templating/acs-templating.info 27 Oct 2024 11:38:35 -0000 1.71
@@ -9,7 +9,7 @@
<implements-subsite-p>f</implements-subsite-p>
<inherit-templates-p>t</inherit-templates-p>
- <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/acs-templating-6.0.0d2.apm">
+ <version name="6.0.0d3" url="http://openacs.org/repository/download/apm/acs-templating-6.0.0d3.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Templating library.</summary>
<release-date>2024-09-02</release-date>
@@ -27,7 +27,7 @@
<license>GPL version 2</license>
<maturity>3</maturity>
- <provides url="acs-templating" version="6.0.0d2"/>
+ <provides url="acs-templating" version="6.0.0d3"/>
<requires url="acs-kernel" version="6.0.0d1"/>
<requires url="acs-tcl" version="5.10.1"/>
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl 25 Oct 2024 09:50:28 -0000 1.52
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl 27 Oct 2024 11:38:35 -0000 1.53
@@ -1046,21 +1046,57 @@
}
}
-template::tag adp:class { params } {
+# template::tag adp:class { params } {
+# #
+# # Not sure, we need toolkit switching, but it is useful for
+# # testing purposes
+# #
+# set toolkit [ns_set iget $params toolkit ""]
+# if {$toolkit ne ""} {
+# template::adp_append_string [::template::CSS class -toolkit $toolkit [ns_set iget $params name]]
+# } else {
+# template::adp_append_string [::template::CSS class [ns_set iget $params name]]
+# }
+# }
+
+template::tag adp:button { chunk params } {
#
- # not sure, we need toolkit switching, but it is useful for testing purposes
+ # Implementation of value added <button> with specialized
+ # attribute handling:
#
- set toolkit [ns_set iget $params toolkit ""]
- if {$toolkit ne ""} {
- template::adp_append_string [::template::CSS class -toolkit $toolkit [ns_set iget $params name]]
- } else {
- template::adp_append_string [::template::CSS class [ns_set iget $params name]]
+ # <adp:button ...>...</adp:button>
+ #
+ # Specially handled attributes for <adp:button ...> are:
+ # - "data-*" use potentially the bootsrap5 prefix
+ # - "class" map provided class names to tooklit specific class names
+ #
+ set data [expr {[template::toolkit] eq "bootstrap5" ? "data-bs" : "data"}]
+ set attributes ""
+ foreach {key value} [ns_set array $params] {
+ switch -glob $key {
+ data-* {
+ if {$data ne "data" && ![string match "$data*" $key]} {
+ set suffix [string range $key 5 end]
+ append attributes " $data-[string range $key 5 end]='$value'"
+ } else {
+ append attributes " $key='$value'"
+ }
+ }
+ class { append attributes " $key='[::template::CSS classes $value]'" }
+ default { append attributes " $key='$value'" }
+ }
}
+ template::adp_append_string "<button $attributes>"
+ template::adp_compile_chunk $chunk
+ template::adp_append_string "</button>"
}
+
template::tag adp:toggle_button { chunk params } {
#
- # Implementation of dropdown-toggles:
+ # Implementation of dropdown-toggles, which have to be - depending
+ # on the toolkit - realized sometimes as "<a ....>" and sometimes
+ # "<button>" markups.
#
# <adp:toggle_button>....</adp:toggle_button>
#
Index: openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info 8 Oct 2024 12:11:40 -0000 1.17
+++ openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info 27 Oct 2024 11:38:35 -0000 1.18
@@ -10,7 +10,7 @@
<inherit-templates-p>t</inherit-templates-p>
<auto-mount>request-monitor</auto-mount>
- <version name="0.67" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.67.apm">
+ <version name="0.68" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.68.apm">
<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
<summary>Request Monitor with user tracking functionality</summary>
<release-date>2024-10-08</release-date>
@@ -36,10 +36,10 @@
<license>BSD-Style</license>
<maturity>2</maturity>
- <provides url="xotcl-request-monitor" version="0.67"/>
+ <provides url="xotcl-request-monitor" version="0.68"/>
<requires url="acs-kernel" version="5.10.1"/>
<requires url="acs-tcl" version="5.10.1"/>
- <requires url="acs-templating" version="5.10.1"/>
+ <requires url="acs-templating" version="6.0.0d2"/>
<requires url="highcharts" version="0.10"/>
<requires url="xotcl-core" version="5.10.1"/>
Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 25 Oct 2024 09:50:28 -0000 1.7
+++ openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 27 Oct 2024 11:38:35 -0000 1.8
@@ -21,9 +21,7 @@
</div>
</multiple>
<span class="w3-cell">
- <button type="submit" class="btn <adp:class name='btn-outline-secondary'>">
- Filter
- </button>
+ <adp:button type="submit" class="btn btn-outline-secondary">Filter</adp:button>
</span>
<input type="hidden" name="lines" value="@lines@">
<input type="hidden" name="by_starttime" value="@by_starttime@">