From e986fc3e301f2a0cfb3b975fe60974fc5dcfd76b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 27 Sep 2011 16:54:33 +0200 Subject: [PATCH] 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 0000000000000000000000000000000000000000..0619f4511ba26a68d5ce59fea6660cd916ac41f5 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V3y@T|W;X*;OiAAEE)4(M`_JqL@;D1TB8!2l zuY)k7lg8`{px|~-7sn8e>!kZfkc!K%XB;C3q zqpQ|^VfLz8P8S_JZC`V-RONKL1}ita81ue&DU%m49^CtxnWui{%i1+X&F;^PH?4Ls z@(_HxeW%Fx_-zu~{K7qCWme>EdcgVfLI3;p_p(ngz1bNb%upcG-Lm|{adEy*6OpHP zH!T2qLAAs+q9i4;B-JXpC>2OC7#SEE>Ka(;8kvU}npzo{Seck=8yHy`804p4U5TP0 zH$NpatrE8eIjdYzpaw~h4Z-BuF?hQA KxvX2>8 zUk71ECym(^3=E73o-U3d8t0czJg?ncD0BS&{P+9L*WENRWB)05G)&v|q)Aq4>*=sA z=9BUYfqY)tg4acN7nBqfJvR%I+2*8}CEma0YtPALX7=A~&R*m@ob>OJ=s`8q9nMN829#E<+1J!}qUDNA<0{Q2=w z-s78%hP)pb)u_u%?ST6zC*APbvz&DfDLfpSV*e zJS7<<7!@41srw&#{JG}D+w7n@9SLlW4iCa4Tz9QtJ6*_dqI*w6uc%7s>RS&JeWs)* z&!4_XZEjD|@nXs4|Nm{A6koNV+T-}I_{G2oP%UwdC`m~yNwrEYN(E93Mh1q4x(1fI zM&==grd9?fRwky}21Zr}2Knh%SE6Xh%}>cptHiBA&MH?Fs6i5BLvVgtNqJ&XDnogB hxn5>oc5!lIL8@MUQTpt6Hc~)E44$rjF6*2UngBS`=cfPw literal 0 HcmV?d00001 diff --git a/images/icons/22/link.png b/images/icons/22/link.png new file mode 100644 index 0000000000000000000000000000000000000000..e819ad3ac8f50587477b490156504acdcb1a5720 GIT binary patch literal 767 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H0wnYHF4+L2n3BBRT^Rni_n+Ah2>8 zUk71ECym(^Kov5cE{-7@=g&^^^$1B6X`BD~?A)FA3jg@3s2OjN?=sR%*Ks<%D5_<) z*~LXGdQ;pyTomg#~Y& zu10^x)Nz|U6bM>A6vje@2WxE1X zGyA{SGO|i+nCz%^{UrmJ!n=+ovwX6BAOHR5nDyewhwi6*zY7x`nqJL`n0?RiH`^`q zJs*Fpoj!j~>>jn&)gd{>I`Z~xDTzduyiF~a{NbU<#)ddtOZ#_IGPxo^q#vlFW)=)oNV^g^xRe5d%M?vmH8UK z)y?HS8&6uGu7%G;@hpq4+l+7aPA~c?DZBD_Tz&bOqQ`TuuVLLX;kfm!_%$|&|1Y=cT~O$HCSul~pC1Ibxk~H#U3o=I4RsAHb&bqJ3{9;JOsq^y zwGE7{3=HzqudYPVkei>9nO2EggPc{aC{TkW$cEtjw370~qEv?R@^Zb*yzJuS#DY}4 X{G#;P?`))iiWody{an^LB{Ts5A-hAR literal 0 HcmV?d00001 diff --git a/images/icons/48/link.png b/images/icons/48/link.png new file mode 100644 index 0000000000000000000000000000000000000000..b32eec52930967d2819470686b97bd6afb456ee5 GIT binary patch literal 1685 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 literal 0 HcmV?d00001 diff --git a/images/icons/make.sh b/images/icons/make.sh deleted file mode 100644 index 3481174116..0000000000 --- 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 acbbc9bd5e..8dcc1bff41 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 f4f2e1671f..0000000000 --- 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 2c467c3c26..0000000000 --- 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 1f5cbcaeb3..0850d739d7 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 add2cd5a09..d880dd9d49 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 a4508b067c..a81eda7652 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 daad6ad149..a958ba65ae 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 a4508b067c..a81eda7652 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 daad6ad149..a958ba65ae 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 c5dc1937ba..525ca48d82 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 95dd61adb7..1be65ea917 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 ad50ee3271..4d9e12540a 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 47f062affb..29cf657056 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 4fe677ab4d..70c13bc976 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 db34441d55..0000000000 --- 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 39cb33f0fe..7db8b86977 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 30fa6c3356..0000000000 --- a/view/wall_item_drop.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
- - -
- -