some zero theming on settings page

diff --git a/mod/settings.php b/mod/settings.php
index f011177fc3b84ab4462c56d74566c69033a8b8cd..92593d7a848034c564b525f36c50fe34eb84e74f 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -837,24 +837,24 @@ function settings_content(&$a) {
 
        $pageset_tpl = get_markup_template('pagetypes.tpl');
        $pagetype = replace_macros($pageset_tpl,array(
-               '$page_normal'  => array('page-flags', t('Normal Account'), PAGE_NORMAL, 
+               '$page_normal'  => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
                                                                        t('This account is a normal personal profile'), 
                                                                        ($a->user['page-flags'] == PAGE_NORMAL)),
                                                                
-               '$page_soapbox'         => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX, 
+               '$page_soapbox'         => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX, 
                                                                        t('Automatically approve all connection/friend requests as read-only fans'), 
                                                                        ($a->user['page-flags'] == PAGE_SOAPBOX)),
                                                                        
-               '$page_community'       => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY, 
+               '$page_community'       => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY, 
                                                                        t('Automatically approve all connection/friend requests as read-write fans'), 
                                                                        ($a->user['page-flags'] == PAGE_COMMUNITY)),
                                                                        
-               '$page_freelove'        => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE, 
+               '$page_freelove'        => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE, 
                                                                        t('Automatically approve all connection/friend requests as friends'), 
                                                                        ($a->user['page-flags'] == PAGE_FREELOVE)),
 
-               '$page_prvgroup'        => array('page-flags', t('Private Forum'), PAGE_PRVGROUP, 
-                                                                       t('Private forum - approved members only [Experimental]'), 
+               '$page_prvgroup'        => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP, 
+                                                                       t('Private forum - approved members only'), 
                                                                        ($a->user['page-flags'] == PAGE_PRVGROUP)),
 
 
@@ -1025,7 +1025,8 @@ function settings_content(&$a) {
                '$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),         
                
                
-               '$h_advn' => t('Advanced Page Settings'),
+               '$h_advn' => t('Advanced Account/Page Type Settings'),
+               '$h_descadvn' => t('Change the behaviour of this account for special situations'),
                '$pagetype' => $pagetype,
                
 

diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index 796abf0eeb6d85433cf0e040cf903456a89ccbd9..c9022a1c1498b1bdc261f04a1b3d237f2b3bc998 100644 (file)
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -1,5 +1,5 @@
        {{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
-       {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
        {{inc field_radio.tpl with $field=$page_community }}{{endinc}}
-       {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
        {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}

diff --git a/view/settings.tpl b/view/settings.tpl
index d61af072f70bca195cb70b556226086336851233..d7ef2121082fdf4c4b6e23aa66ffe6b77f9395d9 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -104,15 +104,16 @@ $group_select
 
 
 <h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
 
-<strong>$activity_options</strong>
+<div id="settings-activity-desc">$activity_options</div>
 
 {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
-<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
+<div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -124,6 +125,7 @@ $group_select
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
+</div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -131,6 +133,7 @@ $group_select
 
 
 <h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype
 

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 2f792977b526d8a1e625aa01b9080e1fff51caf0..5854ccc02ac71c5826962bbb8f3428c2870f7215 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -717,7 +717,17 @@ input#dfrn-url {
 #settings-community {
        float: left;
 }
-
+#settings-notifications label {
+       margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+       font-weight: bold;
+       margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+       color: #666666;
+       margin-bottom: 15px;
+}
 
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,