diff options
| author | Michael Hamann <michael@content-space.de> | 2013-08-01 21:10:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2013-08-01 21:10:22 +0200 |
| commit | 366f1b4213db30071ca5e1b73c31f6e99337e1a7 (patch) | |
| tree | 08ffb0927c5b8ff104f67326f1a9bc40799f3b8c /lib/plugins | |
| parent | b9ca398d17863ad9a679d220dd742b0480fa80b6 (diff) | |
| parent | 5537fd88dc60d76d6a85202f715aa1ef585281a9 (diff) | |
| download | rpg-366f1b4213db30071ca5e1b73c31f6e99337e1a7.tar.gz rpg-366f1b4213db30071ca5e1b73c31f6e99337e1a7.tar.bz2 | |
Merge branch 'master' into extension_manager
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/acl/script.js | 1 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index c3763dc8d..0abb80d67 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -61,6 +61,7 @@ var dw_acl = { */ loadinfo: function () { jQuery('#acl__info') + .attr('role', 'alert') .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />') .load( DOKU_BASE + 'lib/plugins/acl/ajax.php', diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index ec549d6b4..2fb08037d 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -20,7 +20,8 @@ * 'numericopt' - like above, but accepts empty values * 'onoff' - checkbox input, setting output 0|1 * 'multichoice' - select input (single choice), setting output with quotes, required _choices parameter - * 'email' - text input, input must conform to email address format + * 'email' - text input, input must conform to email address format, supports optional '_multiple' + * parameter for multiple comma separated email addresses * 'password' - password input, minimal input validation, setting output text in quotes, maybe encoded * according to the _code parameter * 'dirchoice' - as multichoice, selection choices based on folders found at location specified in _dir @@ -58,6 +59,7 @@ * '_code' - encoding method to use, accepted values: 'base64','uuencode','plain'. defaults to plain. * '_min' - minimum numeric value, optional for 'numeric' and 'numericopt', ignored by others * '_max' - maximum numeric value, optional for 'numeric' and 'numericopt', ignored by others + * '_multiple' - bool, allow multiple comma separated email values; optional for 'email', ignored by others * * @author Chris Smith <chris@jalakai.co.uk> */ |