Index: openacs-4/packages/acs-tcl/acs-tcl.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v diff -u -r1.98 -r1.99 --- openacs-4/packages/acs-tcl/acs-tcl.info 28 Oct 2024 16:04:31 -0000 1.98 +++ openacs-4/packages/acs-tcl/acs-tcl.info 7 Nov 2024 11:54:02 -0000 1.99 @@ -9,16 +9,16 @@ f t - + OpenACS The Kernel Tcl API library. - 2024-09-02 + 2024-11-07 OpenACS Contains all the core Tcl API, including the request processor, security and session management, permissions, site-nodes, package management infrastructure, etc. GPL version 2 3 - + Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.196 -r1.197 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 24 Oct 2024 14:09:09 -0000 1.196 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 7 Nov 2024 11:54:02 -0000 1.197 @@ -1809,6 +1809,7 @@ {-replace:boolean} {-html:boolean} {-message {}} + {-severity "success"} } { Sets a message to be displayed on the next page request. @@ -1819,8 +1820,16 @@ @param html Set this flag if your message contains HTML. If specified, you're responsible for proper quoting of everything in your message. Otherwise, we quote it for you. + @param severity an indication of the message severity, that the + page template may use to e.g. color-code the message for the + user. Must be one of "success", "info", "warning" or "danger". + @see util_get_user_messages } { + if {$severity ni {"success" "info" "warning" "danger"}} { + error {Invalid severity. Must be one of "success", "info", "warning" or "danger"} + } + if {$replace_p} { set messages [list] } else { @@ -1830,7 +1839,7 @@ if { !$html_p } { set message [ns_quotehtml $message] } - dict incr messages $message + dict incr messages [list $message $severity] } ad_set_client_property -persistent f "acs-kernel" "general_messages" $messages } @@ -1861,12 +1870,13 @@ if { !$keep_p && $messages ne "" } { ad_set_client_property -persistent f "acs-kernel" "general_messages" {} } - template::multirow create $multirow message + template::multirow create $multirow message severity foreach {message count} $messages { + lassign $message message severity if {$count > 1} { append message " ($count)" } - template::multirow append $multirow $message + template::multirow append $multirow $message $severity } } 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.8 -r1.9 --- openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 28 Oct 2024 17:09:41 -0000 1.8 +++ openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 7 Nov 2024 11:54:02 -0000 1.9 @@ -9,10 +9,10 @@ f f - + manderga Theme for OpenACS based on Twitter Bootstrap 3 - 2024-09-02 + 2024-11-07 WU Vienna This package provides a Theme based on Twitter Bootstrap 3. The theme can be activated via @@ -22,9 +22,8 @@ GPL version 2 2 - - - + + Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.adp 3 Sep 2024 15:37:39 -0000 1.6 +++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.adp 7 Nov 2024 11:54:02 -0000 1.7 @@ -24,7 +24,7 @@
-
+
× @user_messages.message;noquote@ Index: openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info 28 Oct 2024 17:09:41 -0000 1.3 +++ openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info 7 Nov 2024 11:54:02 -0000 1.4 @@ -9,11 +9,11 @@ f f - + manderga Gustaf Neumann Theme for OpenACS based on Twitter Bootstrap 5 - 2024-09-02 + 2024-11-07 WU Vienna This package provides a theme based on Twitter Bootstrap 5. The theme can be activated via @@ -23,9 +23,8 @@ GPL version 2 2 - - - + + Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp 11 Sep 2024 05:55:47 -0000 1.2 +++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp 7 Nov 2024 11:54:02 -0000 1.3 @@ -24,7 +24,7 @@
-
+
× @user_messages.message;noquote@ Index: openacs-4/packages/openacs-default-theme/openacs-default-theme.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/openacs-default-theme.info,v diff -u -r1.16 -r1.17 --- openacs-4/packages/openacs-default-theme/openacs-default-theme.info 3 Sep 2024 15:37:40 -0000 1.16 +++ openacs-4/packages/openacs-default-theme/openacs-default-theme.info 7 Nov 2024 11:54:02 -0000 1.17 @@ -7,17 +7,18 @@ t t - + Don Baccus Provides the default "plain" and "tabbed" themes for OpenACS Subsites. - 2024-09-02 + 2024-11-07 Provides the default "plain" and "tabbed" themes for OpenACS Subsites. This has been moved out to a separate package, with availability recorded in the database, to make it easier for developer's to create their own themes and distribute and/or install them in package form. GPL version 2 3 - + + Index: openacs-4/packages/openacs-default-theme/lib/plain-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/plain-master.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/openacs-default-theme/lib/plain-master.adp 13 Aug 2017 12:36:01 -0000 1.5 +++ openacs-4/packages/openacs-default-theme/lib/plain-master.adp 7 Nov 2024 11:54:02 -0000 1.6 @@ -74,7 +74,7 @@
-
+
@user_messages.message;noquote@
Index: openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css,v diff -u -r1.17 -r1.18 --- openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css 3 Sep 2024 15:37:40 -0000 1.17 +++ openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css 7 Nov 2024 11:54:02 -0000 1.18 @@ -312,21 +312,38 @@ /* User Messages */ -#alert-message { - background-color: #ccff99; - padding: 4px; - padding-top: 6px; - padding-bottom: 6px; - font-size: 85%; +#alert-message .alert { + padding: 4px; + margin-bottom: 6px; + border: 1px solid transparent; + border-radius: 4px; + font-size: 85%; } -#alert-message .alert { - margin-left: 0; - padding-left: 2px; - border: none; +#alert-message .alert-success { + color: #3c763d; + background-color: #dff0d8; + border-color: #d6e9c6; } +#alert-message .alert-info { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} +#alert-message .alert-warning { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #faebcc; +} + +#alert-message .alert-danger { + color: #a94442; + background-color: #f2dede; + border-color: #ebccd1; +} + /* Boxed User Message */ .boxed-user-message {