diff --git a/include/main.js b/include/main.js index 65bd95c72..1c695265d 100644 --- a/include/main.js +++ b/include/main.js @@ -283,7 +283,15 @@ $('body .fakelink').css('cursor', 'wait'); $.get('group/' + gid + '/' + cid, function(data) { $('#group-update-wrapper').html(data); - $('#group-update2-wrapper').html(data); $('body .fakelink').css('cursor', 'auto'); }); } + + function profChangeMember(gid,cid) { + $('body .fakelink').css('cursor', 'wait'); + $.get('profperm/' + gid + '/' + cid, function(data) { + $('#prof-update-wrapper').html(data); + $('body .fakelink').css('cursor', 'auto'); + }); + } + diff --git a/mod/profiles.php b/mod/profiles.php index 4802f21aa..5ab104aa9 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -459,16 +459,16 @@ function profiles_content(&$a) { )); - $tpl_default = load_view_file('view/profile_entry_default.tpl'); $tpl = load_view_file('view/profile_entry.tpl'); foreach($r as $rr) { - $template = (($rr['is-default']) ? $tpl_default : $tpl); - $o .= replace_macros($template, array( + $o .= replace_macros($tpl, array( '$photo' => $rr['thumb'], '$id' => $rr['id'], '$alt' => t('Profile Image'), - '$profile_name' => $rr['profile-name'] + '$profile_name' => $rr['profile-name'], + '$visible' => (($rr['is-default']) ? t('Visible to everybody') + : '' . t('Edit visibility') . '') )); } } diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl index c5b782660..7ff6d685b 100644 --- a/view/profile_entry.tpl +++ b/view/profile_entry.tpl @@ -5,6 +5,7 @@
$profile_name
+
$visible
diff --git a/view/profile_entry_default.tpl b/view/profile_entry_default.tpl deleted file mode 100644 index 98f20dbe7..000000000 --- a/view/profile_entry_default.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-
-$alt -
-
-
$profile_name
-
-
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 4ef0a05e1..5af6385fd 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2258,3 +2258,36 @@ a.mail-list-link { #group-edit-desc { margin-top: 15px; } + + +#prof-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-members-end { + clear: both; +} + +#prof-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#prof-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-all-contacts-end { + clear: both; +} + +#prof-edit-desc { + margin-top: 15px; +} diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 8c1a79ec2..a4c504d23 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2282,3 +2282,37 @@ a.mail-list-link { #group-edit-desc { margin-top: 15px; } + + +#prof-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-members-end { + clear: both; +} + +#prof-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#prof-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-all-contacts-end { + clear: both; +} + +#prof-edit-desc { + margin-top: 15px; +} +