From 49ad9b355c352211375247e6fcacdfd1970599ed Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 31 Jul 2012 18:01:55 -0700 Subject: [PATCH 1/8] 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 e1d5cecac..5a563c991 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.1420' ); +define ( 'FRIENDICA_VERSION', '3.0.1421' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); diff --git a/util/messages.po b/util/messages.po index a7c392bfa..d48b506d1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1420\n" +"Project-Id-Version: 3.0.1421\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-30 10:00-0700\n" +"POT-Creation-Date: 2012-07-31 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 764ee653ba4e0426e86d5c2d42c794dad594a625 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 31 Jul 2012 20:59:51 -0700 Subject: [PATCH 2/8] Provide backend ability to poke as a comment rather than top-level post --- mod/poke.php | 49 ++++++++++++++++++++++++++++++++++++------- view/poke_content.tpl | 8 +++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/mod/poke.php b/mod/poke.php index 085415a76..93167472c 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -27,8 +27,8 @@ function poke_init(&$a) { if(! $contact_id) return; + $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0); - $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0); logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG); @@ -45,6 +45,35 @@ function poke_init(&$a) { $target = $r[0]; + if($parent) { + $r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid + from item where id = %d and parent = %d and uid = %d limit 1", + intval($parent), + intval($parent), + intval($uid) + ); + if(! count($r)) { + $parent_uri = $r[0]['uri']; + $private = $r[0]['private']; + $allow_cid = $r[0]['allow_cid']; + $allow_gid = $r[0]['allow_gid']; + $deny_cid = $r[0]['deny_cid']; + $deny_gid = $r[0]['deny_gid']; + } + } + else { + + $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0); + + $allow_cid = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']); + $allow_gid = (($private) ? '' : $a->user['allow_gid']); + $deny_cid = (($private) ? '' : $a->user['deny_cid']); + $deny_gid = (($private) ? '' : $a->user['deny_gid']); + } + + + + $poster = $a->contact; $uri = item_new_uri($a->get_hostname(),$owner_uid); @@ -53,7 +82,7 @@ function poke_init(&$a) { $arr['uid'] = $uid; $arr['uri'] = $uri; - $arr['parent-uri'] = $uri; + $arr['parent-uri'] = (($parent_uri) ? $parent_uri : $uri); $arr['type'] = 'activity'; $arr['wall'] = 1; $arr['contact-id'] = $poster['id']; @@ -64,10 +93,10 @@ function poke_init(&$a) { $arr['author-link'] = $poster['url']; $arr['author-avatar'] = $poster['thumb']; $arr['title'] = ''; - $arr['allow_cid'] = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']); - $arr['allow_gid'] = (($private) ? '' : $a->user['allow_gid']); - $arr['deny_cid'] = (($private) ? '' : $a->user['deny_cid']); - $arr['deny_gid'] = (($private) ? '' : $a->user['deny_gid']); + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; $arr['last-child'] = 1; $arr['visible'] = 1; $arr['verb'] = $activity; @@ -132,12 +161,12 @@ function poke_content(&$a) { EOT; + $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); + + $verbs = get_poke_verbs(); @@ -165,6 +197,7 @@ EOT; '$clabel' => t('Recipient'), '$choice' => t('Choose what you wish to do to recipient'), '$verbs' => $shortlist, + '$parent' => $parent, '$prv_desc' => t('Make this post private'), '$submit' => t('Submit'), '$name' => $name, diff --git a/view/poke_content.tpl b/view/poke_content.tpl index 18438787a..b9e089f5b 100644 --- a/view/poke_content.tpl +++ b/view/poke_content.tpl @@ -8,9 +8,9 @@
$clabel

- - - + + +

$choice
@@ -24,7 +24,7 @@

$prv_desc
- +

From fc22c356ff6ac9dfab2d1562168a04acb4f1bdd7 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Tue, 31 Jul 2012 22:43:18 -0600 Subject: [PATCH 3/8] fix almost all errant divs in view/ and frost folders --- view/birthdays_reminder.tpl | 2 +- view/invite.tpl | 3 ++- view/photos_upload.tpl | 1 + view/theme/frost-mobile/photos_upload.tpl | 1 + view/theme/frost-mobile/theme.php | 2 +- view/theme/frost/photos_upload.tpl | 1 + view/theme/frost/theme.php | 2 +- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl index a00e5c7f8..8db7d22f4 100644 --- a/view/birthdays_reminder.tpl +++ b/view/birthdays_reminder.tpl @@ -5,6 +5,6 @@ {{ for $events as $event }}
$event.title $event.date
{{ endfor }} - + {{ endif }} diff --git a/view/invite.tpl b/view/invite.tpl index 01a45c774..a47ef0162 100644 --- a/view/invite.tpl +++ b/view/invite.tpl @@ -23,4 +23,5 @@ $msg_text - \ No newline at end of file + + diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl index c20028296..2a820d9c7 100644 --- a/view/photos_upload.tpl +++ b/view/photos_upload.tpl @@ -28,6 +28,7 @@ $permissions +
diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl index 0260045b1..d354bc589 100644 --- a/view/theme/frost-mobile/photos_upload.tpl +++ b/view/theme/frost-mobile/photos_upload.tpl @@ -28,6 +28,7 @@ $permissions +
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php index b3e6c7039..f70e66ec5 100644 --- a/view/theme/frost-mobile/theme.php +++ b/view/theme/frost-mobile/theme.php @@ -4,7 +4,7 @@ * Name: Frost--mobile version * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.2 + * Version: Version 0.2.1 * Author: Zach P * Maintainer: Zach P */ diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl index 1e748fb55..2aa12a3ca 100644 --- a/view/theme/frost/photos_upload.tpl +++ b/view/theme/frost/photos_upload.tpl @@ -30,6 +30,7 @@
$permissions
 +
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 1bf1f8fea..0f215f9f9 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -4,7 +4,7 @@ * Name: Frost * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.2 + * Version: Version 0.2.1 * Author: Zach P * Maintainer: Zach P */ From 70389c99eaafa75cfac45003bda231627b77633b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 31 Jul 2012 22:25:03 -0700 Subject: [PATCH 4/8] logic was reversed - should work now --- mod/poke.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mod/poke.php b/mod/poke.php index 93167472c..5cd88d7e2 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -52,7 +52,7 @@ function poke_init(&$a) { intval($parent), intval($uid) ); - if(! count($r)) { + if(count($r)) { $parent_uri = $r[0]['uri']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; @@ -71,9 +71,6 @@ function poke_init(&$a) { $deny_gid = (($private) ? '' : $a->user['deny_gid']); } - - - $poster = $a->contact; $uri = item_new_uri($a->get_hostname(),$owner_uid); From 372ad112c999e698514ec37c41fca4a63b9ac203 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 1 Aug 2012 01:36:39 -0700 Subject: [PATCH 5/8] tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 41030e677..1c50086aa 100644 --- a/include/text.php +++ b/include/text.php @@ -1578,7 +1578,7 @@ function undo_post_tagging($s) { function fix_mce_lf($s) { $s = str_replace("\r\n","\n",$s); - $s = str_replace("\n\n","\n",$s); +// $s = str_replace("\n\n","\n",$s); return $s; } From bf04fb450a08fd4f71504210acf7d5de716ed220 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 1 Aug 2012 04:41:21 -0400 Subject: [PATCH 6/8] quattro: style for "show more" addon --- view/theme/quattro/dark/style.css | 15 ++++++++++----- view/theme/quattro/green/style.css | 15 ++++++++++----- view/theme/quattro/quattro.less | 11 +++++++++++ view/theme/quattro/showmore-bg.jpg | Bin 0 -> 1963 bytes 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 view/theme/quattro/showmore-bg.jpg diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 72febbf52..aa64ca1a9 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -341,11 +341,6 @@ height: 16px; background-position: 0px 0px; } - -.sparkle { - cursor: url('icons/lock.cur'), pointer; -} - /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -1141,6 +1136,16 @@ section { width: 25px; height: 25px; } +span[id^="showmore-teaser"] { + background: url("showmore-bg.jpg") no-repeat center bottom; +} +span[id^="showmore-wrap"] { + border-top: 1px solid #999999; + color: #999999; + display: block; + text-align: center; + background-color: #eff0f1; +} #pause { position: fixed; bottom: 5px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index b1efb557f..dbaee018b 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -341,11 +341,6 @@ height: 16px; background-position: 0px 0px; } - -.sparkle { - cursor: url('icons/lock.cur'), pointer; -} - /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -1141,6 +1136,16 @@ section { width: 25px; height: 25px; } +span[id^="showmore-teaser"] { + background: url("showmore-bg.jpg") no-repeat center bottom; +} +span[id^="showmore-wrap"] { + border-top: 1px solid #999999; + color: #999999; + display: block; + text-align: center; + background-color: #eff0f1; +} #pause { position: fixed; bottom: 5px; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 0dac79bf9..6e75883d5 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -590,6 +590,17 @@ section { } .wwto .contact-photo { width: 25px; height: 25px; } +span[id^="showmore-teaser"]{ + background: url("showmore-bg.jpg") no-repeat center bottom; +} +span[id^="showmore-wrap"] { + border-top: 1px solid #999999; + color: #999999; + display: block; + text-align: center; + background-color: @ThreadBackgroundColor; +} + #pause { position: fixed; diff --git a/view/theme/quattro/showmore-bg.jpg b/view/theme/quattro/showmore-bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e76015c68a8edf87412cda380fca6446d3e7e706 GIT binary patch literal 1963 zcmds%e`p(39KgTtl4~zNn%=e7G*P$R;V6j{>8yy1Lb5nVmpM4<9JGV6*;zN&He+B# zaW+UMgH2Yoi*z$3t%QN%A9bYp!`aAIb!Z)y$>uyY6DFg~5J5@nVsn1qooTWyi2mU} zeqZk8-S>UI-}n8#d+)1#qg@3)xN*})AcQ~{Hqcaf6if_5e<)`Bu^h{q&8)SywuZA? z?RJ~hW~*~F@O2KsVYBg0UT74XnwsqO%`T_tY7m=5>V%lk#>`q+)*{x~>coF7+F1}d z*us2ZA_6c1F$qMQfo2*ifl46^hZD{_^gtNxTdV4eD&?$eeDECVb?<0RL(S($r+DB!dLuI1^SnUx|8y z*3J`Xg3q3W;a=u;BaH5MM`VkFHt65K0mxQG!7$=;Ptj1Gc+5L7G8fzv2l^e|yq zmlQzR$%pZaafAS2nZ?OblranKD<$UattQX7E1_G*Z*Qw+fx4FtRJR&CjUkFcMRapJy`x(<2lyq%<4Q4j0%Z;$E(Z`EFR8Mw!uTHurPrAoe9xL4%FrhK8 z!T+@tRSoiL|5QeUsehVdzL1+P45dr>(6k2Sx03eO|IAQcgM$m1kfEk8`GN*1e5$t` zRcF)c(n4WrO6@Neaw&C4gG}~Lyr`DEWV-sK?5B%+lSnM#6UyT*lv^mRW--ZYCvur~Lwk8|vd|J$Lq%j$=vi+w;KEB%d3f=3 zO07!yqVV&t@4DB9ccqzv`e7_}!p{8$N3RQie&P{j6>=+RVL+F(H-vz|ORauoSNTTZ zp=`(|jyU_S{0eQoUmkHrqs8gy{j)tQXU=?fQ3FTg@N+GF-7oKmwoD%F`S`b*_WH*U z`WCO>Goe?s#)o~jO{+g$d$h+zyRXI$-}L=>L3XUC^${yx^Qs+hc3(=qZ%n&>S$pkF z{jooaHyg)|f*6rIuwvGJar!QV_H|#vHPF#(FRqz?;d*<*`ZvuDo_jt5d!(W4yR;8Df{ PhlJH{NHZ&P+Lb>6Q2>TR literal 0 HcmV?d00001 From fde3edaa2112c0cb68ae037fa9cf345bc7f0e85c Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 1 Aug 2012 04:45:27 -0400 Subject: [PATCH 7/8] quattro: readd sparkle cursor --- view/theme/quattro/dark/style.css | 3 +++ view/theme/quattro/green/style.css | 3 +++ view/theme/quattro/quattro.less | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index aa64ca1a9..087d9c746 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -899,6 +899,9 @@ section { width: 770px; padding: 0px 20px 0px 10px; } +.sparkle { + cursor: url('icons/lock.cur'), pointer; +} /* wall item */ .tread-wrapper { background-color: #eff0f1; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index dbaee018b..9c28473c6 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -899,6 +899,9 @@ section { width: 770px; padding: 0px 20px 0px 10px; } +.sparkle { + cursor: url('icons/lock.cur'), pointer; +} /* wall item */ .tread-wrapper { background-color: #eff0f1; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 6e75883d5..b5f0af669 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -422,6 +422,10 @@ section { padding:0px 20px 0px 10px; } +.sparkle { + cursor: url('icons/lock.cur'), pointer; +} + /* wall item */ .tread-wrapper { background-color: @ThreadBackgroundColor; From 3e8e1ab830682800d29e7a0d12b3460edcafb819 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Wed, 1 Aug 2012 19:09:28 -0600 Subject: [PATCH 8/8] ugly fix to make editplain work --- view/theme/frost-mobile/jot-header.tpl | 1 + view/theme/frost-mobile/theme.php | 2 +- view/theme/frost/jot-header.tpl | 1 + view/theme/frost/theme.php | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl index d409edea4..66a2c8796 100644 --- a/view/theme/frost-mobile/jot-header.tpl +++ b/view/theme/frost-mobile/jot-header.tpl @@ -1,5 +1,6 @@