diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/acl_selectors.php | 21 | ||||
| -rw-r--r-- | view/settings.tpl | 46 | ||||
| -rw-r--r-- | view/theme/default/style.css | 26 |
3 files changed, 76 insertions, 17 deletions
diff --git a/view/acl_selectors.php b/view/acl_selectors.php index 388b75ebb..7ad97dfd2 100644 --- a/view/acl_selectors.php +++ b/view/acl_selectors.php @@ -30,21 +30,24 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { -function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false) { +function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) { $o = ''; // When used for private messages, we limit correspondence to mutual friends and the selector // to one recipient. By default our selector allows multiple selects amongst all contacts. - if($privmail) { + $sql_extra = ''; + + if($privmail || $celeb) { $sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD)); - $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n"; } - else { - $sql_extra = ''; + + if($privmail) + $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n"; + else $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n"; - } + $r = q("SELECT `id`, `name`, `url` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 @@ -73,7 +76,7 @@ function fixacl(&$item) { $item = intval(str_replace(array('<','>'),array('',''),$item)); } -function populate_acl($user = null) { +function populate_acl($user = null,$celeb = false) { $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; @@ -104,7 +107,7 @@ function populate_acl($user = null) { $o .= '</div>'; $o .= '<div id="contact_allow_wrapper">'; $o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>'; - $o .= contact_select('contact_allow','contact_allow',$allow_cid); + $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb); $o .= '</div>'; $o .= '</div>' . "\r\n"; $o .= '<div id="acl-allow-end"></div>' . "\r\n"; @@ -119,7 +122,7 @@ function populate_acl($user = null) { $o .= '</div>'; $o .= '<div id="contact_deny_wrapper" >'; $o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>'; - $o .= contact_select('contact_deny','contact_deny', $deny_cid); + $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb); $o .= '</div>'; $o .= '</div>' . "\r\n"; $o .= '<div id="acl-deny-end"></div>' . "\r\n"; diff --git a/view/settings.tpl b/view/settings.tpl index da330bcd1..e06671d37 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -5,8 +5,11 @@ $nickname_block <form action="settings" id="settings-form" method="post" > + +<h3 class="settings-heading">Basic Settings</h3> + <div id="settings-username-wrapper" > -<label id="settings-username-label" for="settings-username" >Username: </label> +<label id="settings-username-label" for="settings-username" >Full Name: </label> <input type="text" name="username" id="settings-username" value="$username" /> </div> <div id="settings-username-end" ></div> @@ -38,6 +41,14 @@ $theme </div> <div id="settings-theme-end"></div> +<div id="settings-submit-wrapper" > +<input type="submit" name="submit" id="settings-submit" value="Submit" /> +</div> + + +<h3 class="settings-heading">Privacy Settings</h3> + + <input type="hidden" name="visibility" value="$visibility" /> $profile_in_dir @@ -56,26 +67,43 @@ $profile_in_net_dir </div> <div id="settings-default-perms-end"></div> +<div id="settings-submit-wrapper" > +<input type="submit" name="submit" id="settings-submit" value="Submit" /> +</div> + + + +<h3 class="settings-heading">Notification Settings</h3> + + <div id="settings-notify-wrapper"> -<div id="settings-notify-desc">Send me a notification email when: </div> -<label for="notify1" id="settings-label-notify1">I receive an introduction</label> +<div id="settings-notify-desc">Send a notification email when: </div> +<label for="notify1" id="settings-label-notify1">You receive an introduction</label> <input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" /> <div id="notify1-end"></div> -<label for="notify2" id="settings-label-notify2">My introductions are confirmed</label> +<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label> <input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" /> <div id="notify2-end"></div> -<label for="notify3" id="settings-label-notify3">Someone writes on my profile wall</label> +<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label> <input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" /> <div id="notify3-end"></div> <label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label> <input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" /> <div id="notify4-end"></div> -<label for="notify5" id="settings-label-notify5">I receive a private message</label> +<label for="notify5" id="settings-label-notify5">You receive a private message</label> <input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" /> <div id="notify5-end"></div> </div> <div id="settings=notify-end"></div> +<div id="settings-submit-wrapper" > +<input type="submit" name="submit" id="settings-submit" value="Submit" /> +</div> + + +<h3 class="settings-heading">Password Settings</h3> + + <div id="settings-password-wrapper" > <p id="settings-password-desc" > Leave password fields blank unless changing @@ -92,14 +120,20 @@ Leave password fields blank unless changing <div id="settings-confirm-end" ></div> +<div id="settings-submit-wrapper" > +<input type="submit" name="submit" id="settings-submit" value="Submit" /> +</div> +<h3 class="settings-heading">Advanced Page Settings</h3> +$pagetype <div id="settings-submit-wrapper" > <input type="submit" name="submit" id="settings-submit" value="Submit" /> </div> + </form> diff --git a/view/theme/default/style.css b/view/theme/default/style.css index af84e06fa..237264df4 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -666,7 +666,11 @@ input#dfrn-url { #profile-in-netdir-yes, #profile-in-netdir-no, #hide-friends-yes, -#hide-friends-no { +#hide-friends-no, +#settings-normal, +#settings-soapbox, +#settings-community, +#settings-freelove { float: left; margin-bottom: 20px; } @@ -686,6 +690,20 @@ input#dfrn-url { float: left; margin-bottom: 35px; } +#settings-normal-label, +#settings-soapbox-label, +#settings-community-label, +#settings-freelove-label { + float: left; + width: 200px; +} +#settings-normal-desc, +#settings-soapbox-desc, +#settings-community-desc, +#settings-freelove-desc { + float: left; + margin-left: 75px; +} #profile-edit-profile-name-end, #profile-edit-name-end, @@ -706,7 +724,11 @@ input#dfrn-url { #profile-in-netdir-break, #profile-in-netdir-end, #hide-friends-break, -#hide-friends-end { +#hide-friends-end, +#settings-normal-break, +#settings-soapbox-break, +#settings-community-break, +#settings-freelove-break { clear: both; } |