diff options
| author | RedMatrix <info@friendica.com> | 2014-04-12 07:20:24 +1000 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-04-12 07:20:24 +1000 |
| commit | aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f (patch) | |
| tree | f56796a4410464c7f4211e2c4d5260a44c944ae1 /include | |
| parent | 0a871c3f14fb326efa033d89a8e413ad693c1341 (diff) | |
| parent | 3197ccbf5edf51eab49623c7c21e63af7de7f127 (diff) | |
| download | volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.gz volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.bz2 volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.zip | |
Merge pull request #404 from git-marijus/master
bootstrapify aclselector
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 10 | ||||
| -rw-r--r-- | include/conversation.php | 2 |
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') )); |