aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-04-11 16:06:39 +0200
committermarijus <mario@mariovavti.com>2014-04-11 16:06:39 +0200
commit3197ccbf5edf51eab49623c7c21e63af7de7f127 (patch)
treea5b12e724e84e4329d42273dca3ab69f971ece16 /include
parent93a56db3913b8023582fe4824b266988aa5a96d8 (diff)
downloadvolse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.tar.gz
volse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.tar.bz2
volse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.zip
bootstrapify aclselector
Diffstat (limited to 'include')
-rw-r--r--include/acl_selectors.php10
-rw-r--r--include/conversation.php2
2 files changed, 9 insertions, 3 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 749ca75eb..6ce4c3f9b 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -230,15 +230,21 @@ function populate_acl($defaults = null,$unused = false) {
array_walk($deny_gid,'fixacl');
}
+ $jotnets = '';
+ call_hooks('jot_networks', $jotnets);
+
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(
'$showall'=> t("Visible to everybody"),
- '$show' => t("show"),
- '$hide' => t("don't show"),
+ '$show' => t("Show"),
+ '$hide' => t("Don't show"),
'$allowcid' => json_encode($allow_cid),
'$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid),
'$denygid' => json_encode($deny_gid),
+ '$jotnets' => $jotnets,
+ '$aclModalTitle' => t('Permissions'),
+ '$aclModalDismiss' => t('Close')
));
diff --git a/include/conversation.php b/include/conversation.php
index 9ffa1e77a..541da1d9b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1153,7 +1153,7 @@ function status_editor($a,$x,$popup=false) {
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),
- '$expiryModalCANCEL' => t('Cancel'),
+ '$expiryModalCANCEL' => t('Cancel')
));