From 6621de63d99b65cc748992f84f8145a93adcce57 Mon Sep 17 00:00:00 2001 From: Thomas Willingham <founder@kakste.com> Date: Mon, 9 Jul 2012 19:07:33 +0100 Subject: [PATCH 01/41] Better (well, different) reshares. --- mod/share.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mod/share.php b/mod/share.php index 761220ad7f..4ec27d6bf4 100644 --- a/mod/share.php +++ b/mod/share.php @@ -22,11 +22,12 @@ function share_init(&$a) { $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; if($r[0]['title']) - $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; - $o .= $r[0]['body'] . "\n" ; + $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . $r[0]['title'] . '[/url]' . '[/b]' . "\n"; + else + $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . 'View Source' . '[/url]' . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n"; + + echo $o; - $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : ''); - - echo $o; killme(); -} +} \ No newline at end of file From 81a21257c3f825d7977aeecdb54c4b3bdcef3e4d Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Sat, 27 Oct 2012 15:42:23 -0700 Subject: [PATCH 02/41] rev update --- boot.php | 2 +- util/messages.po | 113 +++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 59 deletions(-) diff --git a/boot.php b/boot.php index ad6c29b828..49074135f7 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1508' ); +define ( 'FRIENDICA_VERSION', '3.0.1509' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 6ce63c20d7..1da291fdf4 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1508\n" +"Project-Id-Version: 3.0.1509\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-26 10:00-0700\n" +"POT-Creation-Date: 2012-10-27 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -178,7 +178,7 @@ msgstr "" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -285,7 +285,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "" @@ -437,7 +437,7 @@ msgstr "" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" @@ -460,7 +460,7 @@ msgstr "" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -484,7 +484,7 @@ msgstr "" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -695,7 +695,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1537,7 +1537,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1982,7 +1982,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -2109,9 +2109,8 @@ msgstr "" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "" @@ -2855,7 +2854,7 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -3180,8 +3179,8 @@ msgstr "" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3192,7 +3191,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3215,7 +3214,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "" @@ -4607,7 +4606,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4622,7 +4621,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "" @@ -5560,7 +5559,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7578,137 +7577,135 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "" From 4990f64927e2ddd65e1a1f4b1ef85fec12fb98a9 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Mon, 29 Oct 2012 12:03:48 -0600 Subject: [PATCH 03/41] make sure that the contact is local for auto redir --- include/redir.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/redir.php b/include/redir.php index 42008ddd6b..7a44036131 100644 --- a/include/redir.php +++ b/include/redir.php @@ -7,10 +7,23 @@ function auto_redir(&$a, $contact_nick) { if(local_user()) { - $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) AND nick = '%s' AND network = '%s' and self = 0 LIMIT 1", + // We need to find out if $contact_nick is a user on this hub, and if so, if I + // am a contact of that user. However, that user may have other contacts with the + // same nickname as me on other hubs or other networks. Exclude these by requiring + // that the contact have a local URL. I will be the only person with my nickname at + // this URL, so if a result is found, then I am a contact of the $contact_nick user. + + $baseurl = $a->get_baseurl(); + $domain_st = strpos($baseurl, "://"); + if($domain_st === false) + return; + $baseurl = substr($baseurl, $domain_st + 3); + + $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) + AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", dbesc($contact_nick), dbesc($a->user['nickname']), - dbesc(NETWORK_DFRN) + dbesc($baseurl) ); if((!$r) || (! count($r)) || $r[0]['id'] == remote_user()) @@ -52,7 +65,7 @@ function auto_redir(&$a, $contact_nick) { $url = curPageURL(); - logger('check_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); + logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); $dest = (($url) ? '&destination_url=' . $url : ''); goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest ); From 4fd339b216981c104e77455731974b1816355aca Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Mon, 29 Oct 2012 12:43:52 -0600 Subject: [PATCH 04/41] add live div to wall page --- include/conversation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/conversation.php b/include/conversation.php index 6b7c3afb03..7f4c5bc3d2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -413,6 +413,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if(!$update) { $tab = notags(trim($_GET['tab'])); + $tab = ( $tab ? $tab : 'posts' ); if($tab === 'posts') { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // because browser prefetching might change it on us. We have to deliver it with the page. From 200d2030d512eab41fa018ae3dd0776ab68fba7f Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Mon, 29 Oct 2012 12:47:51 -0600 Subject: [PATCH 05/41] don't combine msg and meta arrays unless they're the same size --- include/onepoll.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/onepoll.php b/include/onepoll.php index 17588d183f..9fbef168c6 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -292,7 +292,12 @@ function onepoll_run($argv, $argc){ logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG); $metas = email_msg_meta($mbox,implode(',',$msgs)); + if(count($metas) != count($msgs)) { + logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); + break; + } $msgs = array_combine($msgs, $metas); + foreach($msgs as $msg_uid => $meta) { logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); @@ -309,7 +314,7 @@ function onepoll_run($argv, $argc){ ); if(count($r)) { - logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']); + logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); if($meta->deleted && ! $r[0]['deleted']) { q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), From 4fa5b761673918396b06b011cedcfe79ecfd4fcc Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Mon, 29 Oct 2012 12:56:17 -0600 Subject: [PATCH 06/41] delete template files that are identical to the defaults --- view/theme/facepark/contact_template.tpl | 25 ----- view/theme/facepark/conversation.tpl | 29 ------ view/theme/facepark/nets.tpl | 10 -- view/theme/facepark/saved_searches_aside.tpl | 14 --- view/theme/frost-mobile/oembed_video.tpl | 4 - view/theme/frost/oembed_video.tpl | 4 - view/theme/quattro/msg-header.tpl | 97 -------------------- view/theme/testbubble/contact_template.tpl | 25 ----- view/theme/testbubble/mail_head.tpl | 3 - view/theme/testbubble/nets.tpl | 10 -- view/theme/vier/contact_template.tpl | 25 ----- 11 files changed, 246 deletions(-) delete mode 100644 view/theme/facepark/contact_template.tpl delete mode 100644 view/theme/facepark/conversation.tpl delete mode 100644 view/theme/facepark/nets.tpl delete mode 100644 view/theme/facepark/saved_searches_aside.tpl delete mode 100755 view/theme/frost-mobile/oembed_video.tpl delete mode 100755 view/theme/frost/oembed_video.tpl delete mode 100644 view/theme/quattro/msg-header.tpl delete mode 100644 view/theme/testbubble/contact_template.tpl delete mode 100644 view/theme/testbubble/mail_head.tpl delete mode 100644 view/theme/testbubble/nets.tpl delete mode 100644 view/theme/vier/contact_template.tpl diff --git a/view/theme/facepark/contact_template.tpl b/view/theme/facepark/contact_template.tpl deleted file mode 100644 index 48930b48ab..0000000000 --- a/view/theme/facepark/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > - <div class="contact-entry-photo-wrapper" > - <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id" - onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" - onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" > - - <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a> - - {{ if $contact.photo_menu }} - <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span> - <div class="contact-photo-menu" id="contact-photo-menu-$contact.id"> - <ul> - $contact.photo_menu - </ul> - </div> - {{ endif }} - </div> - - </div> - <div class="contact-entry-photo-end" ></div> - <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> - - <div class="contact-entry-end" ></div> -</div> diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl deleted file mode 100644 index 0e14646219..0000000000 --- a/view/theme/facepark/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -<div id="tread-wrapper-$thread.id" class="tread-wrapper"> - {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} - <div class="hide-comments-outer"> - <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span> - </div> - <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> - {{endif}} - {{if $item.comment_lastcollapsed}}</div>{{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -</div> -{{ endfor }} - -<div id="conversation-end"></div> - -{{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >$dropping</div> -</div> -<div id="item-delete-selected-end"></div> -{{ endif }} diff --git a/view/theme/facepark/nets.tpl b/view/theme/facepark/nets.tpl deleted file mode 100644 index 920c2332b6..0000000000 --- a/view/theme/facepark/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<div id="nets-sidebar" class="widget"> - <h3>$title</h3> - <div id="nets-desc">$desc</div> - <a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a> - <ul class="nets-ul"> - {{ for $nets as $net }} - <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> - {{ endfor }} - </ul> -</div> diff --git a/view/theme/facepark/saved_searches_aside.tpl b/view/theme/facepark/saved_searches_aside.tpl deleted file mode 100644 index e6a0d6278d..0000000000 --- a/view/theme/facepark/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<div class="widget" id="saved-search-list"> - <h3 id="search">$title</h3> - $searchbox - - <ul id="saved-search-ul"> - {{ for $saved as $search }} - <li class="saved-search-li clear"> - <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&remove=1&search=$search.encodedterm"></a> - <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.term</a> - </li> - {{ endfor }} - </ul> - <div class="clear"></div> -</div> diff --git a/view/theme/frost-mobile/oembed_video.tpl b/view/theme/frost-mobile/oembed_video.tpl deleted file mode 100755 index d3a9a93113..0000000000 --- a/view/theme/frost-mobile/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ -<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> - <img width='$tw' height='$th' src='$turl' > - <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div> -</a> diff --git a/view/theme/frost/oembed_video.tpl b/view/theme/frost/oembed_video.tpl deleted file mode 100755 index d3a9a93113..0000000000 --- a/view/theme/frost/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ -<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> - <img width='$tw' height='$th' src='$turl' > - <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div> -</a> diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl deleted file mode 100644 index 2d1ea7a612..0000000000 --- a/view/theme/quattro/msg-header.tpl +++ /dev/null @@ -1,97 +0,0 @@ - -<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> -<script language="javascript" type="text/javascript"> - -var plaintext = '$editselect'; - -if(plaintext != 'none') { - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - var editorId = ed.editorId; - var textarea = $('#'+editorId); - if (typeof(textarea.attr('tabindex')) != "undefined") { - $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); - textarea.attr('tabindex', null); - } - }); - } - }); -} -else - $("#prvmail-text").contact_autocomplete(baseurl+"/acl"); - - -</script> -<script type="text/javascript" src="js/ajaxupload.js" ></script> -<script> - $(document).ready(function() { - var uploader = new window.AjaxUpload( - 'prvmail-upload', - { action: 'wall_upload/$nickname', - name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, - onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); - $('#profile-rotator').hide(); - } - } - ); - - }); - - function jotGetLink() { - reply = prompt("$linkurl"); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - - function linkdropper(event) { - var linkFound = event.dataTransfer.types.contains("text/uri-list"); - if(linkFound) - event.preventDefault(); - } - - function linkdrop(event) { - var reply = event.dataTransfer.getData("text/uri-list"); - event.target.textContent = reply; - event.preventDefault(); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - -</script> - diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl deleted file mode 100644 index 48930b48ab..0000000000 --- a/view/theme/testbubble/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > - <div class="contact-entry-photo-wrapper" > - <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id" - onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" - onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" > - - <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a> - - {{ if $contact.photo_menu }} - <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span> - <div class="contact-photo-menu" id="contact-photo-menu-$contact.id"> - <ul> - $contact.photo_menu - </ul> - </div> - {{ endif }} - </div> - - </div> - <div class="contact-entry-photo-end" ></div> - <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> - - <div class="contact-entry-end" ></div> -</div> diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl deleted file mode 100644 index afb65f5373..0000000000 --- a/view/theme/testbubble/mail_head.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<h3>$messages</h3> - -$tab_content diff --git a/view/theme/testbubble/nets.tpl b/view/theme/testbubble/nets.tpl deleted file mode 100644 index 920c2332b6..0000000000 --- a/view/theme/testbubble/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<div id="nets-sidebar" class="widget"> - <h3>$title</h3> - <div id="nets-desc">$desc</div> - <a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a> - <ul class="nets-ul"> - {{ for $nets as $net }} - <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> - {{ endfor }} - </ul> -</div> diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl deleted file mode 100644 index 48930b48ab..0000000000 --- a/view/theme/vier/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > - <div class="contact-entry-photo-wrapper" > - <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id" - onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" - onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" > - - <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a> - - {{ if $contact.photo_menu }} - <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span> - <div class="contact-photo-menu" id="contact-photo-menu-$contact.id"> - <ul> - $contact.photo_menu - </ul> - </div> - {{ endif }} - </div> - - </div> - <div class="contact-entry-photo-end" ></div> - <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> - - <div class="contact-entry-end" ></div> -</div> From 2bfacda2df043f4b1ab2df7e40c5beb2f7203a9e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Mon, 29 Oct 2012 13:04:59 -0600 Subject: [PATCH 07/41] missed quattro threaded_conversation live update field --- view/theme/quattro/threaded_conversation.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl index 94be864174..7eadf7e9f4 100644 --- a/view/theme/quattro/threaded_conversation.tpl +++ b/view/theme/quattro/threaded_conversation.tpl @@ -1,3 +1,5 @@ +$live_update + {{ for $threads as $item }} <div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }} $item.toplevel"> From 0fe9019c082467119ded58086c3892b3490ea451 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Mon, 29 Oct 2012 21:01:15 -0700 Subject: [PATCH 08/41] rev update --- boot.php | 2 +- util/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 49074135f7..04e4f81f1d 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1509' ); +define ( 'FRIENDICA_VERSION', '3.0.1511' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 1da291fdf4..940b209c63 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1509\n" +"Project-Id-Version: 3.0.1511\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-27 10:00-0700\n" +"POT-Creation-Date: 2012-10-29 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" From 68da185cce0593516ec58b3a4f621ad47af51731 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Tue, 30 Oct 2012 14:23:11 -0700 Subject: [PATCH 09/41] rev update --- boot.php | 2 +- util/messages.po | 126 +++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/boot.php b/boot.php index 04e4f81f1d..a96d223a0e 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1511' ); +define ( 'FRIENDICA_VERSION', '3.0.1512' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 940b209c63..fc2aeb127a 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1511\n" +"Project-Id-Version: 3.0.1512\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 10:00-0700\n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -359,7 +359,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -645,15 +645,15 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "" @@ -671,7 +671,7 @@ msgstr "" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "" @@ -679,7 +679,7 @@ msgstr "" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "" @@ -745,7 +745,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "" @@ -756,85 +756,85 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1377,24 +1377,24 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "" @@ -2773,7 +2773,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "" @@ -4513,8 +4513,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "" @@ -8666,7 +8666,7 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "" @@ -9037,34 +9037,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "" @@ -9082,86 +9082,86 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "" From e2ca9e9db55fef4c3b7e87dcbf884b9f7c0d8b61 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Tue, 30 Oct 2012 14:25:33 -0700 Subject: [PATCH 10/41] poco - ignore archived contacts --- mod/poco.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/poco.php b/mod/poco.php index acfa3ffaa9..cb9abb340d 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -56,7 +56,7 @@ function poco_init(&$a) { and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) "); } else { - $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 + $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0 $sql_extra ", intval($user['uid']) ); @@ -81,7 +81,7 @@ function poco_init(&$a) { } else { - $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 + $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0 $sql_extra LIMIT %d, %d", intval($user['uid']), intval($startIndex), From 70f8a69ef3648f74d977d6a7aa77ce0367a3d151 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Wed, 31 Oct 2012 07:42:23 +0100 Subject: [PATCH 11/41] IT: update to the strings --- view/it/messages.po | 133 ++++++++++++++++++++++---------------------- view/it/strings.php | 2 +- 2 files changed, 66 insertions(+), 69 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 6577996950..304d80f0dc 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-21 10:00-0700\n" -"PO-Revision-Date: 2012-10-22 12:47+0000\n" +"POT-Creation-Date: 2012-10-29 10:00-0700\n" +"PO-Revision-Date: 2012-10-25 07:03+0000\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Le modifiche al contatto non sono state salvate." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -183,7 +183,7 @@ msgstr "Nuova foto da questo URL" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -290,7 +290,7 @@ msgstr "Modifca l'evento" msgid "link to source" msgstr "Collegamento all'originale" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Eventi" @@ -442,7 +442,7 @@ msgstr "Album foto" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Foto dei contatti" @@ -465,7 +465,7 @@ msgstr "I dati di questo contatto non sono disponibili" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -489,7 +489,7 @@ msgstr "è stato taggato in una" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -701,7 +701,7 @@ msgstr "Foto recenti" msgid "Not available." msgstr "Non disponibile." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Comunità" @@ -961,7 +961,7 @@ msgstr "Conferma la tua richiesta di connessione con %s." msgid "Confirm" msgstr "Conferma" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nome Nascosto]" @@ -1544,7 +1544,7 @@ msgstr "Rete" msgid "Personal" msgstr "Personale" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Home" @@ -1989,7 +1989,7 @@ msgstr "sei un fan di" msgid "Edit contact" msgstr "Modifca contatto" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contatti" @@ -2026,7 +2026,7 @@ msgstr "Richiesta reimpostazione password su %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2116,9 +2116,8 @@ msgstr "" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Impostazioni" @@ -2863,7 +2862,7 @@ msgid "" msgstr "Guarda le altre impostazioni, in particolare le impostazioni della privacy. Un profilo non pubblicato è come un numero di telefono non in elenco. In genere, dovresti pubblicare il tuo profilo - a meno che tutti i tuoi amici e potenziali tali sappiano esattamente come trovarti." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -2974,7 +2973,7 @@ msgstr "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumen #: ../../mod/newmember.php:66 ../../include/group.php:270 msgid "Groups" -msgstr "Grouppi" +msgstr "Gruppi" #: ../../mod/newmember.php:70 msgid "Group Your Contacts" @@ -3188,8 +3187,8 @@ msgstr "Cerca persone" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3200,7 +3199,7 @@ msgstr "stato" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3215,7 +3214,7 @@ msgstr "A %1$s non piace %3$s di %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Elemento non trovato." @@ -3223,7 +3222,7 @@ msgstr "Elemento non trovato." msgid "Access denied." msgstr "Accesso negato." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Foto" @@ -4616,7 +4615,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Contatti suggeriti" @@ -4631,7 +4630,7 @@ msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra msgid "Ignore/Hide" msgstr "Ignora / Nascondi" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Elenco globale" @@ -5568,7 +5567,7 @@ msgid "Latest likes" msgstr "Ultimi \"mi piace\"" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7582,137 +7581,135 @@ msgstr "" msgid "Color scheme" msgstr "Schema colori" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "I tuoi messaggi e le tue conversazioni" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Pagina del tuo profilo" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Le tue foto" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "I tuoi eventi" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Note personali" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Le tue foto personali" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Ultimi utenti" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Ultimi \"mi piace\"" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Ultime foto" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Trova Amici" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Elenco Locale" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Interessi simili" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Invita amici" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Serve aiuto? Sei nuovo?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Servizi di conessione" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "non mostrare" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "mostra" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -8663,12 +8660,12 @@ msgstr "secondi" msgid "%1$d %2$s ago" msgstr "%1$d %2$s fa" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -8943,15 +8940,15 @@ msgstr "Impossibile recuperare informazioni sul contatto." msgid "following" msgstr "segue" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Una nuova persona sta condividendo con te da " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Una nuova persona ti segue su " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "" diff --git a/view/it/strings.php b/view/it/strings.php index a3e0df43a7..70544ced09 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -641,7 +641,7 @@ $a->strings["Go to Your Site's Directory"] = ""; $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pagina Elenco ti permette di trovare altre persone in questa rete o in altri siti. Cerca un link <em>Connetti</em> o <em>Segui</em> nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto."; $a->strings["Finding New People"] = ""; $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumenti per trovare nuovi amici. Possiamo confrontare le persone per interessi, cercare le persone per nome e fornire suggerimenti basati sui tuoi contatti esistenti. Su un sito nuovo, i suggerimenti sono di solito presenti dopo 24 ore."; -$a->strings["Groups"] = "Grouppi"; +$a->strings["Groups"] = "Gruppi"; $a->strings["Group Your Contacts"] = ""; $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Quando avrai alcuni amici, organizzali in gruppi di conversazioni private dalla barra laterale della tua pagina Contatti. Potrai interagire privatamente con ogni gruppo nella tua pagina Rete"; $a->strings["Why Aren't My Posts Public?"] = ""; From 4832bc74f55e7d3e6f66d281f5de3a071fe1e071 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Thu, 1 Nov 2012 13:03:25 +0100 Subject: [PATCH 12/41] FR: update to the strings --- view/fr/messages.po | 326 ++++++++++++++++++++++---------------------- view/fr/strings.php | 14 +- 2 files changed, 169 insertions(+), 171 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index f617e1466f..92da96a7f8 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the Friendica package. # # Translators: +# <domovoy@errlock.org>, 2012. # <olivier@free-beer.ch>, 2012. # Olivier <olivier+transifex@migeot.org>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-18 10:00-0700\n" -"PO-Revision-Date: 2012-10-18 08:00+0000\n" -"Last-Translator: Olivier <olivier+transifex@migeot.org>\n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" +"PO-Revision-Date: 2012-10-31 14:33+0000\n" +"Last-Translator: Domovoy <domovoy@errlock.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +61,7 @@ msgstr "Impossible d'appliquer les réglages." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -180,7 +181,7 @@ msgstr "Nouvelle photo depuis cette URL" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -283,11 +284,11 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editer l'événement" -#: ../../mod/events.php:323 ../../include/text.php:1187 +#: ../../mod/events.php:323 ../../include/text.php:1185 msgid "link to source" msgstr "lien original" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Événements" @@ -361,7 +362,7 @@ msgstr "Partager cet événement" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Annuler" @@ -439,7 +440,7 @@ msgstr "Albums photo" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Photos du contact" @@ -462,7 +463,7 @@ msgstr "Informations de contact indisponibles" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -486,7 +487,7 @@ msgstr "a été identifié dans" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -648,15 +649,15 @@ msgstr "J'aime (bascule)" msgid "I don't like this (toggle)" msgstr "Je n'aime pas (bascule)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "Partager" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "Patientez" @@ -674,7 +675,7 @@ msgstr "Commenter" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "Aperçu" @@ -682,7 +683,7 @@ msgstr "Aperçu" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "Supprimer" @@ -698,7 +699,7 @@ msgstr "Photos récentes" msgid "Not available." msgstr "Indisponible." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Communauté" @@ -748,7 +749,7 @@ msgstr "Élément introuvable" msgid "Edit post" msgstr "Éditer la publication" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "Publier aussi par courriel" @@ -759,85 +760,85 @@ msgstr "Éditer" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "Joindre photo" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "envoi image" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "Joindre fichier" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "ajout fichier" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "Insérer lien web" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "lien web" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "Insérer un lien video" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "lien vidéo" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "Insérer un lien audio" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "lien audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "Définir votre localisation" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "spéc. localisation" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "Effacer la localisation du navigateur" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "supp. localisation" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "Réglages des permissions" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "CC: adresses de courriel" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "Notice publique" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "Définir un titre" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "Catégories (séparées par des virgules)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "Exemple: bob@exemple.com, mary@exemple.com" @@ -958,7 +959,7 @@ msgstr "Merci de confirmer votre demande d'introduction auprès de %s." msgid "Confirm" msgstr "Confirmer" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nom non-publié]" @@ -1295,7 +1296,7 @@ msgstr "Conversion temporelle" #: ../../mod/localtime.php:26 msgid "" -"Friendika provides this service for sharing events with other networks and " +"Friendica provides this service for sharing events with other networks and " "friends in unknown timezones." msgstr "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire." @@ -1381,24 +1382,24 @@ msgid "Group: " msgstr "Groupe: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "Sélectionner" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Voir le profil de %s @ %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "Voir dans le contexte" @@ -1409,7 +1410,7 @@ msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../mod/content.php:588 ../../include/text.php:1441 #: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" @@ -1541,10 +1542,10 @@ msgstr "Réseau" msgid "Personal" msgstr "Personnel" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" -msgstr "Accueil" +msgstr "Profil" #: ../../mod/notifications.php:98 ../../include/nav.php:121 msgid "Introductions" @@ -1986,7 +1987,7 @@ msgstr "Vous le/la suivez" msgid "Edit contact" msgstr "Éditer le contact" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contacts" @@ -2023,7 +2024,7 @@ msgstr "Requête de réinitialisation de mot de passe à %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2113,9 +2114,8 @@ msgstr "Supprimer le compte" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Réglages" @@ -2779,7 +2779,7 @@ msgstr "Pas de destinataire." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "Entrez un lien web:" @@ -2860,7 +2860,7 @@ msgid "" msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -2901,7 +2901,7 @@ msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils #: ../../mod/newmember.php:44 msgid "Connecting" -msgstr "" +msgstr "Connexions" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 #: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 @@ -3185,8 +3185,8 @@ msgstr "Recherche de personnes" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3197,7 +3197,7 @@ msgstr "le statut" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3212,7 +3212,7 @@ msgstr "%1$s n'aime pas %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Élément introuvable." @@ -3220,7 +3220,7 @@ msgstr "Élément introuvable." msgid "Access denied." msgstr "Accès refusé." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Photos" @@ -4520,8 +4520,8 @@ msgstr "visible par tous" msgid "Edit visibility" msgstr "Changer la visibilité" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "Sauver dans le Dossier:" @@ -4613,7 +4613,7 @@ msgstr "Texte source (format Diaspora) :" msgid "diaspora2bb: " msgstr "diaspora2bb :" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Suggestions d'amitiés/contacts" @@ -4628,7 +4628,7 @@ msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h msgid "Ignore/Hide" msgstr "Ignorer/cacher" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Annuaire global" @@ -5565,7 +5565,7 @@ msgid "Latest likes" msgstr "Dernières approbations" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5591,7 +5591,7 @@ msgstr "Pas d'accès" #: ../../addon.old/dav/common/wdcal_edit.inc.php:30 #: ../../addon.old/dav/common/wdcal_edit.inc.php:738 msgid "Could not open component for editing" -msgstr "" +msgstr "Échec d'ouverture de l'élément pour édition" #: ../../addon/dav/common/wdcal_edit.inc.php:140 #: ../../addon/dav/friendica/layout.fnk.php:143 @@ -5719,7 +5719,7 @@ msgstr "Jours" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5730,7 +5730,7 @@ msgstr "Dimanche" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5738,35 +5738,35 @@ msgid "Monday" msgstr "Lundi" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Mardi" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Mercredi" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Jeudi" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Vendredi" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6391,7 +6391,7 @@ msgstr "Permissions distantes" msgid "" "Allow recipients of your private posts to see the other recipients of the " "posts" -msgstr "" +msgstr "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message" #: ../../addon/remote_permissions/remote_permissions.php:57 msgid "Remote Permissions settings updated." @@ -6403,7 +6403,7 @@ msgstr "Visibilité" #: ../../addon/remote_permissions/remote_permissions.php:177 msgid "may only be a partial list" -msgstr "" +msgstr "peut être une liste partielle" #: ../../addon/remote_permissions/remote_permissions.php:196 msgid "Global" @@ -7579,137 +7579,135 @@ msgstr "Largeur du thème" msgid "Color scheme" msgstr "Palette de couleurs" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Vos notices et conversations" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Votre page de profil" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Vos contacts" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Vos photos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Vos événements" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Notes personnelles" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Vos photos personnelles" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Pages de Communauté" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Profils communautaires" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Derniers utilisateurs" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Dernièrement aimé" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Dernières photos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Trouver des amis" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Annuaire local" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Intérêts similaires" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Inviter des amis" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Géolocalisation" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Régler le niveau de zoom pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Régler la longitude (X) pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Régler la latitude (Y) pour la géolocalisation" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Aide ou @NewHere?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Connecter des services" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Derniers tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Rechercher un terme twitter" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "cacher" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "montrer" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Montrer/cacher les boîtes dans la colonne de droite :" @@ -7748,7 +7746,7 @@ msgstr "Centre" #: ../../view/theme/quattro/config.php:69 msgid "Posts font size" -msgstr "" +msgstr "Taille de texte des messages" #: ../../view/theme/quattro/config.php:70 msgid "Textareas font size" @@ -8295,79 +8293,79 @@ msgstr "détendue" msgid "surprised" msgstr "surprise" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "January" msgstr "Janvier" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "February" msgstr "Février" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "March" msgstr "Mars" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "April" msgstr "Avril" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "May" msgstr "Mai" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "June" msgstr "Juin" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "July" msgstr "Juillet" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "August" msgstr "Août" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "September" msgstr "Septembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "October" msgstr "Octobre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "November" msgstr "Novembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "December" msgstr "Décembre" -#: ../../include/text.php:1007 +#: ../../include/text.php:1005 msgid "bytes" msgstr "octets" -#: ../../include/text.php:1034 ../../include/text.php:1046 +#: ../../include/text.php:1032 ../../include/text.php:1044 msgid "Click to open/close" msgstr "Cliquer pour ouvrir/fermer" -#: ../../include/text.php:1219 ../../include/user.php:236 +#: ../../include/text.php:1217 ../../include/user.php:236 msgid "default" msgstr "défaut" -#: ../../include/text.php:1231 +#: ../../include/text.php:1229 msgid "Select an alternate language" msgstr "Choisir une langue alternative" -#: ../../include/text.php:1441 +#: ../../include/text.php:1439 msgid "activity" msgstr "activité" -#: ../../include/text.php:1444 +#: ../../include/text.php:1442 msgid "post" msgstr "publication" -#: ../../include/text.php:1599 +#: ../../include/text.php:1597 msgid "Item filed" msgstr "Élément classé" @@ -8660,17 +8658,17 @@ msgstr "secondes" msgid "%1$d %2$s ago" msgstr "%1$d %2$s auparavant" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "Anniversaire de %s's" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Joyeux anniversaire, %s !" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "De: " @@ -8940,15 +8938,15 @@ msgstr "Impossible de récupérer les informations du contact." msgid "following" msgstr "following" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Une nouvelle personne partage avec vous à " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Vous avez un nouvel abonné à " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "Archives" @@ -9042,34 +9040,34 @@ msgstr "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probab msgid "stopped following" msgstr "retiré de la liste de suivi" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "Sollicitations (pokes)" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "Voir les statuts" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "Voir le profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "Voir les photos" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "Posts du Réseau" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "Éditer le contact" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "Message privé" @@ -9087,86 +9085,86 @@ msgstr "publication/élément" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s a marqué le %3$s de %2$s comme favori" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "Catégories:" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "Rangé sous:" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "enlever" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "Supprimer les éléments sélectionnés" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "Suivre le fil" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "%s aime ça." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "%s n'aime pas ça." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "<span %1$s>%2$d personnes</span> aiment ça." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "<span %1$s>%2$d personnes</span> n'aiment pas ça." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "et" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr ", et %d autres personnes" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "%s aiment ça." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "%s n'aiment pas ça." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to <strong>everybody</strong>" msgstr "Visible par <strong>tout le monde</strong>" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "Entrez un lien/URL video :" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "Entrez un lien/URL audio :" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "Tag : " -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "Où êtes-vous présentemment?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "permissions" diff --git a/view/fr/strings.php b/view/fr/strings.php index 34d11d8b3f..70059fa2fe 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'."; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Conversion temporelle"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."; $a->strings["UTC time: %s"] = "Temps UTC : %s"; $a->strings["Current timezone: %s"] = "Zone de temps courante : %s"; $a->strings["Converted localtime: %s"] = "Temps local converti : %s"; @@ -316,7 +316,7 @@ $a->strings["Ignore"] = "Ignorer"; $a->strings["System"] = "Système"; $a->strings["Network"] = "Réseau"; $a->strings["Personal"] = "Personnel"; -$a->strings["Home"] = "Accueil"; +$a->strings["Home"] = "Profil"; $a->strings["Introductions"] = "Introductions"; $a->strings["Messages"] = "Messages"; $a->strings["Show Ignored Requests"] = "Voir les demandes ignorées"; @@ -629,7 +629,7 @@ $a->strings["Edit Your Profile"] = "Éditer votre Profil"; $a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus."; $a->strings["Profile Keywords"] = "Mots-clés du profil"; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent."; -$a->strings["Connecting"] = ""; +$a->strings["Connecting"] = "Connexions"; $a->strings["Facebook"] = "Facebook"; $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook."; $a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si</em> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre."; @@ -1215,7 +1215,7 @@ $a->strings["Latest photos"] = "Dernières photos"; $a->strings["Latest likes"] = "Dernières approbations"; $a->strings["event"] = "évènement"; $a->strings["No access"] = "Pas d'accès"; -$a->strings["Could not open component for editing"] = ""; +$a->strings["Could not open component for editing"] = "Échec d'ouverture de l'élément pour édition"; $a->strings["Go back to the calendar"] = "Revenir au calendrier"; $a->strings["Event data"] = "Données de l'évènement"; $a->strings["Calendar"] = "Calendrier"; @@ -1363,10 +1363,10 @@ $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth"; $a->strings["dreamwidth password"] = "Mot de passe"; $a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut"; $a->strings["Remote Permissions Settings"] = "Permissions distantes"; -$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = ""; +$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message"; $a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour."; $a->strings["Visible to"] = "Visibilité"; -$a->strings["may only be a partial list"] = ""; +$a->strings["may only be a partial list"] = "peut être une liste partielle"; $a->strings["Global"] = "Global"; $a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires"; $a->strings["Individual"] = "Individuel"; @@ -1631,7 +1631,7 @@ $a->strings["Last tweets"] = "Derniers tweets"; $a->strings["Alignment"] = "Alignement"; $a->strings["Left"] = "Gauche"; $a->strings["Center"] = "Centre"; -$a->strings["Posts font size"] = ""; +$a->strings["Posts font size"] = "Taille de texte des messages"; $a->strings["Textareas font size"] = ""; $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs"; $a->strings["j F, Y"] = "j F, Y"; From 9086641fd1d2375123f72fc9147e7f7904090e68 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Thu, 1 Nov 2012 13:12:54 +0100 Subject: [PATCH 13/41] ES: update to the strings --- view/es/messages.po | 320 ++++++++++++++++++++++---------------------- view/es/strings.php | 6 +- 2 files changed, 162 insertions(+), 164 deletions(-) diff --git a/view/es/messages.po b/view/es/messages.po index 025a087d5a..a6ecbbdfed 100644 --- a/view/es/messages.po +++ b/view/es/messages.po @@ -10,13 +10,14 @@ # Manuel Pérez <blackhalo@member.fsf.org>, 2011-2012. # Manuel Pérez Monís, 2011. # Mike Macgirvin, 2010. +# <tobias.diekershoff@gmx.net>, 2012. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-18 10:00-0700\n" -"PO-Revision-Date: 2012-10-15 08:33+0000\n" -"Last-Translator: Carlos Solís <csolisr@gmail.com>\n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" +"PO-Revision-Date: 2012-11-01 12:11+0000\n" +"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +66,7 @@ msgstr "Error al actualizar el Contacto." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -185,7 +186,7 @@ msgstr "Nueva foto de esta dirección" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -288,11 +289,11 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editar evento" -#: ../../mod/events.php:323 ../../include/text.php:1187 +#: ../../mod/events.php:323 ../../include/text.php:1185 msgid "link to source" msgstr "Enlace al original" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Eventos" @@ -366,7 +367,7 @@ msgstr "Comparte este evento" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Cancelar" @@ -444,7 +445,7 @@ msgstr "Álbum de Fotos" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Foto del contacto" @@ -467,7 +468,7 @@ msgstr "Información del contacto no disponible" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -491,7 +492,7 @@ msgstr "ha sido etiquetado en" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -653,15 +654,15 @@ msgstr "Me gusta esto (cambiar)" msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "Compartir" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "Por favor, espera" @@ -679,7 +680,7 @@ msgstr "Comentar" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "Vista previa" @@ -687,7 +688,7 @@ msgstr "Vista previa" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "Eliminar" @@ -703,7 +704,7 @@ msgstr "Fotos recientes" msgid "Not available." msgstr "No disponible" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Comunidad" @@ -753,7 +754,7 @@ msgstr "Elemento no encontrado" msgid "Edit post" msgstr "Editar publicación" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "Publicar mediante correo electrónico" @@ -764,85 +765,85 @@ msgstr "Editar" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "Subir foto" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "subir imagen" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "Adjuntar archivo" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "adjuntar archivo" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "Insertar enlace" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "enlace web" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "Insertar enlace del vídeo" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "enlace de video" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "Insertar vínculo del audio" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "enlace de audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "Configurar tu localización" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "establecer tu ubicación" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "Borrar la localización del navegador" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "limpiar la localización" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "CC: dirección de correo electrónico" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "Publicación pública" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "Establecer el título" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "Categorías (lista separada por comas)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com" @@ -963,7 +964,7 @@ msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s." msgid "Confirm" msgstr "Confirmar" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nombre oculto]" @@ -1300,9 +1301,9 @@ msgstr "Conversión horária" #: ../../mod/localtime.php:26 msgid "" -"Friendika provides this service for sharing events with other networks and " +"Friendica provides this service for sharing events with other networks and " "friends in unknown timezones." -msgstr "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas." +msgstr "" #: ../../mod/localtime.php:30 #, php-format @@ -1386,24 +1387,24 @@ msgid "Group: " msgstr "Grupo: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "Seleccionar" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Ver perfil de %s @ %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "Verlo en contexto" @@ -1414,7 +1415,7 @@ msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" -#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../mod/content.php:588 ../../include/text.php:1441 #: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" @@ -1546,7 +1547,7 @@ msgstr "Red" msgid "Personal" msgstr "Personal" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Inicio" @@ -1991,7 +1992,7 @@ msgstr "eres fan de" msgid "Edit contact" msgstr "Modificar contacto" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contactos" @@ -2028,7 +2029,7 @@ msgstr "Contraseña restablecida enviada a %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2093,7 +2094,7 @@ msgstr "Configuración de tu cuenta" #: ../../mod/settings.php:35 msgid "Display settings" -msgstr "Mostrar configuración" +msgstr "Configuración Tema/Visualización" #: ../../mod/settings.php:41 msgid "Connector settings" @@ -2118,9 +2119,8 @@ msgstr "Eliminar cuenta" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Configuración" @@ -2346,7 +2346,7 @@ msgstr "No hay tema especial para dispositivos móviles" #: ../../mod/settings.php:767 msgid "Display Settings" -msgstr "Mostrar Configuración" +msgstr "Configuración Tema/Visualización" #: ../../mod/settings.php:773 ../../mod/settings.php:784 msgid "Display Theme:" @@ -2784,7 +2784,7 @@ msgstr "Sin receptor." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "Introduce la dirección del enlace:" @@ -2865,7 +2865,7 @@ msgid "" msgstr "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -3190,8 +3190,8 @@ msgstr "Buscar personas" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3202,7 +3202,7 @@ msgstr "estado" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3217,7 +3217,7 @@ msgstr "A %1$s no le gusta %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Elemento no encontrado." @@ -3225,7 +3225,7 @@ msgstr "Elemento no encontrado." msgid "Access denied." msgstr "Acceso denegado." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Fotografías" @@ -4525,8 +4525,8 @@ msgstr "Visible para todos" msgid "Edit visibility" msgstr "Editar visibilidad" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "Guardar en directorio:" @@ -4618,7 +4618,7 @@ msgstr "Fuente (formato Diaspora): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Sugerencias de amigos" @@ -4633,7 +4633,7 @@ msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de n msgid "Ignore/Hide" msgstr "Ignorar/Ocultar" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Directorio global" @@ -5570,7 +5570,7 @@ msgid "Latest likes" msgstr "Últimos me gusta" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5724,7 +5724,7 @@ msgstr "Días" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5735,7 +5735,7 @@ msgstr "Domingo" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5743,35 +5743,35 @@ msgid "Monday" msgstr "Lunes" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Martes" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Miércoles" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Jueves" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Viernes" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -7584,137 +7584,135 @@ msgstr "Establecer el ancho para el tema" msgid "Color scheme" msgstr "Esquema de color" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Tus publicaciones y conversaciones" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Tu página de perfil" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Tus contactos" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Tus fotos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Tus eventos" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Notas personales" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Tus fotos personales" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Páginas de Comunidad" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Perfiles de la Comunidad" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Últimos usuarios" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Últimos \"me gusta\"" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Últimas fotos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Buscar amigos" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Directorio local" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Intereses similares" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Invitar amigos" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Minimapa" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Configurar zoom en Minimapa" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Configurar longitud (X) en Minimapa" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Configurar latitud (Y) en Minimapa" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "¿Ayuda o @NuevoAquí?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Servicios conectados" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Últimos tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Establecer término de búsqueda en Twitter" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "no mostrar" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "mostrar" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Mostrar/Ocultar casillas en la columna derecha:" @@ -8300,79 +8298,79 @@ msgstr "relajado" msgid "surprised" msgstr "sorprendido" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "January" msgstr "Enero" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "February" msgstr "Febrero" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "March" msgstr "Marzo" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "April" msgstr "Abril" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "May" msgstr "Mayo" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "June" msgstr "Junio" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "July" msgstr "Julio" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "August" msgstr "Agosto" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "September" msgstr "Septiembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "October" msgstr "Octubre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "November" msgstr "Noviembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "December" msgstr "Diciembre" -#: ../../include/text.php:1007 +#: ../../include/text.php:1005 msgid "bytes" msgstr "bytes" -#: ../../include/text.php:1034 ../../include/text.php:1046 +#: ../../include/text.php:1032 ../../include/text.php:1044 msgid "Click to open/close" msgstr "Pulsa para abrir/cerrar" -#: ../../include/text.php:1219 ../../include/user.php:236 +#: ../../include/text.php:1217 ../../include/user.php:236 msgid "default" msgstr "predeterminado" -#: ../../include/text.php:1231 +#: ../../include/text.php:1229 msgid "Select an alternate language" msgstr "Elige otro idioma" -#: ../../include/text.php:1441 +#: ../../include/text.php:1439 msgid "activity" msgstr "Actividad" -#: ../../include/text.php:1444 +#: ../../include/text.php:1442 msgid "post" msgstr "Publicación" -#: ../../include/text.php:1599 +#: ../../include/text.php:1597 msgid "Item filed" msgstr "Elemento archivado" @@ -8665,17 +8663,17 @@ msgstr "segundos" msgid "%1$d %2$s ago" msgstr "hace %1$d %2$s" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "Cumpleaños de %s" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Feliz cumpleaños %s" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "De: " @@ -8945,15 +8943,15 @@ msgstr "No ha sido posible recibir la información del contacto." msgid "following" msgstr "siguiendo" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Una nueva persona está compartiendo contigo en " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Tienes un nuevo seguidor en " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "Archivos" @@ -9047,34 +9045,34 @@ msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por habe msgid "stopped following" msgstr "dejó de seguir" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "Toque" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "Ver estado" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "Ver perfil" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "Ver fotos" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "Publicaciones en la red" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "Editar contacto" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "Enviar mensaje privado" @@ -9092,86 +9090,86 @@ msgstr "publicación/tema" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s ha marcado %3$s de %2$s como Favorito" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "Eliminar el elemento seleccionado" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "Le gusta a <span %1$s>%2$d personas</span>." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "No le gusta a <span %1$s>%2$d personas</span>." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "y" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr " y a otras %d personas" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "Le gusta a %s." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "No le gusta a %s." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to <strong>everybody</strong>" msgstr "Visible para <strong>cualquiera</strong>" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "Por favor, introduce la URL/enlace del vídeo:" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "Por favor, introduce la URL/enlace del audio:" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "Etiquetar:" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "¿Dónde estás ahora?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "permisos" diff --git a/view/es/strings.php b/view/es/strings.php index a476bfe050..d001a2772c 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Conversión horária"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas."; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = ""; $a->strings["UTC time: %s"] = "Tiempo UTC: %s"; $a->strings["Current timezone: %s"] = "Zona horaria actual: %s"; $a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s"; @@ -443,7 +443,7 @@ $a->strings["Enter your email address and submit to have your password reset. Th $a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: "; $a->strings["Reset"] = "Restablecer"; $a->strings["Account settings"] = "Configuración de tu cuenta"; -$a->strings["Display settings"] = "Mostrar configuración"; +$a->strings["Display settings"] = "Configuración Tema/Visualización"; $a->strings["Connector settings"] = "Configuración del conector"; $a->strings["Plugin settings"] = "Configuración de los módulos"; $a->strings["Connected apps"] = "Aplicaciones conectadas"; @@ -499,7 +499,7 @@ $a->strings["Mark as seen"] = "Marcar como leído"; $a->strings["Move to folder"] = "Mover a un directorio"; $a->strings["Move to folder:"] = "Mover al directorio:"; $a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles"; -$a->strings["Display Settings"] = "Mostrar Configuración"; +$a->strings["Display Settings"] = "Configuración Tema/Visualización"; $a->strings["Display Theme:"] = "Utilizar tema:"; $a->strings["Mobile Theme:"] = "Tema móvil:"; $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; From c177a5e5b28755b2b829dddc6fb166e09181a37b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Thu, 1 Nov 2012 15:05:31 +0100 Subject: [PATCH 14/41] vier: threads --- view/theme/vier/style.css | 6 ++---- view/theme/vier/threaded_conversation.tpl | 2 +- view/theme/vier/wall_thread.tpl | 23 ++++++++++++++++++----- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 64b3ba9740..96903bba00 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1079,15 +1079,13 @@ section { padding-bottom: 2px; } .tag { - background: url("../../../images/tag_b.png") repeat-x center left; - color: #ffffff; + color: rgb(153,153,153); padding-left: 3px; font-size: 10px; } .tag a { padding-right: 8px; - background: url("../../../images/tag.png") no-repeat center right; - color: #ffffff; + color: rgb(153,153,153); } .wwto { position: absolute !important; diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl index ad510185ee..7eadf7e9f4 100644 --- a/view/theme/vier/threaded_conversation.tpl +++ b/view/theme/vier/threaded_conversation.tpl @@ -2,7 +2,7 @@ $live_update {{ for $threads as $item }} -<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}"> +<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }} $item.toplevel"> {{ if $item.type == tag }} diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl index becf868e79..f6f4679cbf 100644 --- a/view/theme/vier/wall_thread.tpl +++ b/view/theme/vier/wall_thread.tpl @@ -42,7 +42,7 @@ </ul> </div> - {{ if $item.owner_url }} + {{ if $item.owner_url }} <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id"> <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" /> @@ -60,9 +60,18 @@ <div class="wall-item-links"> </div> <div class="wall-item-tags"> - {{ for $item.tags as $tag }} + {{ for $item.hashtags as $tag }} <span class='tag'>$tag</span> {{ endfor }} + {{ for $item.mentions as $tag }} + <span class='mention'>$tag</span> + {{ endfor }} + {{ for $item.folders as $cat }} + <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span> + {{ endfor }} + {{ for $item.categories as $cat }} + <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span> + {{ endfor }} </div> </div> <div class="wall-item-bottom"> @@ -71,7 +80,11 @@ </div> <div class="wall-item-actions"> <div class="wall-item-actions-author"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span> + <a href="$item.profile_url" target="redir" + title="$item.linktitle" + class="wall-item-name-link"><span + class="wall-item-name$item.sparkle">$item.name</span></a> + <span class="wall-item-ago" title="$item.localtime">$item.ago</span> {{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall {{ endif }} </div> @@ -118,14 +131,14 @@ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> </div> - {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }} + {{ if $item.threaded }}{{ if $item.comment }} <div class="wall-item-bottom"> <div class="wall-item-links"></div> <div class="wall-item-comment-wrapper"> $item.comment </div> </div> - {{ endif }}{{ endif }}{{ endif }} + {{ endif }}{{ endif }} </div> From 43de9cf90434088d40cde9958f91414001840c9d Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 10:32:33 -0600 Subject: [PATCH 15/41] don't try to auto redir if I'm a blocked or pending contact --- include/redir.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/redir.php b/include/redir.php index 7a44036131..3fbbf4c130 100644 --- a/include/redir.php +++ b/include/redir.php @@ -12,6 +12,8 @@ function auto_redir(&$a, $contact_nick) { // same nickname as me on other hubs or other networks. Exclude these by requiring // that the contact have a local URL. I will be the only person with my nickname at // this URL, so if a result is found, then I am a contact of the $contact_nick user. + // + // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending. $baseurl = $a->get_baseurl(); $domain_st = strpos($baseurl, "://"); @@ -20,7 +22,7 @@ function auto_redir(&$a, $contact_nick) { $baseurl = substr($baseurl, $domain_st + 3); $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) - AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", + AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1", dbesc($contact_nick), dbesc($a->user['nickname']), dbesc($baseurl) @@ -30,10 +32,12 @@ function auto_redir(&$a, $contact_nick) { return; - $r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1", + $r = q("SELECT * FROM contact WHERE nick = '%s' + AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1", dbesc($contact_nick), dbesc(NETWORK_DFRN), - intval(local_user()) + intval(local_user()), + dbesc($baseurl) ); if(! ($r && count($r))) From d98974572b1beaa3d7d34c5c6c8109a41e428bc4 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 10:33:01 -0600 Subject: [PATCH 16/41] fix theme control of allowing threading --- include/conversation.php | 3 ++- object/Item.php | 4 ++-- results | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 results diff --git a/include/conversation.php b/include/conversation.php index 7f4c5bc3d2..5f44cde7fb 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1008,9 +1008,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); + $a = get_app(); foreach($arr as $item) { if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow')) { + if(get_config('system','thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; if($thr_parent == '') diff --git a/object/Item.php b/object/Item.php index 134dbd643b..035255466a 100644 --- a/object/Item.php +++ b/object/Item.php @@ -519,7 +519,8 @@ class Item extends BaseObject { * _ false on failure */ private function get_comment_box($indent) { - if(!$this->is_toplevel() && !get_config('system','thread_allow')) { + $a = $this->get_app(); + if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) { return ''; } @@ -531,7 +532,6 @@ class Item extends BaseObject { $ww = 'ww'; if($conv->is_writable() && $this->is_writable()) { - $a = $this->get_app(); $qc = $qcomment = null; /* diff --git a/results b/results new file mode 100644 index 0000000000..22fcacc509 --- /dev/null +++ b/results @@ -0,0 +1,10 @@ +include/conversation.php: . "; var netargs = '" . substr($a->cmd,8) +include/conversation.php: . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; +include/conversation.php: . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; +include/conversation.php: . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; +js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); +js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$("body .fakelink").css("cursor","wait"),$.get("group/"+e+"/"+t+"?t="+n,function(e){$("#group-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$("body .fakelink").css("cursor","wait"),$.get("profperm/"+e+"/"+t,function(e){$("#prof-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$("body").css("cursor","wait"),$.get("contactgroup/"+e+"/"+t,function(e){$("body").css("cursor","auto")})}function checkboxhighlight(e){$(e).is(":checked")?$(e).addClass("checkeditem"):$(e).removeClass("checkeditem")}function notifyMarkAll(){$.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$(e).val(),$.getJSON("pretheme?f=&theme="+theme,function(e){$("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; +view/theme/frost-mobile/js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); +view/theme/frost-mobile/js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e});var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; +view/theme/frost/js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); +view/theme/frost/js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; From 3e594f0f1cb61e23262330e4fdf5b751d9284250 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 10:35:20 -0600 Subject: [PATCH 17/41] get rid of stray file --- results | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 results diff --git a/results b/results deleted file mode 100644 index 22fcacc509..0000000000 --- a/results +++ /dev/null @@ -1,10 +0,0 @@ -include/conversation.php: . "; var netargs = '" . substr($a->cmd,8) -include/conversation.php: . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; -include/conversation.php: . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; -include/conversation.php: . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; -js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); -js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$("body .fakelink").css("cursor","wait"),$.get("group/"+e+"/"+t+"?t="+n,function(e){$("#group-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$("body .fakelink").css("cursor","wait"),$.get("profperm/"+e+"/"+t,function(e){$("#prof-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$("body").css("cursor","wait"),$.get("contactgroup/"+e+"/"+t,function(e){$("body").css("cursor","auto")})}function checkboxhighlight(e){$(e).is(":checked")?$(e).addClass("checkeditem"):$(e).removeClass("checkeditem")}function notifyMarkAll(){$.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$(e).val(),$.getJSON("pretheme?f=&theme="+theme,function(e){$("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; -view/theme/frost-mobile/js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); -view/theme/frost-mobile/js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e});var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; -view/theme/frost/js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); -view/theme/frost/js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; From e9b26ffbb331f841886236beb745e7511228adbf Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 17:14:42 -0600 Subject: [PATCH 18/41] prevent double posting of status updates and comments --- boot.php | 7 ++++++ include/conversation.php | 3 ++- mod/content.php | 3 ++- mod/editpost.php | 3 ++- mod/item.php | 27 ++++++++++++++++++------ mod/photos.php | 9 +++++--- object/Item.php | 3 ++- view/comment_item.tpl | 1 + view/jot.tpl | 1 + view/theme/comix-plain/comment_item.tpl | 1 + view/theme/comix/comment_item.tpl | 1 + view/theme/diabook/comment_item.tpl | 1 + view/theme/diabook/jot.tpl | 1 + view/theme/dispy/comment_item.tpl | 1 + view/theme/dispy/jot.tpl | 1 + view/theme/duepuntozero/comment_item.tpl | 1 + view/theme/facepark/comment_item.tpl | 1 + view/theme/facepark/jot.tpl | 1 + view/theme/frost-mobile/comment_item.tpl | 1 + view/theme/frost-mobile/jot.tpl | 1 + view/theme/frost/comment_item.tpl | 1 + view/theme/frost/jot.tpl | 1 + view/theme/quattro/comment_item.tpl | 1 + view/theme/quattro/jot.tpl | 1 + view/theme/smoothly/jot.tpl | 1 + view/theme/testbubble/comment_item.tpl | 1 + view/theme/testbubble/jot.tpl | 1 + 27 files changed, 62 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index a96d223a0e..d231d87d1c 100644 --- a/boot.php +++ b/boot.php @@ -1796,3 +1796,10 @@ function curPageURL() { return $pageURL; } +function random_digits($digits) { + $rn = ''; + for($i = 0; $i < $digits; $i++) { + $rn .= rand(0,9); + } + return $rn; +} diff --git a/include/conversation.php b/include/conversation.php index 5f44cde7fb..45736051d0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -993,7 +993,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$profile_uid' => $x['profile_uid'], '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$cancel' => t('Cancel') + '$cancel' => t('Cancel'), + '$rand_num' => random_digits(12) )); diff --git a/mod/content.php b/mod/content.php index d827b5b57b..e0634b3e84 100644 --- a/mod/content.php +++ b/mod/content.php @@ -701,7 +701,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { '$edvideo' => t('Video'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => (($mode === 'network') ? $commentww : '') + '$ww' => (($mode === 'network') ? $commentww : ''), + '$rand_num' => random_digits(12) )); } } diff --git a/mod/editpost.php b/mod/editpost.php index 75b686bcd9..1dc6aea21e 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -139,7 +139,8 @@ function editpost_content(&$a) { '$preview' => t('Preview'), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), - '$cancel' => t('Cancel') + '$cancel' => t('Cancel'), + '$rand_num' => random_digits(12) )); return $o; diff --git a/mod/item.php b/mod/item.php index de6bce972c..6dbe99dfd0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -46,6 +46,19 @@ function item_post(&$a) { $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); + + // Check for doubly-submitted posts, and reject duplicates + // Note that we have to ignore previews, otherwise nothing will post + // after it's been previewed + if(!$preview && x($_REQUEST['post_id_random'])) { + if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { + logger("item post: duplicate post", LOGGER_DEBUG); + item_post_return($a->get_baseurl(), $api_source, $return_path); + } + else + $_SESSION['post-random'] = $_REQUEST['post_id_random']; + } + /** * Is this a reply to something? */ @@ -98,7 +111,7 @@ function item_post(&$a) { // multi-level threading - preserve the info but re-parent to our single level threading //if(($parid) && ($parid != $parent)) - $thr_parent = $parent_uri; + $thr_parent = $parent_uri; if($parent_item['contact-id'] && $uid) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -873,30 +886,32 @@ function item_post(&$a) { logger('post_complete'); + item_post_return($a->get_baseurl(), $api_source, $return_path); + // NOTREACHED +} + +function item_post_return($baseurl, $api_source, $return_path) { // figure out how to return, depending on from whence we came if($api_source) return; if($return_path) { - goaway($a->get_baseurl() . "/" . $return_path); + goaway($baseurl . "/" . $return_path); } $json = array('success' => 1); if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) - $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload']; + $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; logger('post_json: ' . print_r($json,true), LOGGER_DEBUG); echo json_encode($json); killme(); - // NOTREACHED } - - function item_content(&$a) { if((! local_user()) && (! remote_user())) diff --git a/mod/photos.php b/mod/photos.php index 63b093dc37..fa4ca3fc0c 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1406,7 +1406,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } @@ -1449,7 +1450,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } @@ -1520,7 +1522,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } diff --git a/object/Item.php b/object/Item.php index 035255466a..b5837b6b66 100644 --- a/object/Item.php +++ b/object/Item.php @@ -567,7 +567,8 @@ class Item extends BaseObject { '$preview' => t('Preview'), '$indent' => $indent, '$sourceapp' => t($a->sourcename), - '$ww' => (($conv->get_mode() === 'network') ? $ww : '') + '$ww' => (($conv->get_mode() === 'network') ? $ww : ''), + '$rand_num' => random_digits(12) )); } diff --git a/view/comment_item.tpl b/view/comment_item.tpl index 3de24ca8d2..5783a409c5 100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -10,6 +10,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/jot.tpl b/view/jot.tpl index 91de628ac6..0f21766812 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -14,6 +14,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-text-wrap"> diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl index 9c3facaff0..e3c686f052 100644 --- a/view/theme/comix-plain/comment_item.tpl +++ b/view/theme/comix-plain/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl index 9c3facaff0..e3c686f052 100644 --- a/view/theme/comix/comment_item.tpl +++ b/view/theme/comix/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index fc3594fdc9..c5a24ec48e 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 1d94cb6d3c..a9c0a3740b 100644 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -13,6 +13,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="character-counter" class="grey"></div> diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl index aa63a03ed2..765b41437d 100644 --- a/view/theme/dispy/comment_item.tpl +++ b/view/theme/dispy/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 12969dd031..5809044859 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -9,6 +9,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div> <div id="character-counter" class="grey jothidden"></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl index 87e0605712..0f655ba43c 100755 --- a/view/theme/duepuntozero/comment_item.tpl +++ b/view/theme/duepuntozero/comment_item.tpl @@ -10,6 +10,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl index 3503c3843e..7e71aa380b 100644 --- a/view/theme/facepark/comment_item.tpl +++ b/view/theme/facepark/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl index 5fe1f954ee..6b24045ef3 100644 --- a/view/theme/facepark/jot.tpl +++ b/view/theme/facepark/jot.tpl @@ -14,6 +14,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-text-wrap"> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl index 570db68426..adcd5d75ed 100755 --- a/view/theme/frost-mobile/comment_item.tpl +++ b/view/theme/frost-mobile/comment_item.tpl @@ -21,6 +21,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >--> <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl index b491f448d7..7dd6893783 100644 --- a/view/theme/frost-mobile/jot.tpl +++ b/view/theme/frost-mobile/jot.tpl @@ -15,6 +15,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="source" value="$sourceapp" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-text-wrap"> diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl index 32d4d78ef9..3808038079 100755 --- a/view/theme/frost/comment_item.tpl +++ b/view/theme/frost/comment_item.tpl @@ -20,6 +20,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <!-- <div class="comment-edit-photo" id="comment-edit-photo-$id" >--> <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl index e7a89d8e07..9f7b71c531 100644 --- a/view/theme/frost/jot.tpl +++ b/view/theme/frost/jot.tpl @@ -14,6 +14,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-text-wrap"> diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl index 7d1d7550b2..3fbde16318 100644 --- a/view/theme/quattro/comment_item.tpl +++ b/view/theme/quattro/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 7f9f9bbaf1..55fc322d74 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -13,6 +13,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl index 437eec4373..f990c95e11 100644 --- a/view/theme/smoothly/jot.tpl +++ b/view/theme/smoothly/jot.tpl @@ -14,6 +14,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> </div> diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index 6d9230dbf8..1054b23e24 100644 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -6,6 +6,7 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index 89150534c3..12f60b29c0 100644 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl @@ -16,6 +16,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" name="post_id_random" value="$rand_num" /> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-text-wrap"> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> From 6effdd570c4905d3921859c0780a093e544defcb Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 17:42:40 -0600 Subject: [PATCH 19/41] add a confirm dialog and a busy rotator for delete selected --- include/conversation.php | 3 +- include/items.php | 4 +-- view/jot-header.tpl | 33 ++++++++++-------- view/theme/frost/jot-header.tpl | 1 + view/theme/frost/js/theme.js | 34 ++++++++++--------- view/theme/frost/threaded_conversation.tpl | 6 ++-- view/theme/quattro/threaded_conversation.tpl | 3 +- view/theme/smoothly/jot-header.tpl | 35 +++++++++++--------- view/theme/testbubble/jot-header.tpl | 33 ++++++++++-------- view/theme/vier/threaded_conversation.tpl | 3 +- view/threaded_conversation.tpl | 1 + 11 files changed, 91 insertions(+), 65 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 45736051d0..56d34f3d85 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -896,7 +896,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('Save to Folder:'), - '$whereareu' => t('Where are you right now?') + '$whereareu' => t('Where are you right now?'), + '$delitems' => t('Delete item(s)?') )); diff --git a/include/items.php b/include/items.php index 9203f663cf..939cefc3dd 100755 --- a/include/items.php +++ b/include/items.php @@ -3901,10 +3901,10 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be + proc_run('php',"include/notifier.php","drop","$drop_id"); + if(! $interactive) return $owner; - - proc_run('php',"include/notifier.php","drop","$drop_id"); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 64bcf27cab..d6f39d6c4e 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -158,21 +158,26 @@ function enableOnUser(){ }); function deleteCheckedItems() { - var checkedstr = ''; + if(confirm('$delitems')) { + var checkedstr = ''; - $('.item-select').each( function() { - if($(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $(this).val(); - } - else { - checkedstr = $(this).val(); - } - } - }); - $.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $("#item-delete-selected").hide(); + $('#item-delete-selected-rotator').show(); + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } function jotGetLink() { diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl index 16fd473170..04169beb58 100644 --- a/view/theme/frost/jot-header.tpl +++ b/view/theme/frost/jot-header.tpl @@ -12,5 +12,6 @@ window.baseURL = "$baseurl"; window.geoTag = function () { $geotag } window.ajaxType = 'jot-header'; + window.delItems = '$delitems'; </script> diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 37d06c80cb..801b94e07f 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -900,22 +900,26 @@ function wallInitEditor() { $j("#prvmail-text").contact_autocomplete(baseurl+"/acl"); } -function deleteCheckedItems() { - var checkedstr = ''; +function deleteCheckedItems(delID) { + if(confirm(window.delItems)) { + var checkedstr = ''; - $j('.item-select').each( function() { - if($j(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $j(this).val(); - } - else { - checkedstr = $j(this).val(); - } - } - }); - $j.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $j(delID).hide(); + $j(delID + '-rotator').show(); + $j('.item-select').each( function() { + if($j(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $j(this).val(); + } + else { + checkedstr = $j(this).val(); + } + } + }); + $j.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl index 1e77f91c2c..0f7f9a986f 100644 --- a/view/theme/frost/threaded_conversation.tpl +++ b/view/theme/frost/threaded_conversation.tpl @@ -1,8 +1,9 @@ {{ if $dropping }} -<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems();"> +<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');"> <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> <div id="item-delete-selected-top-desc" >$dropping</div> </div> +<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> {{ endif }} $live_update @@ -14,9 +15,10 @@ $live_update <div id="conversation-end"></div> {{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> +<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');"> <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> <div id="item-delete-selected-desc" >$dropping</div> </div> +<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> <div id="item-delete-selected-end"></div> {{ endif }} diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl index 7eadf7e9f4..5c534b5856 100644 --- a/view/theme/quattro/threaded_conversation.tpl +++ b/view/theme/quattro/threaded_conversation.tpl @@ -17,9 +17,10 @@ $live_update <div id="conversation-end"></div> {{ if $dropping }} -<a href="#" onclick="deleteCheckedItems();return false;"> +<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;"> <span class="icon s22 delete text">$dropping</span> </a> +<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> {{ endif }} <script> diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl index dbff99563c..b5cfcd9882 100644 --- a/view/theme/smoothly/jot-header.tpl +++ b/view/theme/smoothly/jot-header.tpl @@ -194,21 +194,26 @@ function initEditor(cb) { }); function deleteCheckedItems() { - var checkedstr = ''; + if(confirm('$delitems')) { + var checkedstr = ''; - $('.item-select').each( function() { - if($(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $(this).val(); - } - else { - checkedstr = $(this).val(); - } - } - }); - $.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $("#item-delete-selected").hide(); + $('#item-delete-selected-rotator').show(); + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } function jotGetLink() { @@ -356,4 +361,4 @@ function initEditor(cb) { $geotag -</script> \ No newline at end of file +</script> diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index 0d11da2717..79f489e786 100644 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl @@ -195,21 +195,26 @@ function initEditor(cb) { }); function deleteCheckedItems() { - var checkedstr = ''; + if(confirm('$delitems')) { + var checkedstr = ''; - $('.item-select').each( function() { - if($(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $(this).val(); - } - else { - checkedstr = $(this).val(); - } - } - }); - $.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $("#item-delete-selected").hide(); + $('#item-delete-selected-rotator').show(); + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } function jotGetLink() { diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl index 7eadf7e9f4..5c534b5856 100644 --- a/view/theme/vier/threaded_conversation.tpl +++ b/view/theme/vier/threaded_conversation.tpl @@ -17,9 +17,10 @@ $live_update <div id="conversation-end"></div> {{ if $dropping }} -<a href="#" onclick="deleteCheckedItems();return false;"> +<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;"> <span class="icon s22 delete text">$dropping</span> </a> +<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> {{ endif }} <script> diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl index 56adc8c969..24dab9c57b 100644 --- a/view/threaded_conversation.tpl +++ b/view/threaded_conversation.tpl @@ -11,5 +11,6 @@ $live_update <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> <div id="item-delete-selected-desc" >$dropping</div> </div> +<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> <div id="item-delete-selected-end"></div> {{ endif }} From 08121ad6b4ed44c170f76ad24cc6cd3ebecfe8f6 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Thu, 1 Nov 2012 17:21:39 -0700 Subject: [PATCH 20/41] rev update --- boot.php | 2 +- util/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index a96d223a0e..1a2daa4a1d 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1512' ); +define ( 'FRIENDICA_VERSION', '3.0.1514' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index fc2aeb127a..65ba3604dd 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1512\n" +"Project-Id-Version: 3.0.1514\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-30 10:00-0700\n" +"POT-Creation-Date: 2012-11-01 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" From c9248b66db226748ef2baec58ea651e852487dfe Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 18:31:50 -0600 Subject: [PATCH 21/41] display live update; don't collapse comments on live update --- include/conversation.php | 6 ++++- js/main.js | 34 +++++++++++++++++++++++-- js/main.min.js | 2 +- mod/display.php | 34 +++++++++++++++++++++---- mod/update_network.php | 30 +++++++++++----------- object/Item.php | 3 ++- view/head.tpl | 12 ++------- view/theme/dispy/head.tpl | 12 ++------- view/theme/frost-mobile/js/main.js | 32 +++++++++++++++++++++-- view/theme/frost-mobile/js/main.min.js | 2 +- view/theme/frost-mobile/js/theme.js | 11 -------- view/theme/frost-mobile/js/theme.min.js | 2 +- view/theme/frost/js/main.js | 32 +++++++++++++++++++++-- view/theme/frost/js/main.min.js | 2 +- view/theme/frost/js/theme.js | 11 -------- view/theme/frost/js/theme.min.js | 2 +- 16 files changed, 152 insertions(+), 75 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 56d34f3d85..43d20a4014 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -436,7 +436,11 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else if($mode === 'display') { $profile_owner = $a->profile['uid']; $page_writeable = can_write_wall($a,$profile_owner); - $live_update_div = '<div id="live-display"></div>' . "\r\n"; + if(!$update) { + $live_update_div = '<div id="live-display"></div>' . "\r\n" + . "<script> var profile_uid = " . $_SESSION['uid'] . ";" + . " var profile_page = 1; </script>"; + } } else if($mode === 'community') { $profile_owner = 0; diff --git a/js/main.js b/js/main.js index bd6dfc8520..4a75be747a 100644 --- a/js/main.js +++ b/js/main.js @@ -250,12 +250,13 @@ if($('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); } if($('#live-notes').length) { src = 'notes'; liveUpdate(); } - if($('#live-display').length) { + if($('#live-display').length) { src = 'display'; liveUpdate(); } +/* if($('#live-display').length) { if(liking) { liking = 0; window.location.href=window.location.href } - } + }*/ if($('#live-photos').length) { if(liking) { liking = 0; @@ -313,10 +314,26 @@ $('#' + prev).after($(this)); } else { + // Find out if the hidden comments are open, so we can keep it that way + // if a new comment has been posted + var id = $('.hide-comments-total', this).attr('id'); + if(typeof id != 'undefined') { + id = id.split('-')[3]; + var commentsOpen = $("#collapsed-comments-" + id).is(":visible"); + } + $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); + //vScroll = $(document).scrollTop(); + $('html').height($('html').height()); $('#' + ident).replaceWith($(this)); + + if(typeof id != 'undefined') { + if(commentsOpen) showHideComments(id); + } + $('html').height('auto'); + //$(document).scrollTop(vScroll); } prev = ident; }); @@ -503,6 +520,19 @@ + function showHideComments(id) { + if( $("#collapsed-comments-" + id).is(":visible")) { + $("#collapsed-comments-" + id).hide(); + $("#hide-comments-" + id).html(window.showMore); + } + else { + $("#collapsed-comments-" + id).show(); + $("#hide-comments-" + id).html(window.showFewer); + } + } + + + function preview_post() { $("#jot-preview").val("1"); $("#jot-preview-content").show(); diff --git a/js/main.min.js b/js/main.min.js index f94d4dc98e..a581e4b85c 100644 --- a/js/main.min.js +++ b/js/main.min.js @@ -1 +1 @@ -function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$("body .fakelink").css("cursor","wait"),$.get("group/"+e+"/"+t+"?t="+n,function(e){$("#group-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$("body .fakelink").css("cursor","wait"),$.get("profperm/"+e+"/"+t,function(e){$("#prof-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$("body").css("cursor","wait"),$.get("contactgroup/"+e+"/"+t,function(e){$("body").css("cursor","auto")})}function checkboxhighlight(e){$(e).is(":checked")?$(e).addClass("checkeditem"):$(e).removeClass("checkeditem")}function notifyMarkAll(){$.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$(e).val(),$.getJSON("pretheme?f=&theme="+theme,function(e){$("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file +function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&(src="display",liveUpdate()),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");if($("#"+e).length==0&&profile_page==1)$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this));else{var t=$(".hide-comments-total",this).attr("id");if(typeof t!="undefined"){t=t.split("-")[3];var n=$("#collapsed-comments-"+t).is(":visible")}$("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("html").height($("html").height()),$("#"+e).replaceWith($(this)),typeof t!="undefined"&&n&&showHideComments(t),$("html").height("auto")}prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dosubthread(e){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("subthread/"+e.toString(),NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function showHideComments(e){$("#collapsed-comments-"+e).is(":visible")?($("#collapsed-comments-"+e).hide(),$("#hide-comments-"+e).html(window.showMore)):($("#collapsed-comments-"+e).show(),$("#hide-comments-"+e).html(window.showFewer))}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$("body .fakelink").css("cursor","wait"),$.get("group/"+e+"/"+t+"?t="+n,function(e){$("#group-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$("body .fakelink").css("cursor","wait"),$.get("profperm/"+e+"/"+t,function(e){$("#prof-update-wrapper").html(e),$("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$("body").css("cursor","wait"),$.get("contactgroup/"+e+"/"+t,function(e){$("body").css("cursor","auto")})}function checkboxhighlight(e){$(e).is(":checked")?$(e).addClass("checkeditem"):$(e).removeClass("checkeditem")}function notifyMarkAll(){$.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$(e).val(),$.getJSON("pretheme?f=&theme="+theme,function(e){$("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("<div>").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("<div>").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("all-events").text();c==0?(c="",$("#allevents-update").removeClass("show")):$("#allevents-update").addClass("show"),$("#allevents-update").html(c);var h=$(s).find("all-events-today").text();h==0?$("#allevents-update").removeClass("notif-allevents-today"):$("#allevents-update").addClass("notif-allevents-today");var p=$(s).find("events").text();p==0?(p="",$("#events-update").removeClass("show")):$("#events-update").addClass("show"),$("#events-update").html(p);var d=$(s).find("events-today").text();d==0?$("#events-update").removeClass("notif-events-today"):$("#events-update").addClass("notif-events-today");var v=$(s).find("birthdays").text();v==0?(v="",$("#birthdays-update").removeClass("show")):$("#birthdays-update").addClass("show"),$("#birthdays-update").html(v);var m=$(s).find("birthdays-today").text();m==0?$("#birthdays-update").removeClass("notif-birthdays-today"):$("#birthdays-update").addClass("notif-birthdays-today");var g=$(s).find("notif");g.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),g.children("note").each(function(){e=$(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=g.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var y=$(s).find("sysmsgs");y.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),y.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file diff --git a/mod/display.php b/mod/display.php index be4a0ab9f9..6305dd44e7 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,7 +1,7 @@ <?php -function display_content(&$a) { +function display_content(&$a, $update = 0) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); @@ -19,10 +19,20 @@ function display_content(&$a) { $a->page['htmlhead'] .= get_markup_template('display-head.tpl'); - $nick = (($a->argc > 1) ? $a->argv[1] : ''); + if($update) { + $nick = $_REQUEST['nick']; + } + else { + $nick = (($a->argc > 1) ? $a->argv[1] : ''); + } profile_load($a,$nick); - $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + if($update) { + $item_id = $_REQUEST['item_id']; + } + else { + $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + } if(! $item_id) { $a->error = 404; @@ -97,6 +107,18 @@ function display_content(&$a) { $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); + if($update) { + $r = q("SELECT id FROM item WHERE item.uid = %d + AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) + $sql_extra AND unseen = 1", + intval($a->profile['uid']), + dbesc($item_id), + dbesc($item_id) + ); + if(!$r) + return ''; + } + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, @@ -124,8 +146,10 @@ function display_content(&$a) { } $items = conv_sort($r,"`commented`"); - - $o .= conversation($a,$items,'display', false); + + if(!$update) + $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>"; + $o .= conversation($a,$items,'display', $update); } else { diff --git a/mod/update_network.php b/mod/update_network.php index 36de0722a9..0dfe0a73ff 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -14,25 +14,25 @@ function update_network_content(&$a) { echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); - $text = network_content($a,$profile_uid); - $pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; - $replace = "<img\${1} dst=\"\${2}\""; - $text = preg_replace($pattern, $replace, $text); + $text = network_content($a,$profile_uid); + $pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; + $replace = "<img\${1} dst=\"\${2}\""; + $text = preg_replace($pattern, $replace, $text); - $replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; - $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; - $text = preg_replace($pattern, $replace, $text); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); + $replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); - echo str_replace("\t",' ',$text); + echo str_replace("\t",' ',$text); echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); echo "</body></html>\r\n"; killme(); -} \ No newline at end of file +} diff --git a/object/Item.php b/object/Item.php index b5837b6b66..9ec63b4f20 100644 --- a/object/Item.php +++ b/object/Item.php @@ -545,7 +545,8 @@ class Item extends BaseObject { $comment_box = replace_macros($template,array( '$return_path' => '', '$threaded' => $this->is_threaded(), - '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), +// '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), + '$jsreload' => '', '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'), '$id' => $this->get_id(), '$parent' => $this->get_id(), diff --git a/view/head.tpl b/view/head.tpl index 42bd92f4ce..f861060c77 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -89,16 +89,8 @@ $(obj).val(''); } - function showHideComments(id) { - if( $('#collapsed-comments-' + id).is(':visible')) { - $('#collapsed-comments-' + id).hide(); - $('#hide-comments-' + id).html('$showmore'); - } - else { - $('#collapsed-comments-' + id).show(); - $('#hide-comments-' + id).html('$showfewer'); - } - } + window.showMore = "$showmore"; + window.showFewer = "$showfewer"; function showHideCommentBox(id) { if( $('#comment-edit-form-' + id).is(':visible')) { diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index 3d1701b29e..027c5d3723 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -84,16 +84,8 @@ $(obj).val(''); } - function showHideComments(id) { - if( $('#collapsed-comments-' + id).is(':visible')) { - $('#collapsed-comments-' + id).hide(); - $('#hide-comments-' + id).html('$showmore'); - } - else { - $('#collapsed-comments-' + id).show(); - $('#hide-comments-' + id).html('$showfewer'); - } - } + window.showMore = "$showmore"; + window.showFewer = "$showfewer"; function showHideCommentBox(id) { if( $('#comment-edit-form-' + id).is(':visible')) { diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index 6daa19b417..b751b8398f 100644 --- a/view/theme/frost-mobile/js/main.js +++ b/view/theme/frost-mobile/js/main.js @@ -243,12 +243,13 @@ if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } if($j('#live-community').length) { src = 'community'; liveUpdate(); } if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } - if($j('#live-display').length) { + if($j('#live-display').length) { src = 'display'; liveUpdate(); } + /*if($j('#live-display').length) { if(liking) { liking = 0; window.location.href=window.location.href } - } + }*/ if($j('#live-photos').length) { if(liking) { liking = 0; @@ -307,10 +308,26 @@ $j('#' + prev).after($j(this)); } else { + // Find out if the hidden comments are open, so we can keep it that way + // if a new comment has been posted + var id = $j('.hide-comments-total', this).attr('id'); + if(typeof id != 'undefined') { + id = id.split('-')[3]; + var commentsOpen = $j("#collapsed-comments-" + id).is(":visible"); + } + $j('img',this).each(function() { $j(this).attr('src',$j(this).attr('dst')); }); + //vScroll = $j(document).scrollTop(); + $j('html').height($j('html').height()); $j('#' + ident).replaceWith($j(this)); + + if(typeof id != 'undefined') { + if(commentsOpen) showHideComments(id); + } + $j('html').height('auto'); + //$j(document).scrollTop(vScroll); } prev = ident; }); @@ -517,6 +534,17 @@ } + function showHideComments(id) { + if( $j("#collapsed-comments-" + id).is(":visible")) { + $j("#collapsed-comments-" + id).hide(); + $j("#hide-comments-" + id).html(window.showMore); + } + else { + $j("#collapsed-comments-" + id).show(); + $j("#hide-comments-" + id).html(window.showFewer); + } + } + function preview_post() { $j("#jot-preview").val("1"); diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js index c0de3f6b9a..64d52ee006 100644 --- a/view/theme/frost-mobile/js/main.min.js +++ b/view/theme/frost-mobile/js/main.min.js @@ -1 +1 @@ -function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e});var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file +function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&(src="display",liveUpdate()),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");if($j("#"+e).length==0&&profile_page==1)$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this));else{var t=$j(".hide-comments-total",this).attr("id");if(typeof t!="undefined"){t=t.split("-")[3];var n=$j("#collapsed-comments-"+t).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("html").height($j("html").height()),$j("#"+e).replaceWith($j(this)),typeof t!="undefined"&&n&&showHideComments(t),$j("html").height("auto")}prev=e});var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+"</div>")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js index 571720e7c4..3c0db8fbf9 100644 --- a/view/theme/frost-mobile/js/theme.js +++ b/view/theme/frost-mobile/js/theme.js @@ -533,17 +533,6 @@ function qCommentInsert(obj,id) { $j(obj).val(""); } -function showHideComments(id) { - if( $j("#collapsed-comments-" + id).is(":visible")) { - $j("#collapsed-comments-" + id).hide(); - $j("#hide-comments-" + id).html(window.showMore); - } - else { - $j("#collapsed-comments-" + id).show(); - $j("#hide-comments-" + id).html(window.showFewer); - } -} - /*function showHideCommentBox(id) { if( $j('#comment-edit-form-' + id).is(':visible')) { $j('#comment-edit-form-' + id).hide(); diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js index 60dad6220b..2861ce9412 100644 --- a/view/theme/frost-mobile/js/theme.min.js +++ b/view/theme/frost-mobile/js/theme.min.js @@ -1 +1 @@ -function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file +function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js index 36d59bf1c9..dbeb4f2ee3 100644 --- a/view/theme/frost/js/main.js +++ b/view/theme/frost/js/main.js @@ -236,12 +236,13 @@ if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } if($j('#live-community').length) { src = 'community'; liveUpdate(); } if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } - if($j('#live-display').length) { + if($j('#live-display').length) { src = 'display'; liveUpdate(); } + /*if($j('#live-display').length) { if(liking) { liking = 0; window.location.href=window.location.href } - } + }*/ if($j('#live-photos').length) { if(liking) { liking = 0; @@ -300,10 +301,26 @@ $j('#' + prev).after($j(this)); } else { + // Find out if the hidden comments are open, so we can keep it that way + // if a new comment has been posted + var id = $j('.hide-comments-total', this).attr('id'); + if(typeof id != 'undefined') { + id = id.split('-')[3]; + var commentsOpen = $j("#collapsed-comments-" + id).is(":visible"); + } + $j('img',this).each(function() { $j(this).attr('src',$j(this).attr('dst')); }); + //vScroll = $j(document).scrollTop(); + $j('html').height($j('html').height()); $j('#' + ident).replaceWith($j(this)); + + if(typeof id != 'undefined') { + if(commentsOpen) showHideComments(id); + } + $j('html').height('auto'); + //$j(document).scrollTop(vScroll); } prev = ident; }); @@ -510,6 +527,17 @@ } + function showHideComments(id) { + if( $j("#collapsed-comments-" + id).is(":visible")) { + $j("#collapsed-comments-" + id).hide(); + $j("#hide-comments-" + id).html(window.showMore); + } + else { + $j("#collapsed-comments-" + id).show(); + $j("#hide-comments-" + id).html(window.showFewer); + } + } + function preview_post() { $j("#jot-preview").val("1"); diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js index 463b4a6e4e..9952000d53 100644 --- a/view/theme/frost/js/main.min.js +++ b/view/theme/frost/js/main.min.js @@ -1 +1 @@ -function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file +function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&(src="display",liveUpdate()),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");if($j("#"+e).length==0&&profile_page==1)$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this));else{var t=$j(".hide-comments-total",this).attr("id");if(typeof t!="undefined"){t=t.split("-")[3];var n=$j("#collapsed-comments-"+t).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("html").height($j("html").height()),$j("#"+e).replaceWith($j(this)),typeof t!="undefined"&&n&&showHideComments(t),$j("html").height("auto")}prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");var t=$j(".wall-item-body > img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n<r;n++)i[n]=e.charCodeAt(n).toString(16).replace(/^([\da-f])$/,"0$1");return i.join("")}function groupChangeMember(e,t,n){$j("body .fakelink").css("cursor","wait"),$j.get("group/"+e+"/"+t+"?t="+n,function(e){$j("#group-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function profChangeMember(e,t){$j("body .fakelink").css("cursor","wait"),$j.get("profperm/"+e+"/"+t,function(e){$j("#prof-update-wrapper").html(e),$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(e,t){$j("body").css("cursor","wait"),$j.get("contactgroup/"+e+"/"+t,function(e){$j("body").css("cursor","auto")})}function checkboxhighlight(e){$j(e).is(":checked")?$j(e).addClass("checkeditem"):$j(e).removeClass("checkeditem")}function notifyMarkAll(){$j.get("notify/mark/all",function(e){timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(e,t,n,r){var i=baseurl+"/fbrowser/"+n+"/";return tinyMCE.activeEditor.windowManager.open({file:i,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:r,input:e}),!1}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser"})}function previewTheme(e){theme=$j(e).val(),$j.getJSON("pretheme?f=&theme="+theme,function(e){$j("#theme-preview").html('<div id="theme-desc">'+e.desc+'</div><div id="theme-version">'+e.version+'</div><div id="theme-credits">'+e.credits+'</div><a href="'+e.img+'"><img src="'+e.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>"),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t<arguments.length;t++){var n=new RegExp("\\{"+t+"\\}","gi");e=e.replace(n,arguments[t])}return e},Array.prototype.remove=function(e){to=undefined,from=this.indexOf(e);var t=this.slice((to||from)+1||this.length);return this.length=from<0?this.length+from:from,this.push.apply(this,t)}; \ No newline at end of file diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 801b94e07f..197f85f1f0 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -584,17 +584,6 @@ function qCommentInsert(obj,id) { $j(obj).val(""); } -function showHideComments(id) { - if( $j("#collapsed-comments-" + id).is(":visible")) { - $j("#collapsed-comments-" + id).hide(); - $j("#hide-comments-" + id).html(window.showMore); - } - else { - $j("#collapsed-comments-" + id).show(); - $j("#hide-comments-" + id).html(window.showFewer); - } -} - /*function showHideCommentBox(id) { if( $j('#comment-edit-form-' + id).is(':visible')) { $j('#comment-edit-form-' + id).hide(); diff --git a/view/theme/frost/js/theme.min.js b/view/theme/frost/js/theme.min.js index c04d99b5ab..941671ae01 100644 --- a/view/theme/frost/js/theme.min.js +++ b/view/theme/frost/js/theme.min.js @@ -1 +1 @@ -function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html(" "),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){plaintext!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file +function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html(" "),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){plaintext!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(e){if(confirm(window.delItems)){var t="";$j(e).hide(),$j(e+"-rotator").show(),$j(".item-select").each(function(){$j(this).is(":checked")&&(t.length!=0?t=t+","+$j(this).val():t=$j(this).val())}),$j.post("item",{dropitems:t},function(e){window.location.reload()})}}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file From c6a3b87359b56fe8899eae5432af7b8bd0db9d37 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta <fermion@gmx.com> Date: Thu, 1 Nov 2012 18:36:11 -0600 Subject: [PATCH 22/41] update_display for display live updates --- mod/update_display.php | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 mod/update_display.php diff --git a/mod/update_display.php b/mod/update_display.php new file mode 100644 index 0000000000..e10af08437 --- /dev/null +++ b/mod/update_display.php @@ -0,0 +1,38 @@ +<?php + +// See update_profile.php for documentation + +require_once('mod/display.php'); +require_once('include/group.php'); + +function update_display_content(&$a) { + + $profile_uid = intval($_GET['p']); + + header("Content-type: text/html"); + echo "<!DOCTYPE html><html><body>\r\n"; + echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); + + + $text = display_content($a,$profile_uid); + $pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; + $replace = "<img\${1} dst=\"\${2}\""; + $text = preg_replace($pattern, $replace, $text); + + $replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + + + echo str_replace("\t",' ',$text); + echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); + echo "</body></html>\r\n"; + killme(); + +} From e8fa4279fa1eab4ff07751e1e01a9ebb39506990 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Fri, 2 Nov 2012 04:20:12 -0700 Subject: [PATCH 23/41] no profile pic on photos page if no photos have been uploaded --- mod/photos.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 63b093dc37..ced27015b5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -27,6 +27,11 @@ function photos_init(&$a) { if(! count($r)) return; + $o .= '<div class="vcard">'; + $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; + $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>'; + $o .= '</div>'; + $a->data['user'] = $r[0]; $sql_extra = permissions_sql($a->data['user']['uid']); @@ -38,11 +43,6 @@ function photos_init(&$a) { if(count($albums)) { $a->data['albums'] = $albums; - $o .= '<div class="vcard">'; - $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; - $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>'; - $o .= '</div>'; - $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true); if($albums_visible) { From 7de5c7ebe1fba7757f06762d26dae478c9de5389 Mon Sep 17 00:00:00 2001 From: zottel <github@zottel.net> Date: Fri, 2 Nov 2012 21:43:47 +0100 Subject: [PATCH 24/41] Changes to make contacts delete all content from the user when a user is deleted. NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't have a clone of the addons repository. Please someone do that for me. Thanks. Please check carefully. I tested locally on my server, but not with other servers. --- include/Contact.php | 8 ++++++-- include/api.php | 2 +- include/auth.php | 4 ++-- include/delivery.php | 2 +- include/diaspora.php | 2 +- include/notifier.php | 16 +++++++++++++++- include/oauth.php | 2 +- include/poller.php | 12 +++++++++++- mod/dfrn_notify.php | 4 ++-- mod/openid.php | 2 +- mod/post.php | 2 +- mod/profile.php | 2 +- mod/pubsub.php | 4 ++-- mod/receive.php | 2 +- mod/salmon.php | 2 +- 15 files changed, 47 insertions(+), 19 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index ecc271a8e0..1a7a1676a7 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -22,7 +22,8 @@ function user_remove($uid) { $r[0]['nickname'] ); - q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid)); + // don't delete yet, will be done later when contacts have deleted my stuff + // q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `group` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid)); @@ -41,7 +42,10 @@ function user_remove($uid) { q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `search` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid)); - q("DELETE FROM `user` WHERE `uid` = %d", intval($uid)); + // don't delete yet, will be done later when contacts have deleted my stuff + // q("DELETE FROM `user` WHERE `uid` = %d", intval($uid)); + q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid)); + proc_run('php', "include/notifier.php", "removeme", $uid); if($uid == local_user()) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); diff --git a/include/api.php b/include/api.php index 456d984de1..7517abb70c 100644 --- a/include/api.php +++ b/include/api.php @@ -74,7 +74,7 @@ // process normal login request $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) - AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", dbesc(trim($user)), dbesc(trim($user)), dbesc($encrypted) diff --git a/include/auth.php b/include/auth.php index c4f1f08651..523de88ce9 100644 --- a/include/auth.php +++ b/include/auth.php @@ -59,7 +59,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p } $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` - FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", intval($_SESSION['uid']) ); @@ -147,7 +147,7 @@ else { $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) - AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])), dbesc($encrypted) diff --git a/include/delivery.php b/include/delivery.php index 14226e4fba..613453bc7a 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -323,7 +323,7 @@ function delivery_run($argv, $argc){ WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' $sql_extra - AND `user`.`account_expired` = 0 LIMIT 1", + AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1", dbesc(NETWORK_DFRN), dbesc($nickname) ); diff --git a/include/diaspora.php b/include/diaspora.php index c5b724509c..f645aeb39b 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -16,7 +16,7 @@ function diaspora_dispatch_public($msg) { return; } - $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ", + $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 AND `account_removed` = 0 ", dbesc(NETWORK_DIASPORA), dbesc($msg['author']) ); diff --git a/include/notifier.php b/include/notifier.php index 171b55fc37..a999c3297b 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -134,6 +134,20 @@ function notifier_run($argv, $argc){ $recipients[] = $suggest[0]['cid']; $item = $suggest[0]; } + elseif($cmd === 'removeme') { + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id)); + $user = $r[0]; + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id)); + $self = $r[0]; + $r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id)); + if(! count($r)) + return; + require_once('include/Contact.php'); + foreach($r as $contact) { + terminate_friendship($user, $self, $contact); + } + return; + } else { // find ancestors @@ -575,7 +589,7 @@ function notifier_run($argv, $argc){ AND `contact`.`pending` = 0 AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' $sql_extra - AND `user`.`account_expired` = 0 LIMIT 1", + AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1", dbesc(NETWORK_DFRN), dbesc($nickname) ); diff --git a/include/oauth.php b/include/oauth.php index 103d4c2fa9..28ac4428f0 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -133,7 +133,7 @@ class FKOAuth1 extends OAuthServer { function loginUser($uid){ logger("FKOAuth1::loginUser $uid"); $a = get_app(); - $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", intval($uid) ); if(count($r)){ diff --git a/include/poller.php b/include/poller.php index fefc9b381d..ce8399a485 100644 --- a/include/poller.php +++ b/include/poller.php @@ -67,6 +67,16 @@ function poller_run($argv, $argc){ q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 AND `account_expires_on` != '0000-00-00 00:00:00' AND `account_expires_on` < UTC_TIMESTAMP() "); + + // delete user and contact records for recently removed accounts + + $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); + if (count($r)) { + foreach($r as $user) { + q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); + q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); + } + } $abandon_days = intval(get_config('system','account_abandon_days')); if($abandon_days < 1) @@ -154,7 +164,7 @@ function poller_run($argv, $argc){ $sql_extra AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `contact`.`archive` = 0 - AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()", + AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND), dbesc(NETWORK_DIASPORA), diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index e55da55722..476212b7af 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -77,7 +77,7 @@ function dfrn_notify_post(&$a) { FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 $sql_extra LIMIT 1", + AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1", dbesc($a->argv[1]) ); @@ -220,7 +220,7 @@ function dfrn_notify_content(&$a) { $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' - AND `user`.`account_expired` = 0 $sql_extra LIMIT 1", + AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1", dbesc($a->argv[1]) ); diff --git a/mod/openid.php b/mod/openid.php index e2cea7d851..5d5539f00e 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -27,7 +27,7 @@ function openid_content(&$a) { $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 - AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", dbesc($authid) ); diff --git a/mod/post.php b/mod/post.php index 4a7e33b23b..c0e783a6aa 100644 --- a/mod/post.php +++ b/mod/post.php @@ -20,7 +20,7 @@ function post_post(&$a) { else { $nickname = $a->argv[2]; $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' - AND `account_expired` = 0 LIMIT 1", + AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nickname) ); if(! count($r)) diff --git a/mod/profile.php b/mod/profile.php index 6a80909e73..827166f927 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -12,7 +12,7 @@ function profile_init(&$a) { if($a->argc > 1) $which = $a->argv[1]; else { - $r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1"); + $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1"); if(count($r)) { goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); } diff --git a/mod/pubsub.php b/mod/pubsub.php index 64fbda289f..0e29628b80 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -44,7 +44,7 @@ function pubsub_init(&$a) { $subscribe = (($hub_mode === 'subscribe') ? 1 : 0); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) { @@ -112,7 +112,7 @@ function pubsub_post(&$a) { $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) diff --git a/mod/receive.php b/mod/receive.php index 2bd3cc65bc..0523fd9cc5 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -31,7 +31,7 @@ function receive_post(&$a) { $guid = $a->argv[2]; - $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($guid) ); if(! count($r)) diff --git a/mod/salmon.php b/mod/salmon.php index 1e16f9d14b..5df1e1c9e5 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -30,7 +30,7 @@ function salmon_post(&$a) { $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) From 2871fd4793a6bdb2f31a3ae1b39c354d58d619ed Mon Sep 17 00:00:00 2001 From: zottel <github@zottel.net> Date: Fri, 2 Nov 2012 23:54:03 +0100 Subject: [PATCH 25/41] Depublish public posts when archiving a contact --- include/Contact.php | 1 + mod/contacts.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/Contact.php b/include/Contact.php index 1a7a1676a7..d39d7a28b6 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -169,6 +169,7 @@ function mark_for_death($contact) { q("update contact set `archive` = 1 where id = %d limit 1", intval($contact['id']) ); + q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid'])); //contact_remove($contact['id']); diff --git a/mod/contacts.php b/mod/contacts.php index 8a36fa4cb6..7668b45b3a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -211,6 +211,9 @@ function contacts_content(&$a) { intval($contact_id), intval(local_user()) ); + if ($archived) { + q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user())); + } if($r) { //notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL ); info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL ); From 3303d9db7564cb73984755be5c54365d61653b8b Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Sat, 3 Nov 2012 14:43:48 -0700 Subject: [PATCH 26/41] put 1i8n position orders in welcome string --- boot.php | 6 +++--- mod/dfrn_poll.php | 4 ++-- util/messages.po | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boot.php b/boot.php index 1a2daa4a1d..3269761c6d 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1514' ); +define ( 'FRIENDICA_VERSION', '3.0.1516' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); @@ -1506,9 +1506,9 @@ if(! function_exists('proc_run')) { $cmdline = implode($args," "); if(get_config('system','proc_windows')) - proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo)); + proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); else - proc_close(proc_open($cmdline." &",array(),$foo)); + proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); } } diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 0d703dfb31..8abe42abbb 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -96,7 +96,7 @@ function dfrn_poll_init(&$a) { $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); + info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); // Visitors get 1 day session. $session_id = session_id(); $expire = time() + 86400; @@ -527,7 +527,7 @@ function dfrn_poll_content(&$a) { $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); + info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); // Visitors get 1 day session. $session_id = session_id(); $expire = time() + 86400; diff --git a/util/messages.po b/util/messages.po index 65ba3604dd..36fcb59129 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1514\n" +"Project-Id-Version: 3.0.1516\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-01 10:00-0700\n" +"POT-Creation-Date: 2012-11-03 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" From 0627fdcce7d183cc95aa9bc38e5df761a27fd150 Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Sat, 3 Nov 2012 15:29:47 -0700 Subject: [PATCH 27/41] positional params in "was tagged in a photo" string --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 67a4b0ad00..12ca99e60f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -603,7 +603,7 @@ function photos_post(&$a) { $arr['tag'] = $tagged[4]; $arr['inform'] = $tagged[2]; $arr['origin'] = 1; - $arr['body'] = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ; + $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>'; From 6ca9f0e5fadba43f2330a09bb4f76ecb7cd9c0db Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Sat, 3 Nov 2012 15:31:33 -0700 Subject: [PATCH 28/41] string update --- util/messages.po | 278 ++++++++++++++++++++++++----------------------- 1 file changed, 142 insertions(+), 136 deletions(-) diff --git a/util/messages.po b/util/messages.po index 36fcb59129..8f7293eeba 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 3.0.1516\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 10:00-0700\n" +"POT-Creation-Date: 2012-11-03 15:31-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,6 +23,7 @@ msgstr "" #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +#: ../../mod/update_display.php:22 msgid "[Embedded content - reload page to view]" msgstr "" @@ -45,14 +46,14 @@ msgstr "" #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 -#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 -#: ../../mod/display.php:141 ../../mod/profiles.php:7 +#: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 @@ -131,8 +132,8 @@ msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1027 #: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1520 ../../mod/install.php:246 +#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 +#: ../../mod/photos.php:1522 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -181,7 +182,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -359,7 +360,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1001 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -384,7 +385,7 @@ msgstr "" #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #, php-format -msgid "%s welcomes %s" +msgid "%1$s welcomes %2$s" msgstr "" #: ../../mod/api.php:76 ../../mod/api.php:102 @@ -435,14 +436,14 @@ msgstr "" #: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 -#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 +#: ../../mod/photos.php:1565 ../../mod/photos.php:1577 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 +#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615 msgid "Upload New Photos" msgstr "" @@ -479,20 +480,12 @@ msgid "Delete Photo" msgstr "" #: ../../mod/photos.php:606 -msgid "was tagged in a" -msgstr "" - -#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 -#: ../../include/conversation.php:253 -#: ../../addon.old/communityhome/communityhome.php:163 -msgid "photo" +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" msgstr "" #: ../../mod/photos.php:606 -msgid "by" +msgid "a photo" msgstr "" #: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 @@ -570,7 +563,7 @@ msgstr "" msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1598 msgid "View Photo" msgstr "" @@ -645,49 +638,49 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../include/conversation.php:957 +#: ../../mod/photos.php:1386 ../../include/conversation.php:962 msgid "Share" msgstr "" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:845 +#: ../../mod/content.php:482 ../../mod/content.php:846 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:620 -#: ../../include/conversation.php:976 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:624 +#: ../../include/conversation.php:981 ../../object/Item.php:258 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1517 ../../mod/content.php:690 -#: ../../object/Item.php:555 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/content.php:690 +#: ../../object/Item.php:556 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 +#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585 +#: ../../object/Item.php:558 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:994 -#: ../../object/Item.php:567 +#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 +#: ../../mod/photos.php:1523 ../../mod/editpost.php:139 +#: ../../mod/content.php:702 ../../include/conversation.php:999 +#: ../../object/Item.php:568 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1489 ../../mod/content.php:439 -#: ../../mod/content.php:723 ../../mod/settings.php:606 +#: ../../mod/photos.php:1491 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:565 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:117 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1601 +#: ../../mod/photos.php:1604 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1610 +#: ../../mod/photos.php:1613 msgid "Recent Photos" msgstr "" @@ -745,96 +738,96 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:943 +#: ../../mod/editpost.php:88 ../../include/conversation.php:948 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:710 +#: ../../mod/editpost.php:103 ../../mod/content.php:711 #: ../../mod/settings.php:605 ../../object/Item.php:107 msgid "Edit" msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:963 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:959 +#: ../../mod/editpost.php:105 ../../include/conversation.php:964 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:960 +#: ../../mod/editpost.php:106 ../../include/conversation.php:965 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:961 +#: ../../mod/editpost.php:107 ../../include/conversation.php:966 msgid "attach file" msgstr "" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:967 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:963 +#: ../../mod/editpost.php:109 ../../include/conversation.php:968 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:964 +#: ../../mod/editpost.php:110 ../../include/conversation.php:969 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:965 +#: ../../mod/editpost.php:111 ../../include/conversation.php:970 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:966 +#: ../../mod/editpost.php:112 ../../include/conversation.php:971 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:967 +#: ../../mod/editpost.php:113 ../../include/conversation.php:972 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:968 +#: ../../mod/editpost.php:114 ../../include/conversation.php:973 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:969 +#: ../../mod/editpost.php:115 ../../include/conversation.php:974 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:970 +#: ../../mod/editpost.php:116 ../../include/conversation.php:975 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:971 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:977 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:986 +#: ../../mod/editpost.php:127 ../../include/conversation.php:991 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:987 +#: ../../mod/editpost.php:128 ../../include/conversation.php:992 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:973 +#: ../../mod/editpost.php:131 ../../include/conversation.php:978 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:975 +#: ../../mod/editpost.php:133 ../../include/conversation.php:980 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:989 +#: ../../mod/editpost.php:134 ../../include/conversation.php:994 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1376,25 +1369,25 @@ msgstr "" msgid "Group: " msgstr "" -#: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:564 ../../object/Item.php:116 +#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../include/conversation.php:568 ../../object/Item.php:116 msgid "Select" msgstr "" -#: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:583 +#: ../../mod/content.php:455 ../../mod/content.php:816 +#: ../../mod/content.php:817 ../../include/conversation.php:587 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:603 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:828 +#: ../../include/conversation.php:607 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:618 +#: ../../mod/content.php:480 ../../include/conversation.php:622 msgid "View in context" msgstr "" @@ -1436,71 +1429,71 @@ msgstr "" msgid "share" msgstr "" -#: ../../mod/content.php:694 ../../object/Item.php:559 +#: ../../mod/content.php:694 ../../object/Item.php:560 msgid "Bold" msgstr "" -#: ../../mod/content.php:695 ../../object/Item.php:560 +#: ../../mod/content.php:695 ../../object/Item.php:561 msgid "Italic" msgstr "" -#: ../../mod/content.php:696 ../../object/Item.php:561 +#: ../../mod/content.php:696 ../../object/Item.php:562 msgid "Underline" msgstr "" -#: ../../mod/content.php:697 ../../object/Item.php:562 +#: ../../mod/content.php:697 ../../object/Item.php:563 msgid "Quote" msgstr "" -#: ../../mod/content.php:698 ../../object/Item.php:563 +#: ../../mod/content.php:698 ../../object/Item.php:564 msgid "Code" msgstr "" -#: ../../mod/content.php:699 ../../object/Item.php:564 +#: ../../mod/content.php:699 ../../object/Item.php:565 msgid "Image" msgstr "" -#: ../../mod/content.php:700 ../../object/Item.php:565 +#: ../../mod/content.php:700 ../../object/Item.php:566 msgid "Link" msgstr "" -#: ../../mod/content.php:701 ../../object/Item.php:566 +#: ../../mod/content.php:701 ../../object/Item.php:567 msgid "Video" msgstr "" -#: ../../mod/content.php:735 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:180 msgid "add star" msgstr "" -#: ../../mod/content.php:736 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:181 msgid "remove star" msgstr "" -#: ../../mod/content.php:737 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:182 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:740 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:185 msgid "starred" msgstr "" -#: ../../mod/content.php:741 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:186 msgid "add tag" msgstr "" -#: ../../mod/content.php:745 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:120 msgid "save to folder" msgstr "" -#: ../../mod/content.php:817 ../../object/Item.php:229 +#: ../../mod/content.php:818 ../../object/Item.php:229 msgid "to" msgstr "" -#: ../../mod/content.php:818 ../../object/Item.php:230 +#: ../../mod/content.php:819 ../../object/Item.php:230 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:820 ../../object/Item.php:231 msgid "via Wall-To-Wall:" msgstr "" @@ -2773,7 +2766,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:898 ../../include/conversation.php:916 msgid "Please enter a link URL:" msgstr "" @@ -3175,6 +3168,15 @@ msgstr "" msgid "People Search" msgstr "" +#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 +#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../include/conversation.php:253 +#: ../../addon.old/communityhome/communityhome.php:163 +msgid "photo" +msgstr "" + #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 @@ -3205,8 +3207,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3780 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3780 msgid "Item not found." msgstr "" @@ -3236,42 +3238,42 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:91 +#: ../../mod/item.php:104 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:275 +#: ../../mod/item.php:288 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 +#: ../../mod/item.php:420 ../../mod/wall_upload.php:133 #: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:820 +#: ../../mod/item.php:833 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:845 +#: ../../mod/item.php:858 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:847 +#: ../../mod/item.php:860 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:848 +#: ../../mod/item.php:861 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:850 +#: ../../mod/item.php:863 #, php-format msgid "%s posted an update." msgstr "" @@ -4096,7 +4098,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:155 ../../mod/display.php:77 +#: ../../mod/profile.php:155 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "" @@ -4188,7 +4190,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:138 +#: ../../mod/display.php:162 msgid "Item has been removed." msgstr "" @@ -4513,8 +4515,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:898 -#: ../../include/conversation.php:915 +#: ../../mod/filer.php:29 ../../include/conversation.php:902 +#: ../../include/conversation.php:920 msgid "Save to Folder:" msgstr "" @@ -9037,34 +9039,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:791 +#: ../../include/Contact.php:220 ../../include/conversation.php:795 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:785 +#: ../../include/Contact.php:221 ../../include/conversation.php:789 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:786 +#: ../../include/Contact.php:222 ../../include/conversation.php:790 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:787 +#: ../../include/Contact.php:223 ../../include/conversation.php:791 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:792 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:790 +#: ../../include/conversation.php:794 msgid "Send PM" msgstr "" @@ -9082,86 +9084,90 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:218 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:596 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:219 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:681 +#: ../../include/conversation.php:685 msgid "remove" msgstr "" -#: ../../include/conversation.php:685 +#: ../../include/conversation.php:689 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:784 +#: ../../include/conversation.php:788 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:853 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:853 -#, php-format -msgid "%s doesn't like this." -msgstr "" - #: ../../include/conversation.php:857 #, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:857 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:861 +#, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../include/conversation.php:859 +#: ../../include/conversation.php:863 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../include/conversation.php:865 +#: ../../include/conversation.php:869 msgid "and" msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:872 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:869 +#: ../../include/conversation.php:873 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:869 +#: ../../include/conversation.php:873 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:897 ../../include/conversation.php:915 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:899 ../../include/conversation.php:917 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:900 ../../include/conversation.php:918 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:897 ../../include/conversation.php:914 +#: ../../include/conversation.php:901 ../../include/conversation.php:919 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:899 ../../include/conversation.php:916 +#: ../../include/conversation.php:903 ../../include/conversation.php:921 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:978 +#: ../../include/conversation.php:904 +msgid "Delete item(s)?" +msgstr "" + +#: ../../include/conversation.php:983 msgid "permissions" msgstr "" From dd1e735efb27b0faff50883ca5379df26d9afe67 Mon Sep 17 00:00:00 2001 From: zottel <github@zottel.net> Date: Sun, 4 Nov 2012 11:07:11 +0100 Subject: [PATCH 29/41] Worked in fermionic's comments (not count($r)). --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index ce8399a485..1af23eb13b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -71,7 +71,7 @@ function poller_run($argv, $argc){ // delete user and contact records for recently removed accounts $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); - if (count($r)) { + if ($r) { foreach($r as $user) { q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); From b25b7c2d8c1d99adb0249b11eadd252f5fe54b82 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 14:38:15 +0100 Subject: [PATCH 30/41] doc_new-englisch-help-files --- doc/Text_comment.md | 44 ++++++++++++++++++++++++++++++++++ doc/Text_editor.md | 40 +++++++++++++++++++++++++++++++ doc/img/camera.png | Bin 0 -> 828 bytes doc/img/chain.png | Bin 0 -> 709 bytes doc/img/darkbubble.png | Bin 0 -> 2486 bytes doc/img/darkzero.png | Bin 0 -> 2866 bytes doc/img/diabook.png | Bin 0 -> 3300 bytes doc/img/dispy.png | Bin 0 -> 3701 bytes doc/img/editor_darkbubble.png | Bin 0 -> 2546 bytes doc/img/editor_frost.png | Bin 0 -> 3790 bytes doc/img/editor_vier.png | Bin 0 -> 2695 bytes doc/img/editor_zero.png | Bin 0 -> 2665 bytes doc/img/friendica_editor.png | Bin 0 -> 14929 bytes doc/img/frost.png | Bin 0 -> 2011 bytes doc/img/globe.png | Bin 0 -> 1848 bytes doc/img/mic.png | Bin 0 -> 1017 bytes doc/img/padlock.png | Bin 0 -> 393 bytes doc/img/paper_clip.png | Bin 0 -> 1767 bytes doc/img/post_categorize.png | Bin 0 -> 488 bytes doc/img/post_choose.png | Bin 0 -> 321 bytes doc/img/post_delete.png | Bin 0 -> 378 bytes doc/img/post_link.png | Bin 0 -> 572 bytes doc/img/post_mark.png | Bin 0 -> 739 bytes doc/img/post_share.png | Bin 0 -> 444 bytes doc/img/post_tag.png | Bin 0 -> 612 bytes doc/img/post_thumbs_down.png | Bin 0 -> 521 bytes doc/img/post_thumbs_up.png | Bin 0 -> 508 bytes doc/img/posts_define.png | Bin 0 -> 3113 bytes doc/img/video.png | Bin 0 -> 547 bytes 29 files changed, 84 insertions(+) create mode 100644 doc/Text_comment.md create mode 100644 doc/Text_editor.md create mode 100644 doc/img/camera.png create mode 100644 doc/img/chain.png create mode 100644 doc/img/darkbubble.png create mode 100644 doc/img/darkzero.png create mode 100644 doc/img/diabook.png create mode 100644 doc/img/dispy.png create mode 100644 doc/img/editor_darkbubble.png create mode 100644 doc/img/editor_frost.png create mode 100644 doc/img/editor_vier.png create mode 100644 doc/img/editor_zero.png create mode 100644 doc/img/friendica_editor.png create mode 100644 doc/img/frost.png create mode 100644 doc/img/globe.png create mode 100644 doc/img/mic.png create mode 100644 doc/img/padlock.png create mode 100644 doc/img/paper_clip.png create mode 100644 doc/img/post_categorize.png create mode 100644 doc/img/post_choose.png create mode 100644 doc/img/post_delete.png create mode 100644 doc/img/post_link.png create mode 100644 doc/img/post_mark.png create mode 100644 doc/img/post_share.png create mode 100644 doc/img/post_tag.png create mode 100644 doc/img/post_thumbs_down.png create mode 100644 doc/img/post_thumbs_up.png create mode 100644 doc/img/posts_define.png create mode 100644 doc/img/video.png diff --git a/doc/Text_comment.md b/doc/Text_comment.md new file mode 100644 index 0000000000..515001092e --- /dev/null +++ b/doc/Text_comment.md @@ -0,0 +1,44 @@ +Comment, sort and delete posts +============== + +* [Home](help) + +Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, you'll maybe miss some icons or find other ones.</span> + +<img src="doc/img/diabook.png" width="308" height="42" alt="diabook" > + +<i>The different symbols</i> + +<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to declare that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p> + +<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to declare that you <b>dislike</b> the post. Click it twice to undo your choice. +<p style="clear:both;"></p> + +<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and you'll find a link to the original post. +<p style="clear:both;"></p> + +<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear at your network page at the tab "starred" (from "star"). Click it twice to undo your choice. +<p style="clear:both;"></p> + +<img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one. +<p style="clear:both;"></p> + +<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder at your network page under the item "saved folders". +<p style="clear:both;"></p> + +<img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person in your stream. +<P style="clear: both;"></p> + +<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete them in a single step. After selecting all posts, go to the end of the page and click at "Delete Selected Items".<P style="clear: both;"></p> + +**Symbols of other themes** + +Darkbubble <img src="doc/img/darkbubble.png" alt="darkbubble.png" style="padding-left: 20px; vertical-align:middle;"> + +Darkzero <img src="doc/img/darkzero.png" alt="darkzero.png" style="padding-left: 35px; vertical-align:middle;"> + +<span style="padding-left: 10px; font-style:italic;">(inkl. weiterer "zero"-Themen, slackr, comix, easterbunny, facepark)</span> + +Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i> + +Frost Mobile <img src="doc/img/frost.png" alt="frost.png" style="padding-left: 16px; vertical-align:middle;"> diff --git a/doc/Text_editor.md b/doc/Text_editor.md new file mode 100644 index 0000000000..8c9065a507 --- /dev/null +++ b/doc/Text_editor.md @@ -0,0 +1,40 @@ +Creating posts +================= + +* [Home](help) + +Here you can find an overview of the different ways to create and edit your post. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, you'll maybe miss some icons or find other ones.</span> + +<img src="doc/img/friendica_editor.png" width="538" height="218" alt="editor"> + +<i>The different symbols</i> + +<img src="doc/img/camera.png" width="44" height="33" alt="editor" align="left" style="padding-bottom: 20px;"> This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" symbol at the upper part of the editor. After selecting an image, you'll see a thumbnail at the editor. +<p style="clear:both;"></p> + +<img src="doc/img/paper_clip.png" width="44" height="33" alt="paper_clip" align="left"> This symbol is used to add files from your computer. There'll be no preview of the content. +<p style="clear:both;"></p> + +<img src="doc/img/chain.png" width="44" height="33" alt="chain" align="left"> This symbol is used to add an adress (url). You'll see a short preview of the website. +<p style="clear:both;"></p> + +<img src="doc/img/video.png" width="44" height="33" alt="video" align="left"> This symbol is used to add an adress (url) of a video file. You'll see a small preview of the video. +<p style="clear:both;"></p> + +<img src="doc/img/mic.png" width="44" height="33" alt="mic" align="left"> This symbol is used to add an adress (url) of an audio file. You'll see a player in your completed post. +<p style="clear:both;"></p> + +<img src="doc/img/globe.png" width="44" height="33" alt="globe" align="left"> This symbol is used to add your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough. +<p style="clear:both;"></p> + +**Symbols of other themes** + +Cleanzero <img src="doc/img/editor_zero.png" alt="cleanzero.png" style="padding-left: 20px; vertical-align:middle;"> + +<span style="padding-left: 10px; font-style:italic;">(inkl. weiterer "zero"-Themen, comix, easterbunny, facepark, slackr </span> + +Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i> + +Frost <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;"> + +Vier <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i> diff --git a/doc/img/camera.png b/doc/img/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..af73b0d73f722ba024b03454bf6ea2e9db921461 GIT binary patch literal 828 zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;qyO=Jb0200O*8L_t(o!|j(nOCwPfhMyZ0i6kHxKVmUBLQoMDWE(}W5F!LpIh9~x z=Rerru)jcypv8b)#3GGjrAWG@5M(qe30IgXDhhrfhTJXO1b2f=%p`<e@|O3$hx6Ps z=Y9;d)Y88tQETAQ(UIER+~oN9_^-Z^kr5Ub7a1EH6HS3lr_;(bO{A1n`87>rX=#bc z$w^nho?3!(xm?wt08&bFxm;u0Ael_6gM$NJUS9Bc-q)p+!f_m~udlz9sHdlgfq?;p zcu!d@7V&z$%*@O%Jv}X4!6uVQ6_3a3Qjx!DaBvXAFqoQ}5;eEM*49?TK}#(akH@R> zwtY5{&1M?{*WKOC@bEBqcX!yf{iR%O^#bVc@29=J9e}sDH!d$PxxKxu@OE`|F)=a0 z#l=M#wpzJ@^>{pJn#TP6JmGNox1O^sOYQ9JAf=>OESAU5&(B$1U9BmfE7+l-Ay!sa z&~?3HbA-cTk<Dh++S(dtXJ>V3p_*X>fdF%Jb7jztjSY2rdI~@&6k>UKS?IbhEXz{& z_xIe~+_;AI)EcPkdim4GVlkCSB*<hkWHK2Ni3G7&OqD9E>v~-(TQjWJ>jl7Z994QB zD5X$J0dR71LO!2YAH7Y3{dl9jzP?t>JC0KxFL|2=TPPF&=;-M95ex<^=0l+not>Sj zkKU$jFvoGQZCeEb0daVE`2G3$nS4GEKrk3&VPS#Z-rjGvZL9V5_2$A#DX}aIfbsEh zVcWL4y1D|Oudk2M(NXd1y#3M(ts$_5LV;8&g=v~<c6Js`)5IT(QG0uP?C$P1zYPGM zo}Sp=-bPBv{{Fu5`~3hsJUn2UCh2s#uJ4LZVSPRykB^Vl{yDe;^Z9)4PJ?JPN~uzf zl;7_s8jZSxH4H;UB9Xcs=$~CIkw^r?Fa#~N)KW|Tr+xzC@*}1K)0E!;0000<MNUMn GLSTZA2z(O& literal 0 HcmV?d00001 diff --git a/doc/img/chain.png b/doc/img/chain.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f8bf1f34b517bebaab55ea81b8c0b660335446 GIT binary patch literal 709 zcmV;$0y_PPP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;r;*frSYG00KoxL_t(o!|j+M(3>z6$N%|m3N#)xasy2?XgnHZ?{M^}M8j3$(NqUb zH;Ha^(O@$(IB5HAyLQm^u1}F%lKb6z@Bfkq5klZq>;o@kZ`h^m%TfooZTp=u_Vsi+ zLDMwox(;2}$s=cyB?QJ86IqsB%^QY+AP9&o%l`-LXP|?rs){&{?*jf<8q_chNRl*; zIp;`{L_Aesw?KX0M;L}=zuyy8Rmb_JX;2h}cna)ipp;Sq0J1D2j^i0{S(fX2_D`UL z$+8UBb;ohv_v^woO>+~}G)+?1wYX8vo_8r+hH?PiZnq*y5-`TZGy-{^k82f0S@%*n z9*^U<>$;$nlFeo#IOhO>UtSlKQc@JfY_I2e>w0!tk_NMFdp6Fp42&@mhT&BNR)OW5 zi>~XS>-soX6a^S#f>KI+-=D3|^Bjtz5X-V|if^$r;GBynir_eoa2#ir3e&Iy7{%B3 zJ*uh_K@gDD1U7*7eUGv%A<Hr@y*PxOQaY=vUDvJmMC`f_1L)u_#uzTcE=dwJO#|nA z6x!-f#JaA<w2)ht1<&&cfFTD(p6A%@b^w4Vie~#Mr9W1KofdReRdJbrlu}}vCfc?Y z(+CV@O;MC@Pw5oS=QB9xw{EB_P|LF5x-R(_Y4F#urfJUZ^(cyFz*F%}K_9IEcR#-K zJQs(<VJ4;^2mk<Snl1`@SErDssi>;zw`-OFy(?#fARv}ytq%H74^|X~V2q7bLQxbr rjsx4a7Xe+YyM6!Uc*DM7Ul8^u->gl<RpI_700000NkvXXu0mjfRs=9w literal 0 HcmV?d00001 diff --git a/doc/img/darkbubble.png b/doc/img/darkbubble.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca0ba5fb795eefd193cfd6da32d3b23f4b87a4a GIT binary patch literal 2486 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 Ag#Z8m literal 0 HcmV?d00001 diff --git a/doc/img/darkzero.png b/doc/img/darkzero.png new file mode 100644 index 0000000000000000000000000000000000000000..7c6aa177a56a19137442d020d8023e6c1a018fcb GIT binary patch literal 2866 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 Qs{jB107*qoM6N<$g5kh_RsaA1 literal 0 HcmV?d00001 diff --git a/doc/img/diabook.png b/doc/img/diabook.png new file mode 100644 index 0000000000000000000000000000000000000000..5c55baaafc2856bba8e66984452d1a0293acde62 GIT binary patch literal 3300 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 IO+4}c1^Xa0U;qFB literal 0 HcmV?d00001 diff --git a/doc/img/dispy.png b/doc/img/dispy.png new file mode 100644 index 0000000000000000000000000000000000000000..57387a781c423dddd10719bba3423cd311d10dcf GIT binary patch literal 3701 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 TvM&V=00000NkvXXu0mjfGsgc4 literal 0 HcmV?d00001 diff --git a/doc/img/editor_darkbubble.png b/doc/img/editor_darkbubble.png new file mode 100644 index 0000000000000000000000000000000000000000..6bad6ef50fcd42cee89fccd311a846bc7da3f78c GIT binary patch literal 2546 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 IM6N<$f<YzS?*IS* literal 0 HcmV?d00001 diff --git a/doc/img/editor_frost.png b/doc/img/editor_frost.png new file mode 100644 index 0000000000000000000000000000000000000000..39bf11e3e60f7b4b8c731fc13009f76031459b06 GIT binary patch literal 3790 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 ACIA2c literal 0 HcmV?d00001 diff --git a/doc/img/editor_vier.png b/doc/img/editor_vier.png new file mode 100644 index 0000000000000000000000000000000000000000..67df8aed8468f64772e5234fb4edc54b78f43833 GIT binary patch literal 2695 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 BH5dQ@ literal 0 HcmV?d00001 diff --git a/doc/img/editor_zero.png b/doc/img/editor_zero.png new file mode 100644 index 0000000000000000000000000000000000000000..c1607396c3b04297b5be8b12782a2d59379f911a GIT binary patch literal 2665 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 X>UU{^FAQVW00000NkvXXu0mjfegXxe literal 0 HcmV?d00001 diff --git a/doc/img/friendica_editor.png b/doc/img/friendica_editor.png new file mode 100644 index 0000000000000000000000000000000000000000..397c4b59586869436d8b564ee6ea7d907644d4ca GIT binary patch literal 14929 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 E1&4~~;Q#;t literal 0 HcmV?d00001 diff --git a/doc/img/frost.png b/doc/img/frost.png new file mode 100644 index 0000000000000000000000000000000000000000..011598b1303d30d3b142623a3d24619057c349e6 GIT binary patch literal 2011 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 literal 0 HcmV?d00001 diff --git a/doc/img/globe.png b/doc/img/globe.png new file mode 100644 index 0000000000000000000000000000000000000000..b8a319db095a4661ac5b5bc3e4d91b34ec858a84 GIT binary patch literal 1848 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 literal 0 HcmV?d00001 diff --git a/doc/img/mic.png b/doc/img/mic.png new file mode 100644 index 0000000000000000000000000000000000000000..616e798592c2395e79cebcfb318feb586540fd05 GIT binary patch literal 1017 zcmV<V0|xwwP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;!Ft5tK6k00VhRL_t(o!|hnlOKMvb{`N`DQfUyCR%k`Pj2whVN}7al=TTIn{(u@a z>&~LtYZmk`G>IU>iGvG~P?%)DL8-(aC(_bN$U180wD%ia@bxa-?B1*P;<bn8d~2U? zpS9Mv*4l(IhL5s1e4wQ$)<(Ctw|}jytjzB0>_8Mn06=whH3kL-FflQ)P+MF3^-sS+ ziV+5vmzQjDaS_+o*T`nGpp<@h8^=MdR->Vz0W&i*XliOA?-~ZlWYXtyxeyMAA&O$2 zC;(7OA&Mfx;V@h-7m~@O?_J3z5(%r@?JkIOyWL1664rMmo6F^p$z%%RGMNl=x!nIp z4L-^KXUWR4ToP<ibasAzo~hMpJUu<Z;c%e8zn}R1epXRY@v7bP^D}ySdWhHSWg8nC zP^nbNX0w=^n|rhN{&EGYsj0#C_BI$}XlZGI)oMj36oOKzeAP~pBy@ImA`}YY=;#Q9 z5DX3umbTnZO-+$#G|Db6E}+$F5s5_D^78VVY`eR=nO3U>05mr@V|sd;lr&~5D=Wcq z|CkkW|I76f%W)i3D%GbN{5(SmDG9ddWYg(1?(Xj1jE}`)dAuykxWB(IJy}VT005~} z3bHJtx3{;Tjm2VtEX#Salu~Fkn$nZi>-7KtK@cE{BF4wZ^Ur>U9~~V<DwRSg6aoMk z42EAy&flICY&IJNK|nMbh2QUo#bUwO*ci69ws3WIg>*U%0MO}l(ChWE+wD*&6gW9K zK{A;{U0oe)Hd}ed8lLCB93CEiyScf6$KwIVahRN(Bqo!IMIsRhf&fY>OeParTU()2 zDzUV*gkUfT0BCD#1JCnc$~M;Q?(VYn^>v({p5{f~;c$TGdDPd}6G@T~kH^{Z@iA6c zSM$AWS63H?hlgRa*+|*Q0ze=TU~6k@I5;@??k0r-9LMF02Bj2~(tHEc*Vl)Ukr9~9 z=HJq=KO##hMLZs7dwYBEcsvLOgZObjLI~R1+hMocVYOOeFc`?o3Rw2(R+1!~pP#dZ zg#|o5KK|>SMx(*(>?}GuI!K{rr{wnr>2w-_K!BZ{o#plS$Aj$e@8jX&ftk%_qSNW# z=iWdN1h%=k37^l0SS<D`wz07hJkMijXb485k(B+<dc9saoz6FxTBp;As;Vj&jmGl# n1`36uEH*_=u+QoCqm%s`N}Gz!Xu3)#00000NkvXXu0mjf0aet* literal 0 HcmV?d00001 diff --git a/doc/img/padlock.png b/doc/img/padlock.png new file mode 100644 index 0000000000000000000000000000000000000000..40f60cfecf2f763c19d9fef991905e736131fa4c GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$x!3HE9js-0PQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9Zn%(Cglr~tsX#AI6Yk)Ln02p zood+CY9P?|-$mPh!QKUPL$&%76W=o)xpeA~a6|>Cqralu0XL;-jMdei+iu)_^sy{a zeCqQ}KWAySamr6V$#NmXM5^~0bJ3TE(%8`0>ocDJ)O=nkcgdtR_x2O9O@%V6Ywzzr zJ9}B@vdlRB=xIx(jtfo+YDwg{|6Oq@%Tkd!#XN@@G*z1v90En!ThA&Vy==nBpmW-3 zTB^U1=cE<6w+~p_r>60r3=3slDk5|I=ceqo#69uyitDG_zJB;e<d=R}xQOek?WVEU zCq|ckTk~^I%rwKcZMmGuZ~kps_uB4A^yzQ4{{`}Oe_O5(Kl^s&CMS+3mFrpr>XXmw konB<m+UvIXV$6Bzz%1`auPxm(fZ@d8>FVdQ&MBb@0I3R{YybcN literal 0 HcmV?d00001 diff --git a/doc/img/paper_clip.png b/doc/img/paper_clip.png new file mode 100644 index 0000000000000000000000000000000000000000..1d9cc0a0921c16a8f1f4b9ff9637f2a5394d3a77 GIT binary patch literal 1767 zcmV<D1{nE?P)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69OzirkL3P00w7CL_t(o!|j;cOVoKE$6w!3XGF(#(n?FREGI{4QYn>66gtr1CZf#7 zQyJX|c@ZQ@{R6ucN*5VDB+-TADWfE%oEohL51~0(T2?F5!HmJtQnN;9=DQcq<3QBY zR;#-N`?>rbKD_uG-`}s0Qu4Eyf}hC#g`F+)olWOmU0t%Fp@E*B9wsLzz0Wlo4QXj< zY}l}Y@bGZ)t^UMpHQ0$0CuC1g4-*p;cs!oZ-uw9YFn|7hcI?=}=FOYMKLTsF+lPyb zi|5*GHe4>3H;NGv5hxT2oK7d*-QBdbv;Z(~-aK~g+VxGqGYb3W%^P{@)G3}meF{KY zS{hrnY#}NtO1NAuq?D*sD#pgfxO?}mtgEYIU|@i-urQ7vKhDC13&r13vjYPI^6c5O zUeJ`36!z}j+v)G`zox#vUiS9(;&eI*4h|+YHI<DUHwr+WIdcZP-HzF8CMzpz_8aWQ zix=|3g$wld_5!eW?OHN3Ge;B(#f|dva@o?-!o<Xc_xr)YK>(SYoGh$Xt88s;<<_lR ze+v7TN0-fJlSZSF`}gkykeHZAc6K&?etvtZs;Z9OxN(Dti3y^kqe)CmBqSt+zP>)p zW;1HFn)vv50EUN$XLoejY&Ka_Q$t5b2LK5P3FPMH;_vS-s;a7_*=+Wf#MZ4_Q7V;O zzI>UMmKGci2TrFGe}DhkUkcBkKbIFTUZlOf9e}vFIQH+~k6Nu3H8nM|v9Zw`X@kLl zPNx$>2*$_90Z=NH0Jz=m*@b=i@};b<uBNT64FJ7fPhMUg8jVKO*4D~v*RFXZeemGH z-$Fw}#oM=Umzhi^y1TnkDwXJTI#enZuV23gz|YTb=F4Dka8Q<)mwQvM*XucO-~e;y z&K0$_wesrKt0)u-Vq;@Dbm)-y<(FT0|NcGY<>kLOH8laSX3ZKlZQ8WiX0yqrrY3|C z=ybZ7g|*x5!)0Y<Sglq7R;^k^US1x-!NH=owpP~F)uB)*h>nit$dMyLtybf7Iyral zoU~Xh03;_Tla-Z)LZP@}GMR8V90UXeux;D6nS*sW9KV*9md<_n@F4*4@$sLeei~G( z)lyVcBmx5iak*TaK7CrYx3?puWZk-TWM^lOD3!`Jm6es!WHRC7<AYYKB`GOM%n0nr z$jGLWl9Hp3A3p|Q_3G8+=H?O<6eOyvt7UzCy%+S@v11}IFc6Q&LrF=Aym#*&ZnvA1 zloYbEvO0ZzeTyn8Dt^Ct^CkeHp`jEM6fB=H)m2<vZ0hUl10X3WiHwX4!o$PGqeqYA zbV=xRItmL5MPOhcQc6yqJSnYKD^pWbq^72lnVDH5gy=UKji%|^UA%ZPhYue{qtW!w z2y9tdne6ZHM@mU@ax&@Z=`2~YL;x&bzFefIr^}9x4svpGehUf;!tHibQc@zVRx6W} zlcc4kVK5kKgb@7|6%|LDo0|cMjEp2dKc9$*h;NpNUxj`3>XmG5ZN=$yl8}(V&Ye41 zx^$`6xl*YlF)>lZ#Kim>5)x80IXOvbX{qe&?DR&|U@+7G7>&lGckbK)K&#b~mzT$~ zWy{3(H27CxA3S)#`1m*qg@Wzdw-Xf=^_g>(N`*?LD*Eu@1Lx15mu+orxLht$Qc^G& z44wZ={ZWg>g2&?_Iy#!HtSnZnSRuZ5Y<?AXbad3KITtNj^nbq_8ylmtvQjoTH{<bm zyh6su$LBvrqw%c8V!`cp6B83dMn(p)v9aPumeE&Xr?u{vl>W56d-sk@moCZc*ROvj zWGX5uOt){}_C|Eio;|Ewxl;V-ivQ}m4G9SWU}$Ivo6Yvc*?Z;66<J?j|Cx}fuC6wj z&1O6v4_d7jgTa7aum54tKaH$juV>DjISdaE)6md>+wGQ-k&y@?7#<$RVzDqSSmNU1 z*tc&VYPDKaRaHro$>i<&oSd8=PW^WsYm7#tY;0^~e0-dMfB>SSqfsiAJbU&Ghr{uS zkO>V96-J}c8|m=yaPsr>(dl%58T6axY-VPrn3$N59UUEvj*imR)%D*WeSOhrG{nZn zvU~S#A|fJ0Z*Q*`bislJ6ciMEae~ZRWT)-PlP9vRtqr@~&eYTtVPRpcU%&p75i~L~ zvZ=VZ*fcaWL}6j!chAwk{V4wN<41t+IsyFSmmL3I%>7KTe*k9|*8Y1_S62W4002ov JPDHLkV1nlGTyp>b literal 0 HcmV?d00001 diff --git a/doc/img/post_categorize.png b/doc/img/post_categorize.png new file mode 100644 index 0000000000000000000000000000000000000000..54a3118701d1b62792bcb11df468ba4038944f62 GIT binary patch literal 488 zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69PBN!%;N=00C%8L_t(Y$L*HAio!q?h0ht*KQw~rQizb=LWreRSg;7zrb%I8<s+r> z6_V!=-(V}P1h=qJW4v1l%kD-KNi3G!_FnEcbLQNcp@`sBq42^eVI}Ntyge$|Znxt5 zKGKdzuh+wLI%T8L_?6?mCY#MhmdhpLIEL%GXf~UPwIs3I?GT0`y4@~3&ts;Y`MwVT zm`o;Ux7�II&jKG#ZA1D2gNu!{=lqi696b%BSnP%;$4<I-TbYlJ>0j`#p}wqe(J< zH<HB9#w0&-v%XRawr#`nJk)A6WWB^Q!K&3NMxzl;)8t?<D0Zkt1eePN0B}B^i-VEG z>2$(+y_W0siq&dW9IR5Qz_Kj#`+X{<;5ZI6O)CaA9*^NT4(s(g0Kl>=E*1;sdN+O_ z>>vo_uUuMJs<g&Ple>YF<jv)YxefQ>aFAB3^*Ni(-ZRUXRw5C>a5#iv7*r~G{Vcz7 eC9H(~FW475B7O6mW2rj;0000<MNUMnLSTZQq}Dh9 literal 0 HcmV?d00001 diff --git a/doc/img/post_choose.png b/doc/img/post_choose.png new file mode 100644 index 0000000000000000000000000000000000000000..762cea868246980e513d2fc04e006209dd2c96d9 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^(m<@h!3HEBXEIv@DaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4yQQ3j@cB&Lo0zo2R&UJLp+YZ zof6M=$bhGPa+z(zf3;V-Q#L05P^j=Iw78)<C)w`xjn#{!SExtqIgnw@b!f@`?79!C zyqXP%9~OLJGGTp`;okq7ch<7ZwcLscX7LBAHoLC&n{;^Ixk#^NG4qyAIWo~uz2xYw zbqSI!$NIt@J4(N@XwP)`ce-Fx)XXn7+j=HnJ!Nxpdf}$FlPT>dQ`W2fet0f~eP+-p zKeKPk1H{4~Z=80tRc&AX|JbL?m22<mD`b@`De<%^U;Ah+(`Wyf`_5MVJA$tYJAs~I N@O1TaS?83{1ON}5e#rm; literal 0 HcmV?d00001 diff --git a/doc/img/post_delete.png b/doc/img/post_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..3d0a92e83c970acef97f2784b359a08b515abe7e GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^(m<@h!3HEBXEIv@DaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4yTYXGfNH!V-is4m#2$kh{y4_ z(|o&H3<O%^|8#zIn5VSk^rh?yu410)H=l{bDU}y2blXy8=+l;#u;t>*Mn%>}mbj0h zs-dnDf)8V-J?Irn6#TY0b-h(YcBVvI!MaskL0)C2W_H9yMP(PA6BImX=^mAB_4@QV zlhW&@jwZgs7SBB{i`?FJu)2SfPV=_h=(3kmuXnl4d)~gQG<N;|n-+Z=uF1VxGUfVe z!_#(2T3t*%8#k~s9Fwqk?!PPAD_)aTk%eJFrW8Yi0F&3s`)@a^{4Dx=#;k8O$8YHy z``-J1{`zfYeoy0fIfe`0Z5a~grAs8gYu7#fDc9dcv0*V!<eyWn5iNi9Z!oibpA#j0 TTyGmN6c{{R{an^LB{Ts5;Tn^d literal 0 HcmV?d00001 diff --git a/doc/img/post_link.png b/doc/img/post_link.png new file mode 100644 index 0000000000000000000000000000000000000000..b28fca3b9f0d4821af2b1717fa6f8c1d46224b5b GIT binary patch literal 572 zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69Wwu)Van000F#7L_t(Y$L*CruOVR+#-C#tc{|y}APN$bhz}r9=*$PuC?pC~@Evpt z-+*R2N?QqqQYdH@M59!RxDyhDk+apE?Cv!?*UjBqZ04!Yd4D;7p7Rnj<E!Ms7s`dX zu>S~ly<X93wRpeZSN}PTh+r57n$70-`F#G@3*mKojG3`qF8O>uTa~D)icly-0B|~; ztk_<!hwXODnx>J*^R^ChI#=WIm`9@#06>x?6pKZus!G%8lqZu3E|<%joM14BYPCu} zpYJ(Xy<X=^rGjWQN&v80t+?Os<F!&d`Tc(6^LeCFDSCGs0YFg{0)WkC!`*HdMC6!b znkEj1!*etHRqb}$nxoyaFf)V@&~^PqQIu~Vf-M#cHcb<;SPbcO8i_=Lgb)CLMx(*^ z`yI@TNF)MX*GZP;=eO}y>-8GtavAY>{I?$7Za1siY&MHrE=P84em5+W$simK(<5t0 zl7vE`fMhaBpJM7qAOMhM8MRuC48!=GbM>cR9%(onI>tD*F%Sq~Fc`3=X=Iw_!<gA@ z#$K=UL>x`M+wFdII-SDtc(jcXLZDPCS;qe`%>6uFm<w}Zw)zQ1LaI_X1T`oC0000< KMNUMnLSTYUCiE%* literal 0 HcmV?d00001 diff --git a/doc/img/post_mark.png b/doc/img/post_mark.png new file mode 100644 index 0000000000000000000000000000000000000000..6bee82f18f4b9bcbbcf5c29646030140d017844d GIT binary patch literal 739 zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69Y9p)&W=m00Lu4L_t(Y$L*HEN+UrKhQD@}L`^hfATS_;Y!nd#xhsOXiJGJPD*Ft+ zO730+PvSuog(!oDWKA+6Bm;_*Wa2nBwFgmHR@8M9PbsKdcYR&;cU89%5x&ZX_(B`N z2C&}4&d$!nw(WoJnQxzg-Q3*Zx-Q9NQY_0-ea-Ct{+@EV%=Ptkf6Ew#A)e>a?RL4l zyX!BkTrP|2x&X9Vt=?!B1OXy~Qcsd7rHDi#oS&a#7zU|S3fFb1)oL;|HKoEZL@9-c zptU9%jba$a$6&2it5C1kHy<A#QA)jdwOVC<ex8Ym2@Vbp*x%o0VPQcY9v*le>WM^x z>FH_pVc7Wi_>a@mQ>oYMXsw@WJ~V`gkVqt$nVH#YHk&_>kB=#pN-z83@i=R1Yeb{b zzhbKQo|u!96WQ6>L2FGemm`zOsCYd7QrbqNA-lV~lu9Mi=`{I#K5d%juh(L|3)5QT z`#yz2K^(_nd3l+|#YHtTGQ!2hg=}wc69fU7Oook(4fTA8Pu)htFc=#fV`*uLNF+is znIs5;@1Exoi^Uio9wwDavA({po^}223F5jgu~>|DyUpI-UZqy6k<DhAot>ppsSt+Y zt2%wE&m70W_kE6zj%YL*Xssz0i&U#sJkO(8EJ{zBT5C<G(;)}~lu~4~S@QWjlarG) zn@xP*=koHhH-q@<>PouZE|z7H%jKAxn^ORmWnr4893CEWdwcuG5cqUvwryjYCYzg^ zThAbX(a}*>R#w#N>MDj|(CKvE4kRM)x^3Iy`~I72+U+)u<H%cU)ZpJZfDK@Mx8E-{ VUnrrI_)!1=002ovPDHLkV1kIKQ0D*u literal 0 HcmV?d00001 diff --git a/doc/img/post_share.png b/doc/img/post_share.png new file mode 100644 index 0000000000000000000000000000000000000000..f5821692e52edb89593b24ff007b6093bc055fec GIT binary patch literal 444 zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69ogLHZw;600BHnL_t(Y$L*9cii1EHh2JcTl~`Dbm4qOkz(PbUasbHzEK+2z;ZZz* zSXx+3X=P<$Iao=svb4y*l|qDMiMvU&^SXHqeDnT!{EUe3E`8vQk}wIAu-EJJrwe`G zQ`@!(f`C<3Mbk9hy{jk+JkMjBVAC`q%Q6hZ0K+gy(==pR_V96@=WQEfQ4}-`0{|e; zbC{<2<+|?XF|vD$xM><%r!Wiyr_+fkigM#~&WUpl07#OAJ)LYEM}%RxoGr_O<2bln zF7)RGnLnCyPBSbFL-x`(K2q0pl%^@J*X!aXNkY5b4sjf_%`hRvl5&=9+c+E!D9dv3 zR8__Ccx1myCWL?x;>N4%8t3zwbzMho+X4WhD1xf0+cwC$dFvA8c}`IjF<sZ;`#$#j mJ$t(PauG|Igh|*xhJ6E}G<MbxxT?MY0000<MNUMnLSTYHYqmQ8 literal 0 HcmV?d00001 diff --git a/doc/img/post_tag.png b/doc/img/post_tag.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9826c23a4f8f9714e2699d11b441ec7ca221a3 GIT binary patch literal 612 zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69f;mn@%kN00HDlL_t(Y$L-d?i{ela2k`IQQ^d;3O2q2^605!1#!5tlfUF`)AZlTu z79xshp+*JcUm*CeSlxl0U=V`{{!EywPS{($)xBl8gAAm}<MGLxH#3Bo8J`tj@QGn# zHumpej#~@GV)0c2dc9tR!{Jt^(|Hy`K$4`d9*^h8hn$Rv;Pd$)ga81nRx4<l_MA*6 z>3lw;)oOj;@An^*#y}u|csx#_PzV6P%-C!;7z_rS$z;ehP1I^Nwk+%KvBhG6`Fzfk z$>j2mnPC_PR8{4CK2Mfqp;D>vJ!9{W*y(h_Xf(p%Z~zg#SX-~x=ytnYC=|%DER@S- zHcj(=n8)LJ0bKj?)oO)aug8j_kZGEzR;zqG9v{afNg|ia_3A{whpy`w4u_n{WaxA{ zq0wmYt)jV!x!rE0(`j-#oo|B6<r35BloN>r4u=CYP2-2}%;j=HmSy@?`Zt@^;Xo)9 zqVaeP00;(y*IVhHDq?1oN~NnME`)%hC{(Z4dAHjk8jT_l2++I76%iqq%aIV`l2Rf9 z5kZz^YBrm^+wBmG#co0m%|;;vvf1nfWM-sNsc-#$pSRmBB9RFEem}jLqDLOXFrM1& yHtV|1=kpn=s`6|$<9qg!{ljBpHfCf02lf;F1sQW!@|;2d0000<MNUMnLSTZlk{09u literal 0 HcmV?d00001 diff --git a/doc/img/post_thumbs_down.png b/doc/img/post_thumbs_down.png new file mode 100644 index 0000000000000000000000000000000000000000..818dcf504e570aa2add4a87eeb79f565624f2019 GIT binary patch literal 521 zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69g8}@aF9R00D_fL_t(Y$L*HSio!4u#=pcAq84rO)Pe|th=&}!dhsEAK_5tc2l1i@ zMOsi}V`dLa#p1eatH>TY$4r>t{P{A35fMIR93Qk2R>J-dO#J4YPN%flY!CziCX)%9 z&*wCo%@D^iZr>;89F0Z;N+}Em1B7A7a>I7J9kkZqoP&t4-|ula8~^}}ea9mr5D|{Y zBbLi0PNx&XFwEb^D2iaMy~3g>f-xp@CxvRQv0AOLSS;Q%vo!D{9}(elxfGjOYUzA# zTlZ5EDexs&8Z1eYy9)Cxa{dg&S_=ShUH2g%JrhC{g9SkVAq0{nfe-@2;Sk+!7o77< zLX0tR&QY(|A1d+BHjc+*#BmHMB^<{=yWM6=DLS9eSg+SG#=!S|D5W5!M73JIR-YTz z@AvQI*X#9|)|$54EsQbnJP)JMh)F5mzph-@MW@rr%;q<_zq}i3wHiwWVXb{yk%eHD zN(H{}!*Lumo6U@13NPY^8FG$Rs|9N<JkNU?#>(GS2`gbGtgw9n8(N$>bcBuf00000 LNkvXXu0mjflGD|? literal 0 HcmV?d00001 diff --git a/doc/img/post_thumbs_up.png b/doc/img/post_thumbs_up.png new file mode 100644 index 0000000000000000000000000000000000000000..a3562c386934bdd95514d8d253eed9a24bda2910 GIT binary patch literal 508 zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69gXKD{kKa00DeSL_t(Y$L*H8i|SAihrbgIc_2a3q_D6E0b5)DbUQ(8Ewm9qurUx3 zBgP=)F<V>`yu0i!=3bXAGSxW)XTCG@oAXd2!cUpT4_XUrVZR5~ZL%m$Q>N3Y9FIqQ z-)AzJDAP1wlUZ4ooK7dAC?bwy%CdZ28H=Led_I$98JElDwXifzMJe?sfTmH6|2r&6 z688H&d7jt4PN(zl4YJv6<a)hgnkJ*sNQnsB?N-+7HCdJc5XUi##X?Ne#Ih`Uy&gdj zsHb7G*^DTP7z_sZzE2p2vRbV;91e&GN-5$vW<H+-VB0pX>k<UP^O=QVh=`!;I(eS6 zTrSz|b^x_b)e|Km+-^7S_j@zVsz92i)p|XG9<A~{YT4*eS5RHo|C+z#26<ny&szPv zO+0m7eHE-~n5yJY!yLyUNfOGkL@9;iICQ&RilX=cF$@FG^YA>cS%bK)i(wcwtl#fr y+jb3kEURT%42MI;<MHQmw7;ts*1}p?V|xR;?Y5pJahH<-0000<MNUMnLSTXt*wwxO literal 0 HcmV?d00001 diff --git a/doc/img/posts_define.png b/doc/img/posts_define.png new file mode 100644 index 0000000000000000000000000000000000000000..376a161c51e3f9f6e287a7f3e9515d8213989e5f GIT binary patch literal 3113 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 At^fc4 literal 0 HcmV?d00001 diff --git a/doc/img/video.png b/doc/img/video.png new file mode 100644 index 0000000000000000000000000000000000000000..be023d746d671684c023a2dd4760503039fe157e GIT binary patch literal 547 zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69gxLF6P$&00E;(L_t(o!|j-{io!q?Mej&P3xkD-A`-E(v9_?ZP_VENEUkA7v9a)9 zHkCgR{D3H0*;xAlY6KOvkTl7J%ofWo%ZhF>BP5Vp4iDbpk$3MSgmaFtD25Ozf{kFq z2CMv6FdB`xWm#}tSEv!C6xC`K!{Ly;Y_gVRfiWgL6~-72hr`pF{eI7dU|rXREH8E( z=V6cee9m=U7yAsPE=cTtHrMO*ZMj^2%w{v}cDvxf{?+k#<kRUCrfI^qZSe(rg?!(~ zcDv<<VPLgd!Sg&hZXi>Hd>O%dz2@Wb7@N&Tu64<jZQC$SlN*MC%jF{9XJzVkyJ0e! z;Cwy@KfyfD!|8MiN8Bokf^0S$4%k#Gg-)k~OeXWQY=MPURTYg!gY^4-6pO`R!+yth zrBWe-!2q>d4T_=!6ZUuPmP#ek>-ErXx1p+P@bB4NE=O9e)_b?xg{Eo2@>$>a@7~hs zwBBqs^<*;17mI}$Y&;$ZV@%4Km`EfZ_NdqEq+BkG-Lsmefl?|AN-0G?pMP3YC={Oh l8Hs*!M6eNT1RKG=RG*@Vl~{taLJa@_002ovPDHLkV1fda@iqVe literal 0 HcmV?d00001 From 701b20fbebddd5f3764b59a5a92e5b64352b4079 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 14:40:50 +0100 Subject: [PATCH 31/41] doc_new-englisch-help-files --- doc/Text_comment.md | 4 ++-- doc/Text_editor.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Text_comment.md b/doc/Text_comment.md index 515001092e..adec2fe0f0 100644 --- a/doc/Text_comment.md +++ b/doc/Text_comment.md @@ -37,8 +37,8 @@ Darkbubble <img src="doc/img/darkbubble.png" alt="darkbubble.png" style="paddin Darkzero <img src="doc/img/darkzero.png" alt="darkzero.png" style="padding-left: 35px; vertical-align:middle;"> -<span style="padding-left: 10px; font-style:italic;">(inkl. weiterer "zero"-Themen, slackr, comix, easterbunny, facepark)</span> +<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, slackr, comix, easterbunny, facepark)</span> -Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i> +Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(incl. smoothly, testbubble)</i> Frost Mobile <img src="doc/img/frost.png" alt="frost.png" style="padding-left: 16px; vertical-align:middle;"> diff --git a/doc/Text_editor.md b/doc/Text_editor.md index 8c9065a507..abedaa27e5 100644 --- a/doc/Text_editor.md +++ b/doc/Text_editor.md @@ -31,7 +31,7 @@ Here you can find an overview of the different ways to create and edit your post Cleanzero <img src="doc/img/editor_zero.png" alt="cleanzero.png" style="padding-left: 20px; vertical-align:middle;"> -<span style="padding-left: 10px; font-style:italic;">(inkl. weiterer "zero"-Themen, comix, easterbunny, facepark, slackr </span> +<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, comix, easterbunny, facepark, slackr </span> Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i> From 1e89df1df79fbdc98ab79d3c90685e03805932a6 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 14:41:30 +0100 Subject: [PATCH 32/41] doc_new-englisch-help-files --- doc/de/img/camera.png | Bin 828 -> 0 bytes doc/de/img/chain.png | Bin 709 -> 0 bytes doc/de/img/darkbubble.png | Bin 2486 -> 0 bytes doc/de/img/darkzero.png | Bin 2866 -> 0 bytes doc/de/img/diabook.png | Bin 3300 -> 0 bytes doc/de/img/dispy.png | Bin 3701 -> 0 bytes doc/de/img/editor_darkbubble.png | Bin 2546 -> 0 bytes doc/de/img/editor_frost.png | Bin 3790 -> 0 bytes doc/de/img/editor_vier.png | Bin 2695 -> 0 bytes doc/de/img/editor_zero.png | Bin 2665 -> 0 bytes doc/de/img/friendica_editor.png | Bin 14929 -> 0 bytes doc/de/img/frost.png | Bin 2011 -> 0 bytes doc/de/img/globe.png | Bin 1848 -> 0 bytes doc/de/img/mic.png | Bin 1017 -> 0 bytes doc/de/img/padlock.png | Bin 393 -> 0 bytes doc/de/img/paper_clip.png | Bin 1767 -> 0 bytes doc/de/img/post_categorize.png | Bin 488 -> 0 bytes doc/de/img/post_choose.png | Bin 321 -> 0 bytes doc/de/img/post_delete.png | Bin 378 -> 0 bytes doc/de/img/post_link.png | Bin 572 -> 0 bytes doc/de/img/post_mark.png | Bin 739 -> 0 bytes doc/de/img/post_share.png | Bin 444 -> 0 bytes doc/de/img/post_tag.png | Bin 612 -> 0 bytes doc/de/img/post_thumbs_down.png | Bin 521 -> 0 bytes doc/de/img/post_thumbs_up.png | Bin 508 -> 0 bytes doc/de/img/posts_define.png | Bin 3113 -> 0 bytes doc/de/img/video.png | Bin 547 -> 0 bytes 27 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/de/img/camera.png delete mode 100644 doc/de/img/chain.png delete mode 100644 doc/de/img/darkbubble.png delete mode 100644 doc/de/img/darkzero.png delete mode 100644 doc/de/img/diabook.png delete mode 100644 doc/de/img/dispy.png delete mode 100644 doc/de/img/editor_darkbubble.png delete mode 100644 doc/de/img/editor_frost.png delete mode 100644 doc/de/img/editor_vier.png delete mode 100644 doc/de/img/editor_zero.png delete mode 100644 doc/de/img/friendica_editor.png delete mode 100644 doc/de/img/frost.png delete mode 100644 doc/de/img/globe.png delete mode 100644 doc/de/img/mic.png delete mode 100644 doc/de/img/padlock.png delete mode 100644 doc/de/img/paper_clip.png delete mode 100644 doc/de/img/post_categorize.png delete mode 100644 doc/de/img/post_choose.png delete mode 100644 doc/de/img/post_delete.png delete mode 100644 doc/de/img/post_link.png delete mode 100644 doc/de/img/post_mark.png delete mode 100644 doc/de/img/post_share.png delete mode 100644 doc/de/img/post_tag.png delete mode 100644 doc/de/img/post_thumbs_down.png delete mode 100644 doc/de/img/post_thumbs_up.png delete mode 100644 doc/de/img/posts_define.png delete mode 100644 doc/de/img/video.png diff --git a/doc/de/img/camera.png b/doc/de/img/camera.png deleted file mode 100644 index af73b0d73f722ba024b03454bf6ea2e9db921461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;qyO=Jb0200O*8L_t(o!|j(nOCwPfhMyZ0i6kHxKVmUBLQoMDWE(}W5F!LpIh9~x z=Rerru)jcypv8b)#3GGjrAWG@5M(qe30IgXDhhrfhTJXO1b2f=%p`<e@|O3$hx6Ps z=Y9;d)Y88tQETAQ(UIER+~oN9_^-Z^kr5Ub7a1EH6HS3lr_;(bO{A1n`87>rX=#bc z$w^nho?3!(xm?wt08&bFxm;u0Ael_6gM$NJUS9Bc-q)p+!f_m~udlz9sHdlgfq?;p zcu!d@7V&z$%*@O%Jv}X4!6uVQ6_3a3Qjx!DaBvXAFqoQ}5;eEM*49?TK}#(akH@R> zwtY5{&1M?{*WKOC@bEBqcX!yf{iR%O^#bVc@29=J9e}sDH!d$PxxKxu@OE`|F)=a0 z#l=M#wpzJ@^>{pJn#TP6JmGNox1O^sOYQ9JAf=>OESAU5&(B$1U9BmfE7+l-Ay!sa z&~?3HbA-cTk<Dh++S(dtXJ>V3p_*X>fdF%Jb7jztjSY2rdI~@&6k>UKS?IbhEXz{& z_xIe~+_;AI)EcPkdim4GVlkCSB*<hkWHK2Ni3G7&OqD9E>v~-(TQjWJ>jl7Z994QB zD5X$J0dR71LO!2YAH7Y3{dl9jzP?t>JC0KxFL|2=TPPF&=;-M95ex<^=0l+not>Sj zkKU$jFvoGQZCeEb0daVE`2G3$nS4GEKrk3&VPS#Z-rjGvZL9V5_2$A#DX}aIfbsEh zVcWL4y1D|Oudk2M(NXd1y#3M(ts$_5LV;8&g=v~<c6Js`)5IT(QG0uP?C$P1zYPGM zo}Sp=-bPBv{{Fu5`~3hsJUn2UCh2s#uJ4LZVSPRykB^Vl{yDe;^Z9)4PJ?JPN~uzf zl;7_s8jZSxH4H;UB9Xcs=$~CIkw^r?Fa#~N)KW|Tr+xzC@*}1K)0E!;0000<MNUMn GLSTZA2z(O& diff --git a/doc/de/img/chain.png b/doc/de/img/chain.png deleted file mode 100644 index c8f8bf1f34b517bebaab55ea81b8c0b660335446..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmV;$0y_PPP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;r;*frSYG00KoxL_t(o!|j+M(3>z6$N%|m3N#)xasy2?XgnHZ?{M^}M8j3$(NqUb zH;Ha^(O@$(IB5HAyLQm^u1}F%lKb6z@Bfkq5klZq>;o@kZ`h^m%TfooZTp=u_Vsi+ zLDMwox(;2}$s=cyB?QJ86IqsB%^QY+AP9&o%l`-LXP|?rs){&{?*jf<8q_chNRl*; zIp;`{L_Aesw?KX0M;L}=zuyy8Rmb_JX;2h}cna)ipp;Sq0J1D2j^i0{S(fX2_D`UL z$+8UBb;ohv_v^woO>+~}G)+?1wYX8vo_8r+hH?PiZnq*y5-`TZGy-{^k82f0S@%*n z9*^U<>$;$nlFeo#IOhO>UtSlKQc@JfY_I2e>w0!tk_NMFdp6Fp42&@mhT&BNR)OW5 zi>~XS>-soX6a^S#f>KI+-=D3|^Bjtz5X-V|if^$r;GBynir_eoa2#ir3e&Iy7{%B3 zJ*uh_K@gDD1U7*7eUGv%A<Hr@y*PxOQaY=vUDvJmMC`f_1L)u_#uzTcE=dwJO#|nA z6x!-f#JaA<w2)ht1<&&cfFTD(p6A%@b^w4Vie~#Mr9W1KofdReRdJbrlu}}vCfc?Y z(+CV@O;MC@Pw5oS=QB9xw{EB_P|LF5x-R(_Y4F#urfJUZ^(cyFz*F%}K_9IEcR#-K zJQs(<VJ4;^2mk<Snl1`@SErDssi>;zw`-OFy(?#fARv}ytq%H74^|X~V2q7bLQxbr rjsx4a7Xe+YyM6!Uc*DM7Ul8^u->gl<RpI_700000NkvXXu0mjfRs=9w diff --git a/doc/de/img/darkbubble.png b/doc/de/img/darkbubble.png deleted file mode 100644 index 1ca0ba5fb795eefd193cfd6da32d3b23f4b87a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2486 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 Ag#Z8m diff --git a/doc/de/img/darkzero.png b/doc/de/img/darkzero.png deleted file mode 100644 index 7c6aa177a56a19137442d020d8023e6c1a018fcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 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 Qs{jB107*qoM6N<$g5kh_RsaA1 diff --git a/doc/de/img/diabook.png b/doc/de/img/diabook.png deleted file mode 100644 index 5c55baaafc2856bba8e66984452d1a0293acde62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3300 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 IO+4}c1^Xa0U;qFB diff --git a/doc/de/img/dispy.png b/doc/de/img/dispy.png deleted file mode 100644 index 57387a781c423dddd10719bba3423cd311d10dcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3701 zcmV-*4vO)KP)<h;3K|Lk000e1NJLTq008I!000~a0ssI2<j7<o00001b5ch_0Itp) z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2^JJJ2lg;Pe*gdu2T4RhRCwC$ zn^|yE$C}6cEYi`@E*;5QkgzRdjAg)vU>k!?%&j3S#S*}G?og0PC6ik-sVr5gN|A@8 zDn(LxNEInwl7}fOcPfM;<uJJ!!VEX$20~(+3-N;GMR>O*S(~-5*4gIa5FxyPbj;0= ziT+PMtyXuR?q7fXeP7EE%d()TqJC|Hi&Ie4uTf}m3jPljjYbCt2LXU;YHH+iS#d&s zi{NH58HQn4mgSruu~_`@k2xNXkB?125GXBO{hI|hnMl}f_J)E1W|7wlLy$^MY^>Xi zFIvrI!JV9(?C<Y4nM|8EZ-yXfg-AIZ4zJgnN~Ky_T7*L31AJ|YqCRgw8wv)sB_%Ts z2TfC4`6{ES?O+>*VGr$sMIw=jiOCF^0RT)*P03_3ne5?ZcYZ#NVWPiB%Y(L?+LDs` zt=nLDq2tOh%;dz_fUU2-aa+FNc6WDoc6LG#^x0>hoj7rV_plre$NTTU55urtucs*L z+_`h_yz`D$t9?+f{lkw}9Zm-TAU-v@W=-Yz*cb~~0Dx=O`Pc6*{ch(!U>LT-jmL>) zS(>I9hG7_nrYV|XS%#r$S}K+D+lo%7b9#DOE|mfRIc6Lxm8!bB`oS{M-Q7JpI+|NT z5JXK)jnQb#zY&IE=0d(iDuIh|t-1t((Yp-?=?nT$6xArTi^<Dx1BV}J*t+C*VHhsA zteG4iE5KDqrBYkBZf$F8d*Ou_TrStDRjc^T-6x-X($v&+<j4{3@$0X@e)ZK?tyU`p zK_p3%B-zr^^28HQ@N3-dc3;17J^NU_b{!_f28RZ?N87-FSR!fNv2*3fwx4UCm>fq@ z6oC;Kfe{3SVF-bdNHp??-~W@@WX`jltWv4u?CdNi5SEpd0SHV@PCA`VlgWhRIFzH6 z4Ex578)IW*`}gn9EgT*m4g>=EgUc|?tj|eOBmf|lPPu%J6171j6lKk@XU@&A%zOr9 z<})RPj>jH`Am|>%!!W$$JS+<?j^n9R3IL$hYQy0$KX7BQn8)LJ^wCGNCA)X;ZftBE z9UX-rNFWeoGMSG)`iM8UB_$;-%{w}}I%t~G5E`qs#$-0zZw=El4FC`b1oe+JtlVxv z5VUX4zE975x}j!6L;YP1o;Z0ztybsR4oQ;XP&gckL?aQ`tjp*1nM|hYnrZ;RoZmk+ zIh9JLj7Fnep-?InYPA|gc}5^Em+R)un_8`Q@7}!(!vFy6cKhh)Xk}$3P16X16p(d- zVG%ASV-fC=rWlWJR!it4xFnTMcmv*SI+dg|(Rf&+E-5&%b-(c}Sz+m^p=tX1_3N#z ztpI>fD5O*>`OV<O#DrKZ&IOm-30YTxW!Vot_<&&;ey0qAAlsU@RadY3=9_Qo>NY_T z6i>v(xFi;j0stBt8YL3RgNmXklB6i=u5Fo!LlBUN@88Av`1thHR3sXuDLR!(F*L)n zY*}fU$!y|ASXx#FBgm}F6$*x67{+lCilPdIvb4P1Vks-sH{+<SsHh-GlABnSN@cNF zR4SFv=i^Y$Uxb_>$#gnBe|yOQ>kD{fQbjBtxr-zOQ7H&MiwGk;Dl84|>C>li9Dnl3 zCsznAj^p<=W^%dQ=kw|H`uv-vY5J$0pSpW~0szRQ^22{P{QI_l<UZ1Ab$|SqKW4F> zm>mD9yZg|ALn}FU9ZttrUwzrS^LOj5>vPM4!62c|YpJASX($wl#bQFC&}25rq*8%E zAd|@n&F!xnR~a!3)9XqyBpHjx-LvjQGRXq4UM4A&+Mb>styXKXSR4+AKp-#}3@{9< z)oSi!aJ$`wUO7P!q*du>y-u2;?`+z;sf8d&M;HsT<v9iw=22k@a4%fAaQX7(lP6C? z5af2dQ>oPJufML->6)9HckS9$D7eXF^4@i}ZQFMB>eaTkwt@_;QlX4Sqg*PqufK0| z-R9fx^Yif<jm5tE?pyna9RM&iG+0x!KCghu<+||S=W|zxBuN;8_wCtlHZOE!gMolL zKX3^RQMGRE@UWes8L3oSSy?F(i4YXcj#i;iNF)-9rsh-Wk<n2UL4=sFs;Wvu6kx+< zW@fs(yE$9ybUJ-LAA%rau~;UPW%n%?To#-(MNqxg;P%Zj?9$)W5qjRqqLo@)m&<ki z`t^>E4gkQr@4l;0C;$KkgW-!WzVLdzPN%cIz5U9SD{s8<2KP}u5{X37Xp|&Lfk3dF zH%3v^rAwC%9V*Nyc64=Q|Nh(GuC2GOUodgsT)H^+b2Qq~)oHcX<kP<0J`{;YtkpH# zqkqnqPNfeYJ)&6zD9f_JU@%Vy7Zspu*RBNs4D=5S*aj2|g~ei7;KHIP%CfB2=NlRr z#Bp&=wRKI^S}1Q1YI=J5#*G^qjmBcJxLhv3-_J4XcDosdkxHcy1bMyQXf#R?d=7M> z0Mly?ZvX6JgRN0&aS{Kl`F*{_B`e&SyHlr5rPJxdhY#1**5+0f3Wa8~*=#m9HZ~qR zcI?)zTMZ5QMm!3IqN=Lul~-PQ?z!hmOG^oY$gWm0nLKssR8LP&Q&ZDRFTGS)GQs2a z`MkGJVX5rdBmbO8Bo=_%yuBq0ZZH(^csvG!A)m$ts9^U~y8!^xj+wJ(&piL!3yZ0> z4cL17dJqKJ@<@HY3ojIwmzN^|>AKd{+1Z7nXnA>g?p|V9*5Pn;b#*Z;*igHntgK9s zcW`#)$`zZ<_RKTSq*AHD!NFW#Jef?!<8gsNV7J>tp-@9ZLs?lFKf+?k*kWoS2*U9d z-Swad!m<nm!ONs#m?eYMJGFQ1+66(-rcIlc+W{~PYqi?>`S}92sZjXVTW=jbdi2XL zzdUyA*ujGbySlo#MSAbO_b7_`_~VaXeDTG)y1IhQtyZHonM~Z@4O<$-VzEl4%B_${ zB=kCc^*U?zG9piEb5&|yy|uCFfBte|K}_~z=Z~FT9deo6;dJEb<8qQnBzmL1vT7}0 zK`a{0WHPy*W-^&rG|DodYTa6c!EoR3AXmM;y?giWO{G#36B7$YOAv%yE*~5m^!xo= zwrt@|tv}@BLf*wEk3T23z(aDS(zA@`&9bb=?OyVPzr%8Uef`OkCu6bLJ??MBVsSy> za%yU7YHDf%06hQv^W4OJ{`uzsfY)AojbF@!qNrRdUu|AZ(+q|QhlYo^^2#-p0)b%o zmVI{CrPXS+8g1BM1T3r9>G;j*j+PzgzYd>2|6lv|?S~+Urs=QF|2Z0q9XWgy!?5(Z z`9i~1T#PFea)zb_0wL!<aSO&J2L%ElL(>X{LL?G#ALThe6h%=K1woKVBuXR_xiN-Z zE*}^e2!%r1w{N#tEPT?~fSn8a<H^`^71Eh>C>m7rN+|#UO3N!8)04Koo+Zt>R3=+p zUU4sQQ54l^G=V_i9^fJf!UNo#JCcZ6tsWT}xp?v7haY~pl1RUPOT&Mh{u2PeHS5e4 z{_BhXCY4IBe1AC-3Fo{#yl2lo-WlAdpW1!4{p`2jeY>N1$AA9$-1N+J%k~!ThY$y! zIap|_l_beTB0)2>2p3Tl6$k_(;V=L|p;QtCA;Lv8LnjhRnxeVh^K7=Zwzj>!{lI|( zdcEG`@o?;lL?WZnXtUYE;c#<vGe2qp0D;il0&1mVsTh~~gLe#VBo@X5qI@!gOCHM= zl~n~BuiOWfN;NbzluoDT=jSt-jKyNfb>wGeW`6kLhvUbO^LzhvIt{}xhG9OR&uX<U zINS@B!C<Jasvf>Iyr8_Vzb}_s0Kmo#8&wJ=?~V`zIk4}*=`)}HyM4H7UG?<LbT%K( z<AQ*u>3BSjz(_Kl92pt058LDMH~>H@m9DE^2Uvi>NFo-eXsV!QAA9UEi^X#F>Q%X1 zUQ<(p<2cK*GMTKuzh9+NwY0S4e@n7Jp;$1MxZ@!}08*<6xkLc~fHem1+?^wSF66^S zrTp^od`{imhdq1toH=s_MNtgHP!t^*8F~Ei$De)n+1p-@-!Bvjd2d`4MPV3DCX*P3 zrPJw^5B<p}o|+2={C;0<q1j}H0L1-V0RW&@6V1&nE9^)l5*<3&Ha;=Fas5UvdCXfh zO{bD6hGni@yT$-UB9W{vEd>C$-LsvYoiKm_1QN-_0zWk$ty!~%W!dk)|K4V^S*=z8 zfX!x$Mx#4-?&M7^004yr5Cm~_q6k_-=&+yfdvOfcYmA<`+j$0DB>BatT?lS{eSLlX zoiI5Tiyc3H{Oz~j)@U?duXlQS`sJ5j=HC;FZrZfz%{SlF>-C%uw?YYp!lQ?ec6N0- zXC2ut6bi+L4I6!auS%&h=#3jUY<wVnDddXHb(?wcwAdMqL?iR*`PHSR=G7*pQptH8 z7E5_J9Cpk&XQrn@;ShIaU8pK6E4d8Az`y{ve66jm{E}Z;$s{sNDD=*GaU566i3Mni zFp*Jb@&&vULla5@{DOk+9S>3zb@}pTk|cFH9d~EAlFnF`?d|Qg+wBz<6^)IJf2UW9 zCE}4#IGc7TNZ<bTQg?4pMMcGOFEBPf_UMk*rp6|oCvPy=+t(+P%H#^UMyplG<=kx( zP1Dgx)IaBsMxya}ytb~Ex0xIn8F9H>0Dx7iR&mMWm5T)|1fY8?D@l_=RQM2q`&*O8 z=ehWoi_G!{PaqKPe)?&Zk|$N^bUF|SD3wYfhAmFhk`zVGXF}l+K@bn*p!k2RBDlY( zSeB(32EFH<K1I{WGQZ_3st9gTzit)(%eSZ^xJ4CJ1h=T7ir^Mi1h=T79s>O@W4<?7 TvM&V=00000NkvXXu0mjfGsgc4 diff --git a/doc/de/img/editor_darkbubble.png b/doc/de/img/editor_darkbubble.png deleted file mode 100644 index 6bad6ef50fcd42cee89fccd311a846bc7da3f78c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2546 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 IM6N<$f<YzS?*IS* diff --git a/doc/de/img/editor_frost.png b/doc/de/img/editor_frost.png deleted file mode 100644 index 39bf11e3e60f7b4b8c731fc13009f76031459b06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3790 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 ACIA2c diff --git a/doc/de/img/editor_vier.png b/doc/de/img/editor_vier.png deleted file mode 100644 index 67df8aed8468f64772e5234fb4edc54b78f43833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2695 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 BH5dQ@ diff --git a/doc/de/img/editor_zero.png b/doc/de/img/editor_zero.png deleted file mode 100644 index c1607396c3b04297b5be8b12782a2d59379f911a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 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 X>UU{^FAQVW00000NkvXXu0mjfegXxe diff --git a/doc/de/img/friendica_editor.png b/doc/de/img/friendica_editor.png deleted file mode 100644 index 397c4b59586869436d8b564ee6ea7d907644d4ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14929 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 E1&4~~;Q#;t diff --git a/doc/de/img/frost.png b/doc/de/img/frost.png deleted file mode 100644 index 011598b1303d30d3b142623a3d24619057c349e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2011 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 diff --git a/doc/de/img/globe.png b/doc/de/img/globe.png deleted file mode 100644 index b8a319db095a4661ac5b5bc3e4d91b34ec858a84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1848 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 diff --git a/doc/de/img/mic.png b/doc/de/img/mic.png deleted file mode 100644 index 616e798592c2395e79cebcfb318feb586540fd05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1017 zcmV<V0|xwwP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z5;!Ft5tK6k00VhRL_t(o!|hnlOKMvb{`N`DQfUyCR%k`Pj2whVN}7al=TTIn{(u@a z>&~LtYZmk`G>IU>iGvG~P?%)DL8-(aC(_bN$U180wD%ia@bxa-?B1*P;<bn8d~2U? zpS9Mv*4l(IhL5s1e4wQ$)<(Ctw|}jytjzB0>_8Mn06=whH3kL-FflQ)P+MF3^-sS+ ziV+5vmzQjDaS_+o*T`nGpp<@h8^=MdR->Vz0W&i*XliOA?-~ZlWYXtyxeyMAA&O$2 zC;(7OA&Mfx;V@h-7m~@O?_J3z5(%r@?JkIOyWL1664rMmo6F^p$z%%RGMNl=x!nIp z4L-^KXUWR4ToP<ibasAzo~hMpJUu<Z;c%e8zn}R1epXRY@v7bP^D}ySdWhHSWg8nC zP^nbNX0w=^n|rhN{&EGYsj0#C_BI$}XlZGI)oMj36oOKzeAP~pBy@ImA`}YY=;#Q9 z5DX3umbTnZO-+$#G|Db6E}+$F5s5_D^78VVY`eR=nO3U>05mr@V|sd;lr&~5D=Wcq z|CkkW|I76f%W)i3D%GbN{5(SmDG9ddWYg(1?(Xj1jE}`)dAuykxWB(IJy}VT005~} z3bHJtx3{;Tjm2VtEX#Salu~Fkn$nZi>-7KtK@cE{BF4wZ^Ur>U9~~V<DwRSg6aoMk z42EAy&flICY&IJNK|nMbh2QUo#bUwO*ci69ws3WIg>*U%0MO}l(ChWE+wD*&6gW9K zK{A;{U0oe)Hd}ed8lLCB93CEiyScf6$KwIVahRN(Bqo!IMIsRhf&fY>OeParTU()2 zDzUV*gkUfT0BCD#1JCnc$~M;Q?(VYn^>v({p5{f~;c$TGdDPd}6G@T~kH^{Z@iA6c zSM$AWS63H?hlgRa*+|*Q0ze=TU~6k@I5;@??k0r-9LMF02Bj2~(tHEc*Vl)Ukr9~9 z=HJq=KO##hMLZs7dwYBEcsvLOgZObjLI~R1+hMocVYOOeFc`?o3Rw2(R+1!~pP#dZ zg#|o5KK|>SMx(*(>?}GuI!K{rr{wnr>2w-_K!BZ{o#plS$Aj$e@8jX&ftk%_qSNW# z=iWdN1h%=k37^l0SS<D`wz07hJkMijXb485k(B+<dc9saoz6FxTBp;As;Vj&jmGl# n1`36uEH*_=u+QoCqm%s`N}Gz!Xu3)#00000NkvXXu0mjf0aet* diff --git a/doc/de/img/padlock.png b/doc/de/img/padlock.png deleted file mode 100644 index 40f60cfecf2f763c19d9fef991905e736131fa4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$x!3HE9js-0PQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9Zn%(Cglr~tsX#AI6Yk)Ln02p zood+CY9P?|-$mPh!QKUPL$&%76W=o)xpeA~a6|>Cqralu0XL;-jMdei+iu)_^sy{a zeCqQ}KWAySamr6V$#NmXM5^~0bJ3TE(%8`0>ocDJ)O=nkcgdtR_x2O9O@%V6Ywzzr zJ9}B@vdlRB=xIx(jtfo+YDwg{|6Oq@%Tkd!#XN@@G*z1v90En!ThA&Vy==nBpmW-3 zTB^U1=cE<6w+~p_r>60r3=3slDk5|I=ceqo#69uyitDG_zJB;e<d=R}xQOek?WVEU zCq|ckTk~^I%rwKcZMmGuZ~kps_uB4A^yzQ4{{`}Oe_O5(Kl^s&CMS+3mFrpr>XXmw konB<m+UvIXV$6Bzz%1`auPxm(fZ@d8>FVdQ&MBb@0I3R{YybcN diff --git a/doc/de/img/paper_clip.png b/doc/de/img/paper_clip.png deleted file mode 100644 index 1d9cc0a0921c16a8f1f4b9ff9637f2a5394d3a77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1767 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 JPDHLkV1nlGTyp>b diff --git a/doc/de/img/post_categorize.png b/doc/de/img/post_categorize.png deleted file mode 100644 index 54a3118701d1b62792bcb11df468ba4038944f62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69PBN!%;N=00C%8L_t(Y$L*HAio!q?h0ht*KQw~rQizb=LWreRSg;7zrb%I8<s+r> z6_V!=-(V}P1h=qJW4v1l%kD-KNi3G!_FnEcbLQNcp@`sBq42^eVI}Ntyge$|Znxt5 zKGKdzuh+wLI%T8L_?6?mCY#MhmdhpLIEL%GXf~UPwIs3I?GT0`y4@~3&ts;Y`MwVT zm`o;Ux7�II&jKG#ZA1D2gNu!{=lqi696b%BSnP%;$4<I-TbYlJ>0j`#p}wqe(J< zH<HB9#w0&-v%XRawr#`nJk)A6WWB^Q!K&3NMxzl;)8t?<D0Zkt1eePN0B}B^i-VEG z>2$(+y_W0siq&dW9IR5Qz_Kj#`+X{<;5ZI6O)CaA9*^NT4(s(g0Kl>=E*1;sdN+O_ z>>vo_uUuMJs<g&Ple>YF<jv)YxefQ>aFAB3^*Ni(-ZRUXRw5C>a5#iv7*r~G{Vcz7 eC9H(~FW475B7O6mW2rj;0000<MNUMnLSTZQq}Dh9 diff --git a/doc/de/img/post_choose.png b/doc/de/img/post_choose.png deleted file mode 100644 index 762cea868246980e513d2fc04e006209dd2c96d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^(m<@h!3HEBXEIv@DaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4yQQ3j@cB&Lo0zo2R&UJLp+YZ zof6M=$bhGPa+z(zf3;V-Q#L05P^j=Iw78)<C)w`xjn#{!SExtqIgnw@b!f@`?79!C zyqXP%9~OLJGGTp`;okq7ch<7ZwcLscX7LBAHoLC&n{;^Ixk#^NG4qyAIWo~uz2xYw zbqSI!$NIt@J4(N@XwP)`ce-Fx)XXn7+j=HnJ!Nxpdf}$FlPT>dQ`W2fet0f~eP+-p zKeKPk1H{4~Z=80tRc&AX|JbL?m22<mD`b@`De<%^U;Ah+(`Wyf`_5MVJA$tYJAs~I N@O1TaS?83{1ON}5e#rm; diff --git a/doc/de/img/post_delete.png b/doc/de/img/post_delete.png deleted file mode 100644 index 3d0a92e83c970acef97f2784b359a08b515abe7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^(m<@h!3HEBXEIv@DaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4yTYXGfNH!V-is4m#2$kh{y4_ z(|o&H3<O%^|8#zIn5VSk^rh?yu410)H=l{bDU}y2blXy8=+l;#u;t>*Mn%>}mbj0h zs-dnDf)8V-J?Irn6#TY0b-h(YcBVvI!MaskL0)C2W_H9yMP(PA6BImX=^mAB_4@QV zlhW&@jwZgs7SBB{i`?FJu)2SfPV=_h=(3kmuXnl4d)~gQG<N;|n-+Z=uF1VxGUfVe z!_#(2T3t*%8#k~s9Fwqk?!PPAD_)aTk%eJFrW8Yi0F&3s`)@a^{4Dx=#;k8O$8YHy z``-J1{`zfYeoy0fIfe`0Z5a~grAs8gYu7#fDc9dcv0*V!<eyWn5iNi9Z!oibpA#j0 TTyGmN6c{{R{an^LB{Ts5;Tn^d diff --git a/doc/de/img/post_link.png b/doc/de/img/post_link.png deleted file mode 100644 index b28fca3b9f0d4821af2b1717fa6f8c1d46224b5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69Wwu)Van000F#7L_t(Y$L*CruOVR+#-C#tc{|y}APN$bhz}r9=*$PuC?pC~@Evpt z-+*R2N?QqqQYdH@M59!RxDyhDk+apE?Cv!?*UjBqZ04!Yd4D;7p7Rnj<E!Ms7s`dX zu>S~ly<X93wRpeZSN}PTh+r57n$70-`F#G@3*mKojG3`qF8O>uTa~D)icly-0B|~; ztk_<!hwXODnx>J*^R^ChI#=WIm`9@#06>x?6pKZus!G%8lqZu3E|<%joM14BYPCu} zpYJ(Xy<X=^rGjWQN&v80t+?Os<F!&d`Tc(6^LeCFDSCGs0YFg{0)WkC!`*HdMC6!b znkEj1!*etHRqb}$nxoyaFf)V@&~^PqQIu~Vf-M#cHcb<;SPbcO8i_=Lgb)CLMx(*^ z`yI@TNF)MX*GZP;=eO}y>-8GtavAY>{I?$7Za1siY&MHrE=P84em5+W$simK(<5t0 zl7vE`fMhaBpJM7qAOMhM8MRuC48!=GbM>cR9%(onI>tD*F%Sq~Fc`3=X=Iw_!<gA@ z#$K=UL>x`M+wFdII-SDtc(jcXLZDPCS;qe`%>6uFm<w}Zw)zQ1LaI_X1T`oC0000< KMNUMnLSTYUCiE%* diff --git a/doc/de/img/post_mark.png b/doc/de/img/post_mark.png deleted file mode 100644 index 6bee82f18f4b9bcbbcf5c29646030140d017844d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69Y9p)&W=m00Lu4L_t(Y$L*HEN+UrKhQD@}L`^hfATS_;Y!nd#xhsOXiJGJPD*Ft+ zO730+PvSuog(!oDWKA+6Bm;_*Wa2nBwFgmHR@8M9PbsKdcYR&;cU89%5x&ZX_(B`N z2C&}4&d$!nw(WoJnQxzg-Q3*Zx-Q9NQY_0-ea-Ct{+@EV%=Ptkf6Ew#A)e>a?RL4l zyX!BkTrP|2x&X9Vt=?!B1OXy~Qcsd7rHDi#oS&a#7zU|S3fFb1)oL;|HKoEZL@9-c zptU9%jba$a$6&2it5C1kHy<A#QA)jdwOVC<ex8Ym2@Vbp*x%o0VPQcY9v*le>WM^x z>FH_pVc7Wi_>a@mQ>oYMXsw@WJ~V`gkVqt$nVH#YHk&_>kB=#pN-z83@i=R1Yeb{b zzhbKQo|u!96WQ6>L2FGemm`zOsCYd7QrbqNA-lV~lu9Mi=`{I#K5d%juh(L|3)5QT z`#yz2K^(_nd3l+|#YHtTGQ!2hg=}wc69fU7Oook(4fTA8Pu)htFc=#fV`*uLNF+is znIs5;@1Exoi^Uio9wwDavA({po^}223F5jgu~>|DyUpI-UZqy6k<DhAot>ppsSt+Y zt2%wE&m70W_kE6zj%YL*Xssz0i&U#sJkO(8EJ{zBT5C<G(;)}~lu~4~S@QWjlarG) zn@xP*=koHhH-q@<>PouZE|z7H%jKAxn^ORmWnr4893CEWdwcuG5cqUvwryjYCYzg^ zThAbX(a}*>R#w#N>MDj|(CKvE4kRM)x^3Iy`~I72+U+)u<H%cU)ZpJZfDK@Mx8E-{ VUnrrI_)!1=002ovPDHLkV1kIKQ0D*u diff --git a/doc/de/img/post_share.png b/doc/de/img/post_share.png deleted file mode 100644 index f5821692e52edb89593b24ff007b6093bc055fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69ogLHZw;600BHnL_t(Y$L*9cii1EHh2JcTl~`Dbm4qOkz(PbUasbHzEK+2z;ZZz* zSXx+3X=P<$Iao=svb4y*l|qDMiMvU&^SXHqeDnT!{EUe3E`8vQk}wIAu-EJJrwe`G zQ`@!(f`C<3Mbk9hy{jk+JkMjBVAC`q%Q6hZ0K+gy(==pR_V96@=WQEfQ4}-`0{|e; zbC{<2<+|?XF|vD$xM><%r!Wiyr_+fkigM#~&WUpl07#OAJ)LYEM}%RxoGr_O<2bln zF7)RGnLnCyPBSbFL-x`(K2q0pl%^@J*X!aXNkY5b4sjf_%`hRvl5&=9+c+E!D9dv3 zR8__Ccx1myCWL?x;>N4%8t3zwbzMho+X4WhD1xf0+cwC$dFvA8c}`IjF<sZ;`#$#j mJ$t(PauG|Igh|*xhJ6E}G<MbxxT?MY0000<MNUMnLSTYHYqmQ8 diff --git a/doc/de/img/post_tag.png b/doc/de/img/post_tag.png deleted file mode 100644 index dc9826c23a4f8f9714e2699d11b441ec7ca221a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69f;mn@%kN00HDlL_t(Y$L-d?i{ela2k`IQQ^d;3O2q2^605!1#!5tlfUF`)AZlTu z79xshp+*JcUm*CeSlxl0U=V`{{!EywPS{($)xBl8gAAm}<MGLxH#3Bo8J`tj@QGn# zHumpej#~@GV)0c2dc9tR!{Jt^(|Hy`K$4`d9*^h8hn$Rv;Pd$)ga81nRx4<l_MA*6 z>3lw;)oOj;@An^*#y}u|csx#_PzV6P%-C!;7z_rS$z;ehP1I^Nwk+%KvBhG6`Fzfk z$>j2mnPC_PR8{4CK2Mfqp;D>vJ!9{W*y(h_Xf(p%Z~zg#SX-~x=ytnYC=|%DER@S- zHcj(=n8)LJ0bKj?)oO)aug8j_kZGEzR;zqG9v{afNg|ia_3A{whpy`w4u_n{WaxA{ zq0wmYt)jV!x!rE0(`j-#oo|B6<r35BloN>r4u=CYP2-2}%;j=HmSy@?`Zt@^;Xo)9 zqVaeP00;(y*IVhHDq?1oN~NnME`)%hC{(Z4dAHjk8jT_l2++I76%iqq%aIV`l2Rf9 z5kZz^YBrm^+wBmG#co0m%|;;vvf1nfWM-sNsc-#$pSRmBB9RFEem}jLqDLOXFrM1& yHtV|1=kpn=s`6|$<9qg!{ljBpHfCf02lf;F1sQW!@|;2d0000<MNUMnLSTZlk{09u diff --git a/doc/de/img/post_thumbs_down.png b/doc/de/img/post_thumbs_down.png deleted file mode 100644 index 818dcf504e570aa2add4a87eeb79f565624f2019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69g8}@aF9R00D_fL_t(Y$L*HSio!4u#=pcAq84rO)Pe|th=&}!dhsEAK_5tc2l1i@ zMOsi}V`dLa#p1eatH>TY$4r>t{P{A35fMIR93Qk2R>J-dO#J4YPN%flY!CziCX)%9 z&*wCo%@D^iZr>;89F0Z;N+}Em1B7A7a>I7J9kkZqoP&t4-|ula8~^}}ea9mr5D|{Y zBbLi0PNx&XFwEb^D2iaMy~3g>f-xp@CxvRQv0AOLSS;Q%vo!D{9}(elxfGjOYUzA# zTlZ5EDexs&8Z1eYy9)Cxa{dg&S_=ShUH2g%JrhC{g9SkVAq0{nfe-@2;Sk+!7o77< zLX0tR&QY(|A1d+BHjc+*#BmHMB^<{=yWM6=DLS9eSg+SG#=!S|D5W5!M73JIR-YTz z@AvQI*X#9|)|$54EsQbnJP)JMh)F5mzph-@MW@rr%;q<_zq}i3wHiwWVXb{yk%eHD zN(H{}!*Lumo6U@13NPY^8FG$Rs|9N<JkNU?#>(GS2`gbGtgw9n8(N$>bcBuf00000 LNkvXXu0mjflGD|? diff --git a/doc/de/img/post_thumbs_up.png b/doc/de/img/post_thumbs_up.png deleted file mode 100644 index a3562c386934bdd95514d8d253eed9a24bda2910..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000{R001Be1^@s6<7ops00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69gXKD{kKa00DeSL_t(Y$L*H8i|SAihrbgIc_2a3q_D6E0b5)DbUQ(8Ewm9qurUx3 zBgP=)F<V>`yu0i!=3bXAGSxW)XTCG@oAXd2!cUpT4_XUrVZR5~ZL%m$Q>N3Y9FIqQ z-)AzJDAP1wlUZ4ooK7dAC?bwy%CdZ28H=Led_I$98JElDwXifzMJe?sfTmH6|2r&6 z688H&d7jt4PN(zl4YJv6<a)hgnkJ*sNQnsB?N-+7HCdJc5XUi##X?Ne#Ih`Uy&gdj zsHb7G*^DTP7z_sZzE2p2vRbV;91e&GN-5$vW<H+-VB0pX>k<UP^O=QVh=`!;I(eS6 zTrSz|b^x_b)e|Km+-^7S_j@zVsz92i)p|XG9<A~{YT4*eS5RHo|C+z#26<ny&szPv zO+0m7eHE-~n5yJY!yLyUNfOGkL@9;iICQ&RilX=cF$@FG^YA>cS%bK)i(wcwtl#fr y+jb3kEURT%42MI;<MHQmw7;ts*1}p?V|xR;?Y5pJahH<-0000<MNUMnLSTXt*wwxO diff --git a/doc/de/img/posts_define.png b/doc/de/img/posts_define.png deleted file mode 100644 index 376a161c51e3f9f6e287a7f3e9515d8213989e5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3113 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 At^fc4 diff --git a/doc/de/img/video.png b/doc/de/img/video.png deleted file mode 100644 index be023d746d671684c023a2dd4760503039fe157e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001ih001Ef1^@s6K*mz000001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq~ z69gxLF6P$&00E;(L_t(o!|j-{io!q?Mej&P3xkD-A`-E(v9_?ZP_VENEUkA7v9a)9 zHkCgR{D3H0*;xAlY6KOvkTl7J%ofWo%ZhF>BP5Vp4iDbpk$3MSgmaFtD25Ozf{kFq z2CMv6FdB`xWm#}tSEv!C6xC`K!{Ly;Y_gVRfiWgL6~-72hr`pF{eI7dU|rXREH8E( z=V6cee9m=U7yAsPE=cTtHrMO*ZMj^2%w{v}cDvxf{?+k#<kRUCrfI^qZSe(rg?!(~ zcDv<<VPLgd!Sg&hZXi>Hd>O%dz2@Wb7@N&Tu64<jZQC$SlN*MC%jF{9XJzVkyJ0e! z;Cwy@KfyfD!|8MiN8Bokf^0S$4%k#Gg-)k~OeXWQY=MPURTYg!gY^4-6pO`R!+yth zrBWe-!2q>d4T_=!6ZUuPmP#ek>-ErXx1p+P@bB4NE=O9e)_b?xg{Eo2@>$>a@7~hs zwBBqs^<*;17mI}$Y&;$ZV@%4Km`EfZ_NdqEq+BkG-Lsmefl?|AN-0G?pMP3YC={Oh l8Hs*!M6eNT1RKG=RG*@Vl~{taLJa@_002ovPDHLkV1fda@iqVe From e62c51831274cccd1f6c987580bebab1a26f0ed9 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 14:45:10 +0100 Subject: [PATCH 33/41] doc_new-englisch-help-files --- doc/de/#LiesMich.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/de/#LiesMich.txt diff --git a/doc/de/#LiesMich.txt b/doc/de/#LiesMich.txt new file mode 100644 index 0000000000..c26794f136 --- /dev/null +++ b/doc/de/#LiesMich.txt @@ -0,0 +1,10 @@ +Friendica-doc-german +==================== + +Friendica - doc - german + +Hier findest du die deutsche Version der Friendica-Hilfedateien. Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind. + +Kopiere diese Dateien in das Hauptverzeichnis der Hilfe (Verzeichnisname "doc") und überschreibe die Originaldateien. + +Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica. From 0180ac563eebea23df3ffb95c35f5a9da164de52 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 15:14:52 +0100 Subject: [PATCH 34/41] doc_new-englisch-help-files --- doc/de/#LiesMich.txt | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 doc/de/#LiesMich.txt diff --git a/doc/de/#LiesMich.txt b/doc/de/#LiesMich.txt deleted file mode 100644 index c26794f136..0000000000 --- a/doc/de/#LiesMich.txt +++ /dev/null @@ -1,10 +0,0 @@ -Friendica-doc-german -==================== - -Friendica - doc - german - -Hier findest du die deutsche Version der Friendica-Hilfedateien. Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind. - -Kopiere diese Dateien in das Hauptverzeichnis der Hilfe (Verzeichnisname "doc") und überschreibe die Originaldateien. - -Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica. From aa3cefa5b34672719f2c3c9650a2ffd95295887b Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 15:18:03 +0100 Subject: [PATCH 35/41] doc_new-englisch-help-files --- doc/de/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/de/README.md b/doc/de/README.md index a42b2dde07..5dc32ee76e 100644 --- a/doc/de/README.md +++ b/doc/de/README.md @@ -5,4 +5,4 @@ Friendica - doc - german Hier findest du die deutsche Version der Friendica-Hilfedateien. Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind. -Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica (Stand 12.10.2012). +Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica (Stand: 03.11.12) From 0116c6accd53575fc4d9ff51edd8da2c699e01a1 Mon Sep 17 00:00:00 2001 From: balderino <andreas.bauer@ymail.com> Date: Sun, 4 Nov 2012 15:39:44 +0100 Subject: [PATCH 36/41] doc_new-englisch-help-files --- doc/Home.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/Home.md b/doc/Home.md index 30efc93f7d..1df74b5f26 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -6,6 +6,8 @@ Friendica Documentation and Resources * [Account Basics](help/Account-Basics) * [New User Quick Start](help/guide) +* [Creating posts](help/Text_editor) +* [Comment, sort and delete posts](help/Text_comment) * [Profiles](help/Profiles) * [Connectors](help/Connectors) * [Making Friends](help/Making-Friends) From 254c3186476011768d6b91a4734b51f347dae3e8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham <founder@kakste.com> Date: Sun, 4 Nov 2012 16:08:19 +0000 Subject: [PATCH 37/41] Quick native-speaker-once-over of new doco. --- doc/Text_comment.md | 18 +++++++++--------- doc/Text_editor.md | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/Text_comment.md b/doc/Text_comment.md index adec2fe0f0..2aac568378 100644 --- a/doc/Text_comment.md +++ b/doc/Text_comment.md @@ -3,33 +3,33 @@ Comment, sort and delete posts * [Home](help) -Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, you'll maybe miss some icons or find other ones.</span> +Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span> <img src="doc/img/diabook.png" width="308" height="42" alt="diabook" > -<i>The different symbols</i> +<i>The different icons</i> -<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to declare that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p> +<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p> -<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to declare that you <b>dislike</b> the post. Click it twice to undo your choice. +<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you <b>dislike</b> the post. Click it twice to undo your choice. <p style="clear:both;"></p> -<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and you'll find a link to the original post. +<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and add a link to the original post. <p style="clear:both;"></p> -<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear at your network page at the tab "starred" (from "star"). Click it twice to undo your choice. +<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear on your network page at the "starred" tab (from "star"). Click it twice to undo your choice. <p style="clear:both;"></p> <img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one. <p style="clear:both;"></p> -<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder at your network page under the item "saved folders". +<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder on your network page under the "saved folders" tab. <p style="clear:both;"></p> -<img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person in your stream. +<img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person from your stream. <P style="clear: both;"></p> -<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete them in a single step. After selecting all posts, go to the end of the page and click at "Delete Selected Items".<P style="clear: both;"></p> +<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".<P style="clear: both;"></p> **Symbols of other themes** diff --git a/doc/Text_editor.md b/doc/Text_editor.md index abedaa27e5..fa4393f009 100644 --- a/doc/Text_editor.md +++ b/doc/Text_editor.md @@ -3,25 +3,25 @@ Creating posts * [Home](help) -Here you can find an overview of the different ways to create and edit your post. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, you'll maybe miss some icons or find other ones.</span> +Here you can find an overview of the different ways to create and edit your post. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span> <img src="doc/img/friendica_editor.png" width="538" height="218" alt="editor"> -<i>The different symbols</i> +<i>The different iconss</i> -<img src="doc/img/camera.png" width="44" height="33" alt="editor" align="left" style="padding-bottom: 20px;"> This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" symbol at the upper part of the editor. After selecting an image, you'll see a thumbnail at the editor. +<img src="doc/img/camera.png" width="44" height="33" alt="editor" align="left" style="padding-bottom: 20px;"> This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" icon at the upper part of the editor. After selecting an image, you'll see a thumbnail in the editor. <p style="clear:both;"></p> <img src="doc/img/paper_clip.png" width="44" height="33" alt="paper_clip" align="left"> This symbol is used to add files from your computer. There'll be no preview of the content. <p style="clear:both;"></p> -<img src="doc/img/chain.png" width="44" height="33" alt="chain" align="left"> This symbol is used to add an adress (url). You'll see a short preview of the website. +<img src="doc/img/chain.png" width="44" height="33" alt="chain" align="left"> This symbol is used to add a web address (url). You'll see a short preview of the website. <p style="clear:both;"></p> -<img src="doc/img/video.png" width="44" height="33" alt="video" align="left"> This symbol is used to add an adress (url) of a video file. You'll see a small preview of the video. +<img src="doc/img/video.png" width="44" height="33" alt="video" align="left"> This symbol is used to add a web address (url) of a video file. You'll see a small preview of the video. <p style="clear:both;"></p> -<img src="doc/img/mic.png" width="44" height="33" alt="mic" align="left"> This symbol is used to add an adress (url) of an audio file. You'll see a player in your completed post. +<img src="doc/img/mic.png" width="44" height="33" alt="mic" align="left"> This symbol is used to add a web address (url) of an audio file. You'll see a player in your completed post. <p style="clear:both;"></p> <img src="doc/img/globe.png" width="44" height="33" alt="globe" align="left"> This symbol is used to add your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough. From 190ab46e18ec161a161fbeef01f412ae093b283f Mon Sep 17 00:00:00 2001 From: Thomas Willingham <founder@kakste.com> Date: Sun, 4 Nov 2012 19:58:59 +0000 Subject: [PATCH 38/41] Only show "Welcome to $Sitename" if you haven't made your own homepage. --- mod/home.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/home.php b/mod/home.php index 6ed36b7638..76318b157c 100644 --- a/mod/home.php +++ b/mod/home.php @@ -25,9 +25,10 @@ function home_content(&$a) { if(x($_SESSION,'mobile-theme')) unset($_SESSION['mobile-theme']); - $o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>'; if(file_exists('home.html')) $o .= file_get_contents('home.html'); + else $o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>'; + $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); From 973efa0c7537a74f50d3d942f25682ef254328dd Mon Sep 17 00:00:00 2001 From: Thomas Willingham <founder@kakste.com> Date: Sun, 4 Nov 2012 20:02:41 +0000 Subject: [PATCH 39/41] Oops, re-kill the dead snake. --- mod/share.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mod/share.php b/mod/share.php index 4ec27d6bf4..761220ad7f 100644 --- a/mod/share.php +++ b/mod/share.php @@ -22,12 +22,11 @@ function share_init(&$a) { $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; if($r[0]['title']) - $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . $r[0]['title'] . '[/url]' . '[/b]' . "\n"; - else - $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . 'View Source' . '[/url]' . '[/b]' . "\n"; - $o .= $r[0]['body'] . "\n"; - - echo $o; + $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n" ; + $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : ''); + + echo $o; killme(); -} \ No newline at end of file +} From caebcc5e83742aabc28918fd9f1aa9d71c67201e Mon Sep 17 00:00:00 2001 From: friendica <info@friendica.com> Date: Sun, 4 Nov 2012 13:43:28 -0800 Subject: [PATCH 40/41] rev update --- boot.php | 2 +- mod/notifications.php | 2 +- util/messages.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 9e4c8f0552..2628c0f3f1 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1516' ); +define ( 'FRIENDICA_VERSION', '3.0.1517' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/mod/notifications.php b/mod/notifications.php index 547a26d9e0..b8029fd03f 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -245,7 +245,7 @@ function notifications_content(&$a) { $notif_content = ''; - if (count($r) > 0) { + if ($r) { foreach ($r as $it) { switch($it['verb']){ diff --git a/util/messages.po b/util/messages.po index 8f7293eeba..7c5b8afa59 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1516\n" +"Project-Id-Version: 3.0.1517\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-03 15:31-0700\n" +"POT-Creation-Date: 2012-11-04 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" From 2093fa8b3fc421bb851bede29c1b4f0ff6c02b59 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 5 Nov 2012 07:29:55 +0100 Subject: [PATCH 41/41] DE: update to the strings --- view/de/messages.po | 401 ++++++++++++++++++++++---------------------- view/de/strings.php | 13 +- 2 files changed, 209 insertions(+), 205 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 56e5d51a1a..827318d642 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-21 10:00-0700\n" -"PO-Revision-Date: 2012-10-22 12:31+0000\n" +"POT-Creation-Date: 2012-11-03 15:31-0700\n" +"PO-Revision-Date: 2012-11-05 06:28+0000\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -38,6 +38,7 @@ msgstr "Beitrag erfolgreich veröffentlicht." #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +#: ../../mod/update_display.php:22 msgid "[Embedded content - reload page to view]" msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]" @@ -60,20 +61,20 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 -#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 -#: ../../mod/display.php:141 ../../mod/profiles.php:7 +#: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -146,8 +147,8 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1027 #: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1520 ../../mod/install.php:246 +#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 +#: ../../mod/photos.php:1522 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -193,10 +194,10 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -300,7 +301,7 @@ msgstr "Veranstaltung bearbeiten" msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Veranstaltungen" @@ -374,7 +375,7 @@ msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:1001 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -399,8 +400,8 @@ msgstr "Entfernen" #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #, php-format -msgid "%s welcomes %s" -msgstr "%s heißt %s herzlich willkommen" +msgid "%1$s welcomes %2$s" +msgstr "%1$s heißt %2$s herzlich willkommen" #: ../../mod/api.php:76 ../../mod/api.php:102 msgid "Authorize application connection" @@ -450,14 +451,14 @@ msgstr "Fotoalben" #: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 -#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 +#: ../../mod/photos.php:1565 ../../mod/photos.php:1577 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 +#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -475,7 +476,7 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -494,21 +495,13 @@ msgid "Delete Photo" msgstr "Foto löschen" #: ../../mod/photos.php:606 -msgid "was tagged in a" -msgstr "wurde getaggt in einem" - -#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 -#: ../../include/conversation.php:253 -#: ../../addon.old/communityhome/communityhome.php:163 -msgid "photo" -msgstr "Foto" +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "%1$s wurde von %3$s in %2$s getaggt" #: ../../mod/photos.php:606 -msgid "by" -msgstr "von" +msgid "a photo" +msgstr "einem Foto" #: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 #: ../../addon.old/js_upload/js_upload.php:315 @@ -585,7 +578,7 @@ msgstr "Zeige neueste zuerst" msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1598 msgid "View Photo" msgstr "Fotos betrachten" @@ -661,49 +654,49 @@ msgstr "Ich mag das (toggle)" msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:962 msgid "Share" msgstr "Teilen" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:845 +#: ../../mod/content.php:482 ../../mod/content.php:846 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:624 +#: ../../include/conversation.php:981 ../../object/Item.php:258 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1517 ../../mod/content.php:690 -#: ../../object/Item.php:555 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/content.php:690 +#: ../../object/Item.php:556 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 +#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585 +#: ../../object/Item.php:558 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 -#: ../../object/Item.php:567 +#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 +#: ../../mod/photos.php:1523 ../../mod/editpost.php:139 +#: ../../mod/content.php:702 ../../include/conversation.php:999 +#: ../../object/Item.php:568 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1489 ../../mod/content.php:439 -#: ../../mod/content.php:723 ../../mod/settings.php:606 +#: ../../mod/photos.php:1491 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:117 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1601 +#: ../../mod/photos.php:1604 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1610 +#: ../../mod/photos.php:1613 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -711,7 +704,7 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -761,96 +754,96 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:948 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:103 ../../mod/content.php:710 +#: ../../mod/editpost.php:103 ../../mod/content.php:711 #: ../../mod/settings.php:605 ../../object/Item.php:107 msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:963 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:964 msgid "upload photo" msgstr "Bild hochladen" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:965 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:966 msgid "attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:967 msgid "Insert web link" msgstr "einen Link einfügen" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:968 msgid "web link" msgstr "Weblink" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:969 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:970 msgid "video link" msgstr "Video-Link" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:971 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:972 msgid "audio link" msgstr "Audio-Link" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:973 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:974 msgid "set location" msgstr "Ort setzen" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:975 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "clear location" msgstr "Ort löschen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:991 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:992 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:978 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:980 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:994 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -971,7 +964,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1300,7 +1293,7 @@ msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einric #: ../../mod/localtime.php:12 ../../include/event.php:11 #: ../../include/bb2diaspora.php:390 msgid "l F d, Y \\@ g:i A" -msgstr "l F d, Y \\@ g:i A" +msgstr "l, d. F Y\\, H:i" #: ../../mod/localtime.php:24 msgid "Time Conversion" @@ -1393,25 +1386,25 @@ msgstr "Gruppe ist leer" msgid "Group: " msgstr "Gruppe: " -#: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../include/conversation.php:568 ../../object/Item.php:116 msgid "Select" msgstr "Auswählen" -#: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:455 ../../mod/content.php:816 +#: ../../mod/content.php:817 ../../include/conversation.php:587 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:828 +#: ../../include/conversation.php:607 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:622 msgid "View in context" msgstr "Im Zusammenhang betrachten" @@ -1453,71 +1446,71 @@ msgstr "Weitersagen" msgid "share" msgstr "Teilen" -#: ../../mod/content.php:694 ../../object/Item.php:559 +#: ../../mod/content.php:694 ../../object/Item.php:560 msgid "Bold" msgstr "Fett" -#: ../../mod/content.php:695 ../../object/Item.php:560 +#: ../../mod/content.php:695 ../../object/Item.php:561 msgid "Italic" msgstr "Kursiv" -#: ../../mod/content.php:696 ../../object/Item.php:561 +#: ../../mod/content.php:696 ../../object/Item.php:562 msgid "Underline" msgstr "Unterstrichen" -#: ../../mod/content.php:697 ../../object/Item.php:562 +#: ../../mod/content.php:697 ../../object/Item.php:563 msgid "Quote" msgstr "Zitat" -#: ../../mod/content.php:698 ../../object/Item.php:563 +#: ../../mod/content.php:698 ../../object/Item.php:564 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:564 +#: ../../mod/content.php:699 ../../object/Item.php:565 msgid "Image" msgstr "Bild" -#: ../../mod/content.php:700 ../../object/Item.php:565 +#: ../../mod/content.php:700 ../../object/Item.php:566 msgid "Link" msgstr "Verweis" -#: ../../mod/content.php:701 ../../object/Item.php:566 +#: ../../mod/content.php:701 ../../object/Item.php:567 msgid "Video" msgstr "Video" -#: ../../mod/content.php:735 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:180 msgid "add star" msgstr "markieren" -#: ../../mod/content.php:736 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:181 msgid "remove star" msgstr "Markierung entfernen" -#: ../../mod/content.php:737 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:182 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../mod/content.php:740 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:185 msgid "starred" msgstr "markiert" -#: ../../mod/content.php:741 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:186 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../mod/content.php:745 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:120 msgid "save to folder" msgstr "In Ordner speichern" -#: ../../mod/content.php:817 ../../object/Item.php:229 +#: ../../mod/content.php:818 ../../object/Item.php:229 msgid "to" msgstr "zu" -#: ../../mod/content.php:818 ../../object/Item.php:230 +#: ../../mod/content.php:819 ../../object/Item.php:230 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:820 ../../object/Item.php:231 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" @@ -1554,7 +1547,7 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1999,7 +1992,7 @@ msgstr "du bist Fan von" msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" @@ -2036,7 +2029,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2126,9 +2119,8 @@ msgstr "Konto löschen" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Einstellungen" @@ -2792,7 +2784,7 @@ msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:898 ../../include/conversation.php:916 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -2873,7 +2865,7 @@ msgid "" msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -3194,12 +3186,21 @@ msgstr "Registrieren" msgid "People Search" msgstr "Personensuche" +#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 +#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../include/conversation.php:253 +#: ../../addon.old/communityhome/communityhome.php:163 +msgid "photo" +msgstr "Foto" + #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3210,7 +3211,7 @@ msgstr "Status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3224,8 +3225,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3780 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3233,7 +3234,7 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Bilder" @@ -3255,43 +3256,43 @@ msgstr "Registrierung für %s wurde zurückgezogen" msgid "Please login." msgstr "Bitte melde dich an." -#: ../../mod/item.php:91 +#: ../../mod/item.php:104 msgid "Unable to locate original post." msgstr "Konnte den Originalbeitrag nicht finden." -#: ../../mod/item.php:275 +#: ../../mod/item.php:288 msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 +#: ../../mod/item.php:420 ../../mod/wall_upload.php:133 #: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:820 +#: ../../mod/item.php:833 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:845 +#: ../../mod/item.php:858 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." -#: ../../mod/item.php:847 +#: ../../mod/item.php:860 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:848 +#: ../../mod/item.php:861 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest." -#: ../../mod/item.php:850 +#: ../../mod/item.php:863 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." @@ -3812,7 +3813,7 @@ msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." -msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." +msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt." #: ../../mod/admin.php:478 msgid "Enable Diaspora support" @@ -4116,7 +4117,7 @@ msgstr "FTP Passwort" msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:155 ../../mod/display.php:77 +#: ../../mod/profile.php:155 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." @@ -4208,7 +4209,7 @@ msgstr "%1$s folgt %2$s %3$s" msgid "link" msgstr "Link" -#: ../../mod/display.php:138 +#: ../../mod/display.php:162 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -4533,8 +4534,8 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:902 +#: ../../include/conversation.php:920 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4626,7 +4627,7 @@ msgstr "Texteingabe (Diaspora Format): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4641,7 +4642,7 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -5578,7 +5579,7 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7592,137 +7593,135 @@ msgstr "Theme Breite festlegen" msgid "Color scheme" msgstr "Farbschema" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Deine Profilseite" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Deine Kontakte" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Deine Fotos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Deine Ereignisse" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Persönliche Notizen" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Deine privaten Fotos" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Community-Profile" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Earth Layers" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Zoomfaktor der Earth Layer" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Longitude (X) der Earth Layer" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Latitude (Y) der Earth Layer" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Neueste Tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Twitter Suchbegriff" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nicht zeigen" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "zeigen" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Rahmen auf der rechten Seite anzeigen/verbergen" @@ -8673,17 +8672,17 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "%ss Geburtstag" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "Von: " @@ -8953,15 +8952,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "Archiv" @@ -9055,34 +9054,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:795 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:789 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:790 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:791 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:792 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:794 msgid "Send PM" msgstr "Private Nachricht senden" @@ -9100,86 +9099,90 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:218 msgid "Categories:" msgstr "Kategorien" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:219 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:685 msgid "remove" msgstr "löschen" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:689 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:788 msgid "Follow Thread" msgstr "Folge der Unterhaltung" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:861 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "<span %1$s>%2$d Leute</span> mögen das." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:863 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "<span %1$s>%2$d Leute</span> mögen das nicht." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:869 msgid "and" msgstr "und" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:872 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:873 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:873 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:897 ../../include/conversation.php:915 msgid "Visible to <strong>everybody</strong>" msgstr "Für <strong>jedermann</strong> sichtbar" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:899 ../../include/conversation.php:917 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:900 ../../include/conversation.php:918 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:901 ../../include/conversation.php:919 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:903 ../../include/conversation.php:921 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:904 +msgid "Delete item(s)?" +msgstr "Einträge löschen?" + +#: ../../include/conversation.php:983 msgid "permissions" msgstr "Zugriffsrechte" diff --git a/view/de/strings.php b/view/de/strings.php index 647e4e68f9..26ac10b0c6 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "Tag entfernt"; $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; $a->strings["Remove"] = "Entfernen"; -$a->strings["%s welcomes %s"] = "%s heißt %s herzlich willkommen"; +$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; $a->strings["Please login to continue."] = "Bitte melde dich an um fortzufahren."; @@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Profilbilder"; $a->strings["Album not found."] = "Album nicht gefunden."; $a->strings["Delete Album"] = "Album löschen"; $a->strings["Delete Photo"] = "Foto löschen"; -$a->strings["was tagged in a"] = "wurde getaggt in einem"; -$a->strings["photo"] = "Foto"; -$a->strings["by"] = "von"; +$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt"; +$a->strings["a photo"] = "einem Foto"; $a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von "; $a->strings["Image file is empty."] = "Bilddatei ist leer."; $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten."; @@ -253,7 +252,7 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; -$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; +$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; $a->strings["Time Conversion"] = "Zeitumrechnung"; $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; $a->strings["UTC time: %s"] = "UTC Zeit: %s"; @@ -689,6 +688,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y $a->strings["Choose a nickname: "] = "Spitznamen wählen: "; $a->strings["Register"] = "Registrieren"; $a->strings["People Search"] = "Personensuche"; +$a->strings["photo"] = "Foto"; $a->strings["status"] = "Status"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; @@ -826,7 +826,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen"; $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."; $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren"; -$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."; +$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."; $a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren"; $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung."; $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben"; @@ -1973,6 +1973,7 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:"; $a->strings["Tag term:"] = "Tag:"; $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?"; +$a->strings["Delete item(s)?"] = "Einträge löschen?"; $a->strings["permissions"] = "Zugriffsrechte"; $a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements.";