diff options
author | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:48 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:48 -0800 |
commit | 82306682c601688041ccfd9a7b259bc607301a37 (patch) | |
tree | bd15059a020152b5dc59c265e22a27251efe0de4 /Zotlabs/Module/Connedit.php | |
parent | 03f692f24fe543c740e5443223d8084b9ca0c4de (diff) | |
parent | 746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff) | |
download | volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.tar.gz volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.tar.bz2 volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
-rw-r--r-- | Zotlabs/Module/Connedit.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index e0511b0d3..8288886cd 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -866,7 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller { $o .= replace_macros($tpl, [ '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), - '$permcat' => [ 'permcat', t('Permission role'), '', '',$permcats ], + '$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ], '$permcat_new' => t('Add permission role'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'), '$addr' => $contact['xchan_addr'], |