theming for default group selector

diff --git a/include/group.php b/include/group.php
index cc6540b31b97f9731cfdaf13385cfe1505ff7692..854ac06a9ad53165f51bae8eb6a918b232811f53 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -172,7 +172,10 @@ function mini_group_select($uid,$gid = 0) {
        }
        logger('groups: ' . print_r($grps,true));
 
-       $o = replace_macros(get_markup_template('group_selection.tpl'), array('$groups' => $grps ));
+       $o = replace_macros(get_markup_template('group_selection.tpl'), array(
+               '$label' => t('Default privacy group for new contacts'),
+               '$groups' => $grps 
+       ));
        return $o;
 }
 

diff --git a/mod/settings.php b/mod/settings.php
index 8c7b1c49c524b017bff200a6b2e0b6dac6aaeb83..40fa55eeaae08a13c97cb2d55ab3f629ed18f1fa 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -991,7 +991,7 @@ function settings_content(&$a) {
                '$suggestme' => $suggestme,
                '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
                '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
-               '$group_lbl_select' => t('Default privacy group for new contacts'),
+
                '$group_select' => $group_select,
 
 

diff --git a/view/group_selection.tpl b/view/group_selection.tpl
index d09ba676d47a9188de1a13acdf16227e678b34df..3809cb99464b6dee035b265660205e6f98d1bc48 100644 (file)
--- a/view/group_selection.tpl
+++ b/view/group_selection.tpl
@@ -1,5 +1,8 @@
-<select name="group-selection" id="group-selection">
+<div class="field custom">
+<label for="group-selection" id="group-selection-lbl">$label</label>
+<select name="group-selection" id="group-selection" >
 {{ for $groups as $group }}
 <option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
 {{ endfor }}
 </select>
+</div>

diff --git a/view/settings.tpl b/view/settings.tpl
index e25d67463d9c518a49a532f1b172ef811cbb653f..556cd3ba373c127512f6acc5d5825394ef559699 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -93,7 +93,6 @@ $unkmail
 <br/>
 <div id="settings-default-perms-end"></div>
 
-<label name="group-selection-lbl" for="group-selection">$group_lbl_select</label>
 $group_select