diff options
| -rw-r--r-- | mod/register.php | 28 | ||||
| -rw-r--r-- | util/strings.php | 74 | ||||
| -rw-r--r-- | view/profile_publish.tpl | 16 | ||||
| -rw-r--r-- | view/register.tpl | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 22 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 22 |
6 files changed, 130 insertions, 34 deletions
diff --git a/mod/register.php b/mod/register.php index b52888ef9..2d9168982 100644 --- a/mod/register.php +++ b/mod/register.php @@ -36,7 +36,10 @@ function register_post(&$a) { $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : ''); $openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); $photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : ''); + $publish = ((x($_POST,'profile_publish_reg') && intval($_POST['profile_publish_reg'])) ? 1 : 0); + $netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0); + $tmp_str = $openid_url; if((! x($username)) || (! x($email)) || (! x($nickname))) { if($openid_url) { @@ -193,14 +196,16 @@ function register_post(&$a) { } if(x($newuid) !== false) { - $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb` ) - VALUES ( %d, '%s', %d, '%s', '%s', '%s' ) ", + $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` ) + VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ", intval($newuid), 'default', 1, dbesc($username), dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"), - dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg") + dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"), + intval($publish), + intval($netpublish) ); if($r === false) { @@ -385,6 +390,22 @@ function register_content(&$a) { $oidlabel = t("Your OpenID \x28optional\x29: "); } + if(get_config('system','publish_all')) { + $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />'; + } + else { + $publish_tpl = load_view_file("view/profile_publish.tpl"); + $profile_publish = replace_macros($publish_tpl,array( + '$instance' => 'reg', + '$pubdesc' => t('Include your profile in member directory?'), + '$yes_selected' => ' checked="checked" ', + '$no_selected' => '', + '$str_yes' => t('Yes'), + '$str_no' => t('No') + )); + } + + $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'); @@ -404,6 +425,7 @@ function register_content(&$a) { '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, + '$publish' => $profile_publish, '$regbutt' => t('Register'), '$username' => $username, '$email' => $email, diff --git a/util/strings.php b/util/strings.php index a7ef2361a..8dabb064d 100644 --- a/util/strings.php +++ b/util/strings.php @@ -57,6 +57,32 @@ $a->strings['December'] = 'December'; $a->strings['Birthdays this week:'] = 'Birthdays this week:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29"; $a->strings['[today]'] = '[today]'; +$a->strings['link to source'] = 'link to source'; +$a->strings['No recipient selected.'] = 'No recipient selected.'; +$a->strings['[no subject]'] = '[no subject]'; +$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.'; +$a->strings['Wall Photos'] = 'Wall Photos'; +$a->strings['Message sent.'] = 'Message sent.'; +$a->strings['Message could not be sent.'] = 'Message could not be sent.'; +$a->strings['Messages'] = 'Messages'; +$a->strings['Inbox'] = 'Inbox'; +$a->strings['Outbox'] = 'Outbox'; +$a->strings['New Message'] = 'New Message'; +$a->strings['Message deleted.'] = 'Message deleted.'; +$a->strings['Conversation removed.'] = 'Conversation removed.'; +$a->strings['Send Private Message'] = 'Send Private Message'; +$a->strings['To:'] = 'To:'; +$a->strings['Subject:'] = 'Subject:'; +$a->strings['Your message:'] = 'Your message:'; +$a->strings['Upload photo'] = 'Upload photo'; +$a->strings['Insert web link'] = 'Insert web link'; +$a->strings['Please wait'] = 'Please wait'; +$a->strings['No messages.'] = 'No messages.'; +$a->strings['Delete conversation'] = 'Delete conversation'; +$a->strings['Message not available.'] = 'Message not available.'; +$a->strings['Delete message'] = 'Delete message'; +$a->strings['Send Reply'] = 'Send Reply'; +$a->strings['Applications'] = 'Applications'; $a->strings["Invite Friends"] = "Invite Friends"; $a->strings['Connect/Follow [profile address]'] = 'Connect/Follow [profile address]'; $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara'; @@ -213,13 +239,11 @@ $a->strings['Message delivery failed.'] = 'Message delivery failed.'; $a->strings[' messages sent.'] = ' messages sent.'; $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:'; -$a->strings['Your message:'] = 'Your message:'; $a->strings['Please join my social network on '] = 'Please join my social network on '; $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; $a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; $a->strings['Empty post discarded.'] = 'Empty post discarded.'; -$a->strings['Wall Photos'] = 'Wall Photos'; $a->strings[" commented on your item at "] = " commented on your item at "; $a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; $a->strings['System error. Post not saved.'] = 'System error. Post not saved.'; @@ -236,28 +260,6 @@ $a->strings['\'s'] = '\'s'; $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; $a->strings['Visible to:'] = 'Visible to:'; $a->strings['Password reset requested at '] = 'Password reset requested at '; -$a->strings['No recipient selected.'] = 'No recipient selected.'; -$a->strings['[no subject]'] = '[no subject]'; -$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.'; -$a->strings['Message sent.'] = 'Message sent.'; -$a->strings['Message could not be sent.'] = 'Message could not be sent.'; -$a->strings['Messages'] = 'Messages'; -$a->strings['Inbox'] = 'Inbox'; -$a->strings['Outbox'] = 'Outbox'; -$a->strings['New Message'] = 'New Message'; -$a->strings['Message deleted.'] = 'Message deleted.'; -$a->strings['Conversation removed.'] = 'Conversation removed.'; -$a->strings['Send Private Message'] = 'Send Private Message'; -$a->strings['To:'] = 'To:'; -$a->strings['Subject:'] = 'Subject:'; -$a->strings['Upload photo'] = 'Upload photo'; -$a->strings['Insert web link'] = 'Insert web link'; -$a->strings['Please wait'] = 'Please wait'; -$a->strings['No messages.'] = 'No messages.'; -$a->strings['Delete conversation'] = 'Delete conversation'; -$a->strings['Message not available.'] = 'Message not available.'; -$a->strings['Delete message'] = 'Delete message'; -$a->strings['Send Reply'] = 'Send Reply'; $a->strings['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; $a->strings['CC: email addresses'] = 'CC: email addresses'; @@ -350,6 +352,7 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; +$a->strings['Include your profile in member directory?'] = 'Include your profile in member directory?'; $a->strings['Registration'] = 'Registration'; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Email Address: '] = 'Your Email Address: '; @@ -421,6 +424,7 @@ $a->strings['Everybody'] = 'Everybody'; $a->strings['Birthday:'] = 'Birthday:'; $a->strings['Logout'] = 'Logout'; $a->strings['Home'] = 'Home'; +$a->strings['Apps'] = 'Apps'; $a->strings['Directory'] = 'Directory'; $a->strings['Network'] = 'Network'; $a->strings['Notifications'] = 'Notifications'; @@ -483,8 +487,10 @@ $a->strings['Ask me'] = 'Ask me'; $a->strings['Facebook disabled'] = 'Facebook disabled'; $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; $a->strings['Facebook Connect'] = 'Facebook Connect'; -$a->strings['Install Facebook posting'] = 'Install Facebook posting'; -$a->strings['Remove Facebook posting'] = 'Remove Facebook posting'; +$a->strings['Install Facebook post connector'] = 'Install Facebook post connector'; +$a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector'; +$a->strings['Facebook'] = 'Facebook'; +$a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings'; $a->strings['Post to Facebook'] = 'Post to Facebook'; $a->strings['Image: '] = 'Image: '; $a->strings['Select files to upload: '] = 'Select files to upload: '; @@ -510,6 +516,17 @@ $a->strings['Currently connected to: '] = 'Currently connected to: '; $a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'; $a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; +$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Three Dimensional Tic-Tac-Toe'; +$a->strings['New game'] = 'New game'; +$a->strings['New game with handicap'] = 'New game with handicap'; +$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously.'] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously.'; +$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'; +$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'; +$a->strings['You go first...'] = 'You go first...'; +$a->strings['I\'m going first this time...'] = 'I\'m going first this time...'; +$a->strings['You won!'] = 'You won!'; +$a->strings['"Cat" game!'] = '"Cat" game!'; +$a->strings['I won!'] = 'I won!'; $a->strings['Post to Twitter'] = 'Post to Twitter'; $a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; $a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.'; @@ -665,6 +682,7 @@ $a->strings['America/Managua'] = 'America/Managua'; $a->strings['America/Manaus'] = 'America/Manaus'; $a->strings['America/Marigot'] = 'America/Marigot'; $a->strings['America/Martinique'] = 'America/Martinique'; +$a->strings['America/Matamoros'] = 'America/Matamoros'; $a->strings['America/Mazatlan'] = 'America/Mazatlan'; $a->strings['America/Mendoza'] = 'America/Mendoza'; $a->strings['America/Menominee'] = 'America/Menominee'; @@ -683,6 +701,7 @@ $a->strings['America/Nome'] = 'America/Nome'; $a->strings['America/Noronha'] = 'America/Noronha'; $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center'; $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem'; +$a->strings['America/Ojinaga'] = 'America/Ojinaga'; $a->strings['America/Panama'] = 'America/Panama'; $a->strings['America/Pangnirtung'] = 'America/Pangnirtung'; $a->strings['America/Paramaribo'] = 'America/Paramaribo'; @@ -699,6 +718,7 @@ $a->strings['America/Regina'] = 'America/Regina'; $a->strings['America/Resolute'] = 'America/Resolute'; $a->strings['America/Rio_Branco'] = 'America/Rio_Branco'; $a->strings['America/Rosario'] = 'America/Rosario'; +$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel'; $a->strings['America/Santarem'] = 'America/Santarem'; $a->strings['America/Santiago'] = 'America/Santiago'; $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo'; @@ -727,6 +747,7 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife'; $a->strings['Antarctica/Casey'] = 'Antarctica/Casey'; $a->strings['Antarctica/Davis'] = 'Antarctica/Davis'; $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville'; +$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie'; $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson'; $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo'; $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer'; @@ -789,6 +810,7 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar'; $a->strings['Asia/Manila'] = 'Asia/Manila'; $a->strings['Asia/Muscat'] = 'Asia/Muscat'; $a->strings['Asia/Nicosia'] = 'Asia/Nicosia'; +$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk'; $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk'; $a->strings['Asia/Omsk'] = 'Asia/Omsk'; $a->strings['Asia/Oral'] = 'Asia/Oral'; diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl new file mode 100644 index 000000000..8fd0bc913 --- /dev/null +++ b/view/profile_publish.tpl @@ -0,0 +1,16 @@ +<p id="profile-publish-desc-$instance"> +$pubdesc +</p> + + <div id="profile-publish-yes-wrapper-$instance"> + <label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label> + <input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" /> + + <div id="profile-publish-break-$instance" ></div> + </div> + <div id="profile-publish-no-wrapper-$instance"> + <label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label> + <input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0" /> + + <div id="profile-publish-end-$instance"></div> + </div> diff --git a/view/register.tpl b/view/register.tpl index ed528bb33..3f57994ed 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -37,7 +37,7 @@ </div> <div id="register-nickname-end" ></div> - + $publish <div id="register-submit-wrapper"> <input type="submit" name="submit" id="register-submit-button" value="$regbutt" /> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 008cce059..916f191e1 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -275,8 +275,7 @@ div.wall-item-content-wrapper.shiny { } #register-submit-button { - margin-top: 50px; - margin-left: 350px; + margin-top: 10px; } #label-login-name, #label-login-password, #login-extra-filler { @@ -678,6 +677,25 @@ input#dfrn-url { margin-left: 20px; } +#profile-publish-yes-reg, +#profile-publish-no-reg { + float: left; + margin-bottom: 10px; +} + +#profile-publish-yes-label-reg, +#profile-publish-no-label-reg { + margin-left: 350px; + float: left; + width: 50px; +} + +#profile-publish-break-reg, +#profile-publish-end-reg { + clear: both; +} + + #profile-edit-pdesc-desc, #profile-edit-keywords-desc { float: left; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index d34c81a45..e4ebeda7e 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -410,8 +410,7 @@ nav { } #register-submit-button { - margin-top: 50px; - margin-left: 350px; + margin-top: 10px; } #label-login-name, #label-login-password, #login-extra-filler { @@ -812,6 +811,25 @@ input#dfrn-url { margin-left: 20px; } +#profile-publish-yes-reg, +#profile-publish-no-reg { + float: left; + margin-bottom: 10px; +} + +#profile-publish-yes-label-reg, +#profile-publish-no-label-reg { + margin-left: 350px; + float: left; + width: 50px; +} + +#profile-publish-break-reg, +#profile-publish-end-reg { + clear: both; +} + + #profile-edit-homepage { float: left; |