From e986fc3e301f2a0cfb3b975fe60974fc5dcfd76b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 27 Sep 2011 16:54:33 +0200 Subject: quattro: actions in wall_item less html in conversation.php removed unused tpls fixed old themes --- images/icons/10/link.png | Bin 0 -> 410 bytes images/icons/16/link.png | Bin 0 -> 579 bytes images/icons/22/link.png | Bin 0 -> 767 bytes images/icons/48/link.png | Bin 0 -> 1685 bytes images/icons/Makefile | 31 ++++++++++++ images/icons/link.png | Bin 0 -> 7459 bytes images/icons/make.sh | 14 ------ include/conversation.php | 25 ++++++---- view/like.tpl | 6 --- view/like_noshare.tpl | 5 -- view/theme/dispy/wall_item.tpl | 32 +++++++++---- view/theme/dispy/wallwall_item.tpl | 33 +++++++++---- view/theme/duepuntozero/wall_item.tpl | 21 +++++++-- view/theme/duepuntozero/wallwall_item.tpl | 21 +++++++-- view/theme/loozah/wall_item.tpl | 21 +++++++-- view/theme/loozah/wallwall_item.tpl | 21 +++++++-- view/theme/quattro/icons.less | 2 +- view/theme/quattro/quattro.less | 46 ++++++++++++++++-- view/theme/quattro/style.css | 76 +++++++++++++++++++++++++----- view/theme/testbubble/wall_item.tpl | 22 +++++++-- view/theme/testbubble/wallwall_item.tpl | 28 +++++++++-- view/wall_fake_drop.tpl | 2 - view/wall_item.tpl | 32 +++++++++++-- view/wall_item_drop.tpl | 6 --- 24 files changed, 344 insertions(+), 100 deletions(-) create mode 100644 images/icons/10/link.png create mode 100644 images/icons/16/link.png create mode 100644 images/icons/22/link.png create mode 100644 images/icons/48/link.png create mode 100644 images/icons/Makefile create mode 100644 images/icons/link.png delete mode 100644 images/icons/make.sh delete mode 100644 view/like.tpl delete mode 100644 view/like_noshare.tpl delete mode 100644 view/wall_fake_drop.tpl delete mode 100644 view/wall_item_drop.tpl diff --git a/images/icons/10/link.png b/images/icons/10/link.png new file mode 100644 index 000000000..0619f4511 Binary files /dev/null and b/images/icons/10/link.png differ diff --git a/images/icons/16/link.png b/images/icons/16/link.png new file mode 100644 index 000000000..afec9cc30 Binary files /dev/null and b/images/icons/16/link.png differ diff --git a/images/icons/22/link.png b/images/icons/22/link.png new file mode 100644 index 000000000..e819ad3ac Binary files /dev/null and b/images/icons/22/link.png differ diff --git a/images/icons/48/link.png b/images/icons/48/link.png new file mode 100644 index 000000000..b32eec529 Binary files /dev/null and b/images/icons/48/link.png differ diff --git a/images/icons/Makefile b/images/icons/Makefile new file mode 100644 index 000000000..39428d154 --- /dev/null +++ b/images/icons/Makefile @@ -0,0 +1,31 @@ + +IMAGES=add.png edit.png gear.png info.png menu.png \ + notify_off.png star.png delete.png feed.png group.png \ + lock.png notice.png notify_on.png user.png link.png + +DESTS=10/ 16/ 22/ 48/ \ + $(addprefix 10/, $(IMAGES)) \ + $(addprefix 16/, $(IMAGES)) \ + $(addprefix 22/, $(IMAGES)) \ + $(addprefix 48/, $(IMAGES)) + +all: $(DESTS) + +%/: + mkdir $@ + +10/%.png: %.png + convert $< -resize 10x10 $@ + +16/%.png: %.png + convert $< -resize 16x16 $@ + +22/%.png: %.png + convert $< -resize 22x22 $@ + +48/%.png: %.png + convert $< -resize 48x48 $@ + + + + diff --git a/images/icons/link.png b/images/icons/link.png new file mode 100644 index 000000000..743bdf0f9 Binary files /dev/null and b/images/icons/link.png differ diff --git a/images/icons/make.sh b/images/icons/make.sh deleted file mode 100644 index 348117411..000000000 --- a/images/icons/make.sh +++ /dev/null @@ -1,14 +0,0 @@ -sizes="10 16 22 48" - -for s in $sizes -do - echo "=[ ${s}x${s} ]====" - [ -d $s ] || mkdir $s - for f in *.png - do - convert $f -resize ${s}x${s} $s/$f - echo -n "#" - done - echo -done -echo "Ok." diff --git a/include/conversation.php b/include/conversation.php index acbbc9bd5..8dcc1bff4 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -134,8 +134,6 @@ function conversation(&$a, $items, $mode, $update) { $cmnt_tpl = get_markup_template('comment_item.tpl'); - $like_tpl = get_markup_template('like.tpl'); - $noshare_tpl = get_markup_template('like_noshare.tpl'); $tpl = get_markup_template('wall_item.tpl'); $wallwall = get_markup_template('wallwall_item.tpl'); $droptpl = get_markup_template('wall_item_drop.tpl'); @@ -393,13 +391,18 @@ function conversation(&$a, $items, $mode, $update) { if($page_writeable) { if($toplevelpost) { - $likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array( + /*$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), '$share' => t('Share'), '$wait' => t('Please wait') - )); + ))*/ + $likebuttons = array( + 'like' => array( t("I like this \x28toggle\x29"), t("like")), + 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), + ); + if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share')); } if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { @@ -421,9 +424,8 @@ function conversation(&$a, $items, $mode, $update) { } $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes')) - ? '' - : ''); + ? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit")) + : False); $drop = ''; @@ -432,7 +434,11 @@ function conversation(&$a, $items, $mode, $update) { if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) $dropping = true; - $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete'))); + $drop = array( + 'dropping' => $dropping, + 'select' => t('Select'), + 'delete' => t('Delete'), + ); $star = false; @@ -535,7 +541,8 @@ function conversation(&$a, $items, $mode, $update) { '$vote' => $likebuttons, '$like' => $like, '$dislike' => $dislike, - '$comment' => $comment + '$comment' => $comment, + '$wait' => t('Please wait'), )); diff --git a/view/like.tpl b/view/like.tpl deleted file mode 100644 index f4f2e1671..000000000 --- a/view/like.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - -
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl deleted file mode 100644 index 2c467c3c2..000000000 --- a/view/like_noshare.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
- - - -
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 1f5cbcaeb..0850d739d 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -19,15 +19,29 @@
$lock
- {{ if $star }} - - {{ endif }} - $vote - {{ if $plink }} -
- {{ endif }} - $edpost - $drop + {{ if $star }} + + {{ endif }} + {{ if $vote }} + + {{ endif }} + {{ if $plink }} +
+ {{ endif }} + {{ if $edpost }} + ' + {{ endif }} + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index add2cd5a0..d880dd9d4 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -24,15 +24,30 @@
$lock
- {{ if $star }} - - {{ endif }} - $vote - {{ if $plink }} -
- {{ endif }} - $edpost - $drop + {{ if $star }} + + {{ endif }} + {{ if $vote }} + + {{ endif }} + {{ if $plink }} +
+ {{ endif }} + {{ if $edpost }} + ' + {{ endif }} + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
+
$title
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index a4508b067..a81eda765 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -31,15 +31,30 @@
$body
- $vote + {{ if $vote }} + + {{ endif }} {{ if $plink }}
{{ endif }} - $edpost + {{ if $edpost }} + + {{ endif }} + {{ if $star }} {{ endif }} - $drop + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index daad6ad14..a958ba65a 100644 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -35,15 +35,30 @@
$body
- $vote + {{ if $vote }} + + {{ endif }} {{ if $plink }}
{{ endif }} - $edpost + {{ if $edpost }} + + {{ endif }} + {{ if $star }} {{ endif }} - $drop + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl index a4508b067..a81eda765 100644 --- a/view/theme/loozah/wall_item.tpl +++ b/view/theme/loozah/wall_item.tpl @@ -31,15 +31,30 @@
$body
- $vote + {{ if $vote }} + + {{ endif }} {{ if $plink }}
{{ endif }} - $edpost + {{ if $edpost }} + + {{ endif }} + {{ if $star }} {{ endif }} - $drop + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl index daad6ad14..a958ba65a 100644 --- a/view/theme/loozah/wallwall_item.tpl +++ b/view/theme/loozah/wallwall_item.tpl @@ -35,15 +35,30 @@
$body
- $vote + {{ if $vote }} + + {{ endif }} {{ if $plink }}
{{ endif }} - $edpost + {{ if $edpost }} + + {{ endif }} + {{ if $star }} {{ endif }} - $drop + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index c5dc1937b..525ca48d8 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -44,7 +44,7 @@ } &.s48 { width:48px; height: 48px; - .icons(22); + .icons(48); } diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 95dd61adb..1be65ea91 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -21,10 +21,18 @@ body { -webkit-border-radius: @arguments; border-radius: @arguments; } - .roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } .roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } +.opaque(@v: 0.5){ + opacity: @v; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} + a, a:link { color: @Link; text-decoration: none; } a:visited { color: @LinkVisited; text-decoration: none; } a:hover {color: @LinkHover; text-decoration: underline; } @@ -257,7 +265,7 @@ section { /* wall item */ .tread-wrapper { - background-color: @ThreadBackgroundColor; + background-color: @ThreadBackgroundColor; position: relative; padding: 10px; margin-bottom: 20px; @@ -268,7 +276,6 @@ section { .wall-item-container { display: table; width: 780px; - margin-bottom: 10px; .wall-item-item, .wall-item-bottom { display: table-row; } @@ -290,22 +297,51 @@ section { .wall-item-photo-menu { display: none; } } + .wall-item-location { + word-wrap: break-word; + width: 50px; + } .wall-item-content { display: table-cell; - font-size: 12px; + font-size: 16px; max-width: 720px; word-wrap: break-word; } .wall-item-content img { max-width: 710px; } .wall-item-links, - .wall-item-actions { display: table-cell; } + .wall-item-actions { + display: table-cell; + vertical-align: middle; + + .icon { + .opaque(0.5); + } + .icon:hover { + .opaque(1.0); + } + } .wall-item-ago { padding-right: 40px; } + .wall-item-name { font-weight: bold; } + + .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; } + .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em; + a { margin-right: 3em; } + } + .wall-item-actions-tools { float: right; width: 25%; + a { float: right; } + input { float: right; } + } } + + + .wall-item-container.comment { + margin-top: 50px; .wall-item-photo { width: 32px; height: 32px; margin-left: 16px;} .wall-item-photo-menu-button { top: 13px !important; left: 10px !important; } + .wall-item-links { padding-left: 12px; } } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index ad50ee327..4d9e12540 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -121,34 +121,34 @@ height: 48px; } .icon.s48.notify { - background-image: url("../../../images/icons/22/notify_off.png"); + background-image: url("../../../images/icons/48/notify_off.png"); } .icon.s48.gear { - background-image: url("../../../images/icons/22/gear.png"); + background-image: url("../../../images/icons/48/gear.png"); } .icon.s48.add { - background-image: url("../../../images/icons/22/add.png"); + background-image: url("../../../images/icons/48/add.png"); } .icon.s48.delete { - background-image: url("../../../images/icons/22/delete.png"); + background-image: url("../../../images/icons/48/delete.png"); } .icon.s48.edit { - background-image: url("../../../images/icons/22/edit.png"); + background-image: url("../../../images/icons/48/edit.png"); } .icon.s48.star { - background-image: url("../../../images/icons/22/star.png"); + background-image: url("../../../images/icons/48/star.png"); } .icon.s48.menu { - background-image: url("../../../images/icons/22/menu.png"); + background-image: url("../../../images/icons/48/menu.png"); } .icon.s48.link { - background-image: url("../../../images/icons/22/link.png"); + background-image: url("../../../images/icons/48/link.png"); } .icon.s48.lock { - background-image: url("../../../images/icons/22/lock.png"); + background-image: url("../../../images/icons/48/lock.png"); } .icon.s48.unlock { - background-image: url("../../../images/icons/22/unlock.png"); + background-image: url("../../../images/icons/48/unlock.png"); } /* global */ body { @@ -507,7 +507,6 @@ section { .wall-item-container { display: table; width: 780px; - margin-bottom: 10px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; @@ -534,9 +533,13 @@ section { .wall-item-container .wall-item-info .wall-item-photo-menu { display: none; } +.wall-item-container .wall-item-location { + word-wrap: break-word; + width: 50px; +} .wall-item-container .wall-item-content { display: table-cell; - font-size: 12px; + font-size: 16px; max-width: 720px; word-wrap: break-word; } @@ -545,10 +548,56 @@ section { } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-ago { padding-right: 40px; } +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + float: left; + width: 25%; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social { + float: left; + width: 50%; + margin-top: 0.5em; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 3em; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 25%; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 50px; +} .wall-item-container.comment .wall-item-photo { width: 32px; height: 32px; @@ -558,3 +607,6 @@ section { top: 13px !important; left: 10px !important; } +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 47f062aff..29cf65705 100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -26,16 +26,32 @@
- $vote + {{ if $vote }} + + {{ endif }} {{ if $plink }}
{{ endif }} - $edpost + {{ if $edpost }} + + {{ endif }} {{ if $star }} {{ endif }} - $drop + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
+ +
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index 4fe677ab4..70c13bc97 100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -24,10 +24,30 @@
$lock
- $vote - $plink - $edpost - $drop + {{ if $vote }} + + {{ endif }} + {{ if $plink }} +
+ {{ endif }} + {{ if $edpost }} + + {{ endif }} + + {{ if $star }} + + {{ endif }} + +
+ {{ if $drop.dropping }}{{ endif }} +
+ {{ if $drop.dropping }}{{ endif }} +
$title
diff --git a/view/wall_fake_drop.tpl b/view/wall_fake_drop.tpl deleted file mode 100644 index db34441d5..000000000 --- a/view/wall_fake_drop.tpl +++ /dev/null @@ -1,2 +0,0 @@ -
 
-
diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 39cb33f0f..7db8b8697 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -2,6 +2,7 @@
$star.starred {{ if $lock }}$lock{{ endif }} +
{{ endif }}
@@ -31,12 +32,37 @@ {{ if $plink }}$plink.title{{ endif }}
- $name $ago +
+ $name $ago +
+
{{ if $star }} - $star.do - $star.undo + $star.do + $star.undo + {{ endif }} + + {{ if $vote }} + $vote.like.1 + $vote.dislike.1 {{ endif }} + + {{ if $vote.share }} + $vote.share.1 + {{ endif }} +
+ +
+ + {{ if $drop.dropping }} + + $drop.delete + {{ endif }} + {{ if $edpost }} + + {{ endif }} +
+
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl deleted file mode 100644 index 30fa6c335..000000000 --- a/view/wall_item_drop.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
- - -
- -
-- cgit v1.2.3 From 3ca3157e53d9a37f5fee6ef6c459d61b453cca72 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Sep 2011 09:30:22 +0200 Subject: ping returns notices and infos also to unlogged users --- mod/ping.php | 308 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 155 insertions(+), 153 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index d11af2e0e..30f1dc837 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -4,182 +4,184 @@ require_once("include/datetime.php"); function ping_init(&$a) { - if(! local_user()) - xml_status(0); - - - $comments = array(); - $likes = array(); - $dislikes = array(); - $friends = array(); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0", - intval(local_user()) - ); - - $network = count($r); - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $likes[] = $it; - break; - case ACTIVITY_DISLIKE: - $dislikes[] = $it; - break; - case ACTIVITY_FRIEND: - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - $friends[] = $it; - break; - default: - if ($it['parent']!=$it['id']) $comments[] = $it; + header("Content-type: text/xml"); + echo " + "; + + if(local_user()){ + + + $comments = array(); + $likes = array(); + $dislikes = array(); + $friends = array(); + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0", + intval(local_user()) + ); + + $network = count($r); + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $likes[] = $it; + break; + case ACTIVITY_DISLIKE: + $dislikes[] = $it; + break; + case ACTIVITY_FRIEND: + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + $friends[] = $it; + break; + default: + if ($it['parent']!=$it['id']) $comments[] = $it; + } } - } - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1", - intval(local_user()) - ); - $home = count($r); - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $likes[] = $it; - break; - case ACTIVITY_DISLIKE: - $dislikes[] = $it; - break; - case ACTIVITY_FRIEND: - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - $friends[] = $it; - break; - default: - if ($it['parent']!=$it['id']) $comments[] = $it; + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1", + intval(local_user()) + ); + $home = count($r); + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $likes[] = $it; + break; + case ACTIVITY_DISLIKE: + $dislikes[] = $it; + break; + case ACTIVITY_FRIEND: + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + $friends[] = $it; + break; + default: + if ($it['parent']!=$it['id']) $comments[] = $it; + } } - } - $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, - `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` - FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", - intval(local_user()) - ); - $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, - `contact`.`name`, `contact`.`url`, `contact`.`photo` - FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", - intval(local_user()) - ); - - $intro = $intros1[0]['total'] + $intros2[0]['total']; - if ($intros1[0]['total']==0) $intros1=Array(); - if ($intros2[0]['total']==0) $intros2=Array(); - $intros = $intros1+$intros2; - + $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` + FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", + intval(local_user()) + ); + $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + `contact`.`name`, `contact`.`url`, `contact`.`photo` + FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", + intval(local_user()) + ); + + $intro = $intros1[0]['total'] + $intros2[0]['total']; + if ($intros1[0]['total']==0) $intros1=Array(); + if ($intros2[0]['total']==0) $intros2=Array(); + $intros = $intros1+$intros2; + + + + $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; + $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail` + WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", + intval(local_user()), + dbesc($myurl) + ); + $mail = $mails[0]['total']; + + if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ + $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); + $register = $regs[0]['total']; + } else { + $register = "0"; + } - $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; - $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail` - WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", - intval(local_user()), - dbesc($myurl) - ); - $mail = $mails[0]['total']; - - if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ - $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); - $register = $regs[0]['total']; - } else { - $register = "0"; - } + function xmlize($href, $name, $url, $photo, $date, $message){ + $notsxml = '%s'; + return sprintf ( $notsxml, + $href, $name, $url, $photo, $date, $message + ); + } + + + echo "$intro + $mail + $network + $home"; + if ($register!=0) echo "$register"; + + $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends); + + echo ' '; + if ($intro>0){ + foreach ($intros as $i) { + echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") ); + }; + } + if ($mail>0){ + foreach ($mails as $i) { + echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message") ); + }; + } + if ($register>0){ + foreach ($regs as $i) { + echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration") ); + }; + } + if (count($comments)){ + foreach ($comments as $i) { + echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} commented %s's post"), $i['pname'] ) ); + }; + } + if (count($likes)){ + foreach ($likes as $i) { + echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} like %s's post"), $i['pname'] ) ); + }; + } + if (count($dislikes)){ + foreach ($dislikes as $i) { + echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} dislike %s's post"), $i['pname'] ) ); + }; + } + if (count($friends)){ + foreach ($friends as $i) { + echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['fname'] ) ); + }; + } - function xmlize($href, $name, $url, $photo, $date, $message){ - $notsxml = '%s'; - return sprintf ( $notsxml, - $href, $name, $url, $photo, $date, $message - ); - } - - header("Content-type: text/xml"); - echo " - - $intro - $mail - $network - $home"; - if ($register!=0) echo "$register"; - - $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends); - - echo ' '; - if ($intro>0){ - foreach ($intros as $i) { - echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") ); - }; - } - if ($mail>0){ - foreach ($mails as $i) { - echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message") ); - }; - } - if ($register>0){ - foreach ($regs as $i) { - echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration") ); - }; - } - if (count($comments)){ - foreach ($comments as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} commented %s's post"), $i['pname'] ) ); - }; - } - if (count($likes)){ - foreach ($likes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} like %s's post"), $i['pname'] ) ); - }; - } - if (count($dislikes)){ - foreach ($dislikes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} dislike %s's post"), $i['pname'] ) ); - }; - } - if (count($friends)){ - foreach ($friends as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['fname'] ) ); - }; + echo " "; } - - - echo " "; - echo " "; + if(x($_SESSION,'sysmsg')){ foreach ($_SESSION['sysmsg'] as $m){ echo "".($m).""; } - $_SESSION['sysmsg']=array(); + //$_SESSION['sysmsg']=array(); unset($_SESSION['sysmsg']); } if(x($_SESSION,'sysmsg_info')){ foreach ($_SESSION['sysmsg_info'] as $m){ echo "".($m).""; } - $_SESSION['sysmsg_info']=array(); + //$_SESSION['sysmsg_info']=array(); unset($_SESSION['sysmsg_info']); } -- cgit v1.2.3 From c120cc8ea9cf3e0be224ed5d87f2a571c5516f4d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Sep 2011 09:32:53 +0200 Subject: added missing "delete selected items" link --- include/conversation.php | 21 +++++---------------- view/conversation.tpl | 7 +++++++ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 8dcc1bff4..263c820ff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -136,8 +136,6 @@ function conversation(&$a, $items, $mode, $update) { $cmnt_tpl = get_markup_template('comment_item.tpl'); $tpl = get_markup_template('wall_item.tpl'); $wallwall = get_markup_template('wallwall_item.tpl'); - $droptpl = get_markup_template('wall_item_drop.tpl'); - $fakedrop = get_markup_template('wall_fake_drop.tpl'); $alike = array(); $dlike = array(); @@ -197,9 +195,9 @@ function conversation(&$a, $items, $mode, $update) { localize_item($item); if($mode === 'network-new') - $t = $droptpl; + $t = "#TODO:drop#"; //$droptpl; else - $t = $fakedrop; + $t = "#TODO:fakedrop#"; //$fakedrop; $drop = replace_macros($t,array('$id' => $item['id'])); $lock = '
'; @@ -391,13 +389,6 @@ function conversation(&$a, $items, $mode, $update) { if($page_writeable) { if($toplevelpost) { - /*$likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array( - '$id' => $item['id'], - '$likethis' => t("I like this \x28toggle\x29"), - '$nolike' => t("I don't like this \x28toggle\x29"), - '$share' => t('Share'), - '$wait' => t('Please wait') - ))*/ $likebuttons = array( 'like' => array( t("I like this \x28toggle\x29"), t("like")), 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), @@ -558,16 +549,14 @@ function conversation(&$a, $items, $mode, $update) { // if author collapsing is in force but didn't get closed, close it off now. - if($blowhard_count >= 3) - $treads[$treadsid] .= ''; + /*if($blowhard_count >= 3) + $treads[$treadsid] .= '';*/ $page_template = get_markup_template("conversation.tpl"); $o .= replace_macros($page_template, array( '$treads' => $treads, - '$dropping' => $dropping, + '$dropping' => ($dropping?t('Delete Selected Items'):False), )); - //if($dropping) - // $o .= '
'; return $o; } diff --git a/view/conversation.tpl b/view/conversation.tpl index 339302638..e509ddb22 100644 --- a/view/conversation.tpl +++ b/view/conversation.tpl @@ -3,3 +3,10 @@ $tread {{ endfor }} +{{ if $dropping }} + +
+{{ endif }} -- cgit v1.2.3 From 68a6bfdee5250c43c70530996b689b2f53c4e8d1 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Sep 2011 09:43:31 +0200 Subject: Items lock icon --- view/theme/dispy/wall_item.tpl | 5 ++++- view/theme/dispy/wallwall_item.tpl | 5 ++++- view/theme/duepuntozero/wall_item.tpl | 3 ++- view/theme/duepuntozero/wallwall_item.tpl | 3 ++- view/theme/loozah/wall_item.tpl | 3 ++- view/theme/loozah/wallwall_item.tpl | 3 ++- view/theme/testbubble/wall_item.tpl | 5 ++++- view/theme/testbubble/wallwall_item.tpl | 5 ++++- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 0850d739d..f555ed813 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -17,7 +17,10 @@
{{ if $location }}$location {{ endif }}
-
$lock
+
+ {{ if $lock }}
$lock
+ {{ else }}
{{ endif }} +
{{ if $star }} diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index d880dd9d4..9e6ea40a1 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -22,7 +22,10 @@
{{ if $location }}$location {{ endif }}
-
$lock
+
+ {{ if $lock }}
$lock
+ {{ else }}
{{ endif }} +
{{ if $star }} diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index 876f1fc72..d264d3999 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -16,7 +16,8 @@
- {{ if $lock }}{{ endif }} + {{ if $lock }}
$lock
+ {{ else }}
{{ endif }}
$location
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 6403b5201..aaa542760 100644 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -21,7 +21,8 @@
- {{ if $lock }}{{ endif }} + {{ if $lock }}
$lock
+ {{ else }}
{{ endif }}
$location
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl index a81eda765..e2b7c9c5a 100644 --- a/view/theme/loozah/wall_item.tpl +++ b/view/theme/loozah/wall_item.tpl @@ -16,7 +16,8 @@
- $lock + {{ if $lock }}
$lock
+ {{ else }}
{{ endif }}
$location
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl index a958ba65a..aaa542760 100644 --- a/view/theme/loozah/wallwall_item.tpl +++ b/view/theme/loozah/wallwall_item.tpl @@ -21,7 +21,8 @@
- $lock + {{ if $lock }}
$lock
+ {{ else }}
{{ endif }}
$location
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 29cf65705..70ec00dd9 100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -18,7 +18,10 @@
{{ if $location }}$location {{ endif }}
-
$lock
+
+ {{ if $lock }}
$lock
+ {{ else }}
{{ endif }} +
$title
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index 70c13bc97..8819103a3 100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -22,7 +22,10 @@
{{ if $location }}$location {{ endif }}
-
$lock
+
+ {{ if $lock }}
$lock
+ {{ else }}
{{ endif }} +
{{ if $vote }}