From 94f737b69912a32b5ae693f5aab3da0df7956926 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 4 Nov 2012 16:57:09 -0800 Subject: [PATCH] some cleanup of main item template --- images/icons.png | Bin 12574 -> 12638 bytes include/ItemObject.php | 75 ++++++++++------ include/features.php | 1 + version.inc | 2 +- view/theme/duepuntozero/css/style.css | 50 +---------- view/tpl/conv_item.tpl | 121 ++++++++++++++++++++++++++ 6 files changed, 175 insertions(+), 74 deletions(-) create mode 100644 view/tpl/conv_item.tpl diff --git a/images/icons.png b/images/icons.png index 7294bad07f6d780c508bddbed18a5e694747e71c..34d77a1361574b95e8b16f74df796c0b433dea8a 100644 GIT binary patch literal 12638 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 literal 12574 zcmW+-1ymbN7Y)T-iWGNfaVS=_xD0{EB(Zo+Ud;CC22zGm$+HzJZOf4ieHLuxkkT2m~}rtCa}=00}@sSU|~T z*@Ab=K3 z(uAjk85dt5F8pumtE6Bwh8rB|Fhz3nqYQ5+e*sgm|IWon2kPbRSnSx^ZN@6!ZAN37 zyJ!hc;6E%IfTIw;esu=*m~P(Oc9#KDHkT6A7w@90?~-Mdb8L&yo_wo~`O#DQS;F*` zheNj29EaZ_UmwciCoZfD5xpa$q|5I4J{X4z##2RHOuidWq?2=TrR?nJM`rNAca8oX z{K#ymrcKI>qZR0z*_nX|b=^x0aX{pKEcU?~`hJp-P@2%xoyxjTj^nv$F z*YS)jl;k8npWzw9+B?&?hO&j?ifDAa-jS!TBTQ!VNCB-6#Pf;gS4se89=M9ot#b%2D?mUDOo$ankUy&xr^FoVo=~bRU#xKb1^v}+1=@Lkv@y6?=K8BXFOcpiVZg1 zTWDb>-oWdRONB}q&QLSTxuR|bH}piY`;IlI37wX{=di?zCO^y88euOlzUb&^lX~?! zb?JEJN$c$j5iZ|4<0qoa2qq~A@`LqW5 _o8CtGbhRVh>< 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­$#l?clQ5tKmU&`Jd6Pr{J9s>%_!5)1Xd|8 zfYulX5g`~N8MjRoyK`-$LJJTk{$a_HmhIePpsOIVv#Yvls;LyJP`eTj$cehi>gS|m zX5!C2+#uutkKr7)U=P{po9oRZ$io&VHe?~4KzCyzo#T4^ld#(0u=Se z4qm;tQpH1T94v#l1XT;GMs6K>Oh2;KP%jA`V)5O_mp`A$GKKa>eTf5NX_Ku(2|A70 zv-n3~5!*k7rjmR&HHLMF|7>8MjGqt(8HY~ywg3UPdpv8;4WbP-3$Y&Ll!b^Vvjfo- zrINAApx$B}V%#FU{RX|}6r$`&8S(t%>I~MBmQ^cCJYzONUcdH^;0tNI*%rsJFO6tn zem-u_*mUhh=jX@wO<8XVcxgNdu*}n~=bSZf)_fbepwOM)BM)1nH3=aI*1!-L)zV}R zO-S&!y7@ef-FPyx89P}?$vU(CmE&@QQNBr&f!%6l#PiXi;_lV3gY=2do74WBQ9TVe z(jB7hl1gy#5|Ro~*A}|zfMS;VJNXTZ`>e9r*rLvUqJp%W5}gRK404=`X#qmW9S&By z?H?-@YX(93dah(;wqAf1uw!JB`*G#P(fk}bF_euNtc`7NZ*!iZ@btXqI+2o+f|+kl zZZ2iHOy!R@C0*xc%}P_&6f6M9>x%K`I>X@<^JG*cXQneLAX7(4#Ar6*98*J54tP0Z zbJ=z)lf1gGxyKK>1!5xmu28KBAHC3T-8)wGW`99cD)%C{&v#67W;@)*G?_y%`6BFl zPG{g_3|aMSuV~8DJ-}#mu${LIQq{(~F$3S(;H_ptL36I{mY5quu~U1ium@9Qd+9oM zZ;xPWEm={lUfr^?JQc)+Vx#k@{Zor!ajN?7peQCbR;~Nw1`TLjv2Yf=&uPm^FqXmF zilka+y4zwK%XPgbjr7rq&4jbXVW#s1(F|YpX0B=0RVjB$p?0+n3*^+BFQ`V8_6rgP z4Yrp9|8Z3#(CB5mm98_dlK;ekOCy8d*{u|GP%*mSV^(i>t$^+n6uZ;oJKp(GlfBP) zd>RG&Y%3(j$3fGhprB6gp|_1*XSpj)S&)|(_bYuuB$d4aAIAd)TLV0wa;s~pa9aG{ zsQ{Lu_gQlROOE(jmR2pI!ZWTe+^sQm&K6vmi_W)yh28Orik;vAJaVQ_KtAIjHmll% ztSK6Eg0{&R5)sQq1!qiXkKH}IGL%b^dG@jBL>0eVuGR_XPG5D8;TjS(x=$~R^Fyof zv-@yV6_rEPuRDCrK83aU;bKf?Q336r$|%w6ZRDrEZLU# ze~<$3tY3!)j9$&bZ5#2>wYGWs$S!{R92UDZ!9B8O&7EGxd!pM_SVUi>9hzrB3Hwuj z6t~0>F+pG*N;Q*@I}*4Fi9?Fi+ut<`8C*{CB-R@bHkXZQsamptJ3I{HnmbUH3AdJ; zJx4jC25U_=f@(*3zNB!N3#z(6fn!##&OS)4`+qCZWKQ~Oqmnxo6Lw%V(TS7i1nS$!vZtGq@)576D|X zm;QBIcD?xuoK6rojJ?etAH_VjUo%e=@wsrb?@-41$^~Y*a^+Iyck^x)i90dSo`t?< zd?+>3 z$Ol5>FG8_m;gJAwEv7~!RR`V63)}kUZyeO*Z;23h0xr_C)q!(DpGI}8jFaPmk<@)O zU0AF<=78P_C?c!8_?F4q5P8Mh?~mVry9ML-*Vm0>_O0vqUfgNz2sZHv2`(NT88A$& z*2^z?ej8KmStOvjkiTLj9!RGTP9fd1mDu}dlLXFeIC}>UWvOget_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false); + if(local_user() && link_compare($a->contact['url'],$item['author-link'])) $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); else $edpost = false; - if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) + +// FIXME - this is wrong. +// if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) + + if($this->get_data_value('uid') == local_user()) $dropping = true; - $drop = array( - 'dropping' => $dropping, - 'select' => t('Select'), - 'delete' => t('Delete'), - ); - + if($dropping) { + $drop = array( + 'dropping' => $dropping, + 'delete' => t('Delete'), + ); + } + + if($observer_is_pageowner) { + $multidrop = array( + 'select' => t('Select'), + ); + } + $filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false); $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); @@ -158,8 +170,8 @@ class Item extends BaseObject { if ($tag!="") $tags[] = bbcode($tag); } - $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); - $dislike = ((x($dlike,$item['uri']) && feature_enabled($conv->get_profile_owner(),'dislike')) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); + $showlike = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); + $showdislike = ((x($dlike,$item['uri']) && feature_enabled($conv->get_profile_owner(),'dislike')) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); /* * We should avoid doing this all the time, but it depends on the conversation mode @@ -173,7 +185,8 @@ class Item extends BaseObject { if($this->is_toplevel()) { if($conv->get_profile_owner() == local_user()) { - $isstarred = (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred"); + +// FIXME we don't need all this stuff, some can be done in the template $star = array( 'do' => t("add star"), @@ -181,8 +194,12 @@ class Item extends BaseObject { 'toggle' => t("toggle star status"), 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""), 'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"), + 'isstarred' => (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred"), 'starred' => t('starred'), - 'tagger' => t("add tag"), + ); + + $tagger = array( + 'tagit' => t("add tag"), 'classtagger' => "", ); } @@ -191,11 +208,10 @@ class Item extends BaseObject { } if($conv->is_writable()) { - $buttons = 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) $buttons['share'] = array( t('Share this'), t('share')); + $like = array( t("I like this \x28toggle\x29"), t("like")); + $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); + if ($shareable) + $share = array( t('Share this'), t('share')); } if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) @@ -233,17 +249,22 @@ class Item extends BaseObject { 'owner_url' => $this->get_owner_url(), 'owner_photo' => $this->get_owner_photo(), 'owner_name' => template_escape($this->get_owner_name()), - 'plink' => get_plink($item), - 'edpost' => $edpost, - 'isstarred' => $isstarred, - 'star' => $star, - 'filer' => $filer, - 'drop' => $drop, - 'vote' => $buttons, - 'like' => $like, - 'dislike' => $dislike, - 'nolike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? '1' : ''), +// Item toolbar buttons + 'like' => $like, + 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), + 'share' => $share, + 'plink' => get_plink($item), + 'edpost' => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), + 'star' => $star, + 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''), + 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), + 'drop' => $drop, + 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''), +// end toolbar buttons + + 'showlike' => $showlike, + 'showdislike' => $showdislike, 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), diff --git a/include/features.php b/include/features.php index c4fe0df55..efd9c3455 100644 --- a/include/features.php +++ b/include/features.php @@ -25,6 +25,7 @@ array('archives', t('Search by Date'), t('Select posts by date ranges')) array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), array('preview', t('Post Preview'), t('Preview posts and comments before publishing them')), +array('edit_posts', t('Edit Sent Posts'), t('Edit/correct posts and comments after sending')), ); diff --git a/version.inc b/version.inc index 6e327b8ef..986400c00 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-11-03.127 +2012-11-04.128 diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css index 40941c890..4ea58fb4a 100644 --- a/view/theme/duepuntozero/css/style.css +++ b/view/theme/duepuntozero/css/style.css @@ -342,6 +342,7 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } + #group-sidebar { margin-bottom: 10px; } @@ -1091,57 +1092,15 @@ input#dfrn-url { width: 100%; } -.wall-item-like-buttons { + +.item-tool { float: left; -/* margin-right: 10px; */ -/* padding-right: 10px; */ -/* border-right: 2px solid #fff; */ + margin-right: 8px; } .like-rotator { margin-left: 5px; } -.icon.dislike { - margin-left: 3px; -} -.icon.remote-link { - margin-left: 10px; -} - -.wall-item-like-buttons > a, -.wall-item-like-buttons > img { - float: left; -} - -.wall-item-like-buttons img { - cursor: pointer; -} - -.wall-item-share-buttons { - margin-left: 10px; -} - -.editpost { - margin-left: 10px; - float: left; -} -.star-item { - margin-left: 10px; - float: left; -} -.tag-item { - margin-left: 10px; - float: left; -} - -.filer-item { - margin-left: 10px; - float: left; -} - -.wall-item-links-wrapper { - float: left; -} .wall-item-delete-wrapper { float: right; @@ -1155,7 +1114,6 @@ input#dfrn-url { border: none; } - .wall-item-wrapper-end { clear: both; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl new file mode 100644 index 000000000..a5a3c4958 --- /dev/null +++ b/view/tpl/conv_item.tpl @@ -0,0 +1,121 @@ +{{if $item.comment_firstcollapsed}} +
+ $item.num_comments $item.hide_text +
+ {{endif}}