From 052466ceab9666b30b6ee38bbb5774b1070618ad Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 14:26:30 +0100
Subject: [PATCH 1/3] Using &#8230; (hellip) instead of "more" for link text

---
 plugins/OStatus/classes/Ostatus_profile.php | 11 ++++-------
 theme/base/css/display.css                  |  6 ------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 7ea8ff633b..e47b6973d7 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -546,7 +546,6 @@ class Ostatus_profile extends Memcached_DataObject
                 $shortSummary = substr($shortSummary,
                                        0,
                                        Notice::maxContent() - (mb_strlen($url) + 2));
-                $shortSummary .= '…';
                 $content = $shortSummary . ' ' . $url;
 
                 // We mark up the attachment link specially for the HTML output
@@ -554,12 +553,10 @@ class Ostatus_profile extends Memcached_DataObject
                 $attachUrl = common_local_url('attachment',
                                               array('attachment' => $attachment->id));
                 $rendered = common_render_text($shortSummary) .
-                            ' ' .
-                            '<a href="' .
-                            htmlspecialchars($attachUrl) .
-                            '" class="attachment more">' .
-                            // TRANS: expansion link for too-long remote messages
-                            htmlspecialchars(_m('more')) .
+                            '<a href="' . htmlspecialchars($attachUrl) .'"'.
+                            ' class="attachment more"' .
+                            ' title="'. htmlspecialchars(_m('Show more')) . '">' .
+                            '&#8230;' .
                             '</a>';
             }
         }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9044021f5f..757ce7ff1b 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1288,12 +1288,6 @@ padding-left:16px;
 .notice .attachment.more {
 padding-left:0;
 }
-.notice .attachment.more:before {
-content:'( ';
-}
-.notice .attachment.more:after {
-content:' )';
-}
 .notice .attachment img {
 position:absolute;
 top:18px;

From e2768b863578ef1b763ebcc9e5adfaea5dfba9d2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 14:29:35 +0100
Subject: [PATCH 2/3] Using an icon to represent the action for more text

---
 theme/base/css/display.css           |   9 +++++++++
 theme/base/images/icons/icons-01.gif | Bin 4080 -> 4120 bytes
 theme/default/css/display.css        |   4 +++-
 theme/identica/css/display.css       |   4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 757ce7ff1b..fdbf59781d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1284,6 +1284,15 @@ height:16px;
 position:relative;
 padding-left:16px;
 }
+.notice .attachment.more {
+text-indent:-9999px;
+width:16px;
+height:16px;
+display:inline-block;
+overflow:hidden;
+vertical-align:middle;
+}
+
 #attachments .attachment,
 .notice .attachment.more {
 padding-left:0;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index bf0f1230e5e16d75e630a487708d8a45ed4f6abf..e0850aa8823636a300abb7d6e0def853a841387e 100644
GIT binary patch
delta 1444
zcmc(b{Zo<$0DyUc1obsgLP1R-P|46B@vFH8h=Phv{K_;H%`085GVQ~%0WTt^<^(FW
zv%+RZ<rPL<RPIz1MY9#&nzcS8t>s)b)Y{Fw(Y7D<H|)9R_vh}h`?r!nenNaybfGtF
z+T}G%1#Zmo4f3M~P=aaUfx!`L>Hb+1>UxHMcw|6$B#RTviRBjv68OTzl*E+nX{i~f
z<M^FPLPJt=QE_2UR#xtwY-48nj-9HJ%=F62gl9QHru^Jzg~5;W3yNjiRr3T52#_^l
z09BI%L^$PKw2F0Ons&fPa~q&K@47L$+#a^yFsXS9g!wFA+9ESe9qpewWPY)9CHL^~
zw8A{|r@r*q(2Rxy7ihkPlbt_Inm#=?jJ~pK`rv-x^LHO!zF%Ip&&(|@Ykr6OND7W)
z|4$|V<;hD(zy<aRMu+{wzoTJj2kg^dxvNZ&0^5Le$TJ}m%q2j)ww;FMD@pmi$X}&1
z{seT81O2fA0toeRw|#ZEkw)T4-+=Z~e0{nueFwEHYEOTxN#YN+iqxW`Z6vg~JrSYA
zwX-gWOKj$bFKe45p5yd#EG1s%f`sXpu8W~AXV*<VrTVfqgV-C~VlN7;^}@OfE!h5F
zepFF99A}C&+H9uqo<}+Q(y*`|{kar2pk-ww-xUGfTM+%3J&54kEH=;?x6%V+Yo8wS
zzEFc7fbvTJSUPJaA<KGUj3T5IN#>tPW!(ANFytGbR*NPf>gs$VdAfd>jjVJXI7L+M
zELnq^U{^Y3n;X|u#kp1Ma^6N+vBjh6!@Sum51LVD{ASaKRGWw0aPE5Lg!FBdCIJ~E
ziIQV@SSt^gUZPTX7B!QVp5XIYIfhGOnkgrYFXH_aG_Hl<`caQiCugfrjQ%M2c}kN&
zJp%Daw@{?w$~4!|tJ1bnY7_RF7$;x>jZ7nKactc%dRrs&JbObI6q6%rpq-{xj5EjH
z+)4_}4@E2RMU_wzc{pZqT*B1Y_BO0hSbDUc#l}L^S!=O6fi+^A7LXlP&CEHC!lo`=
ztBu(<9;&}h9)^n8(RaUV+chT$xnblusa(d~Uxi+OdhR#I{Rii^le2|AT3@lFs)1qX
zg$wBi-ZA5FPq@={mzsJZ*U)n@x0HARwkM=@&SQf!V~_?Z@RG`Dqm57_b-uj%MBTz}
z9GA3&kZ-f7l)lAv9SYCa5vrNN@cnP*M@UNgf`!^rwlGS&(7iB5zxih2E@OQw&m$#D
zWWJYI=^jr=iK4B*#1iI*a9gWI@x+R!<^0uP;J~0~_rYntl^=9O=~wZ-TZ@aex!;={
z*QF^RX17SJW+;Uqs|^`qBO(Ge-xoP~Wzw_F58@_OE{-rOJFNcc))>)E=)kh9alHh?
z6;2&T?yC6-nKiJ2QoxrBsYmEP2=VbCuq4f^wmJn|v%4iz_SuuiurY!ju~+6)hw)Wm
z*+e8JeAWEMiOaK)g;bqus(G^8sJ#Q_jawy_$?uPMB(nNIRT8U(&?hEbTMTja`i3_M
zV!C+p`VYAU$Iuj6Sh;`{&f}o)bl<DCM-^XKqu+(T^zV~LY!-##gfs}&&|K3>v`f)K
zE!@k}@3he_!!~M>K?07O)dms9#ZJV|ft6qF;rM}MH#W_*QmwD?$w)=@5j{<~eEr^#
z46@TY{$NRGGn?2=2AQ*5Zvzp<UO}GFOTkA{*MlV!sa$uX2uI-J1YG<<4yco1A8{}O
zgy9f)3Jy3lc+A64MJxAqSJ}^9WO$3Xq*W2!;!&!e)E&KU$=uY|5_|Ey?s3yaV#`T>
K0UQ8epZyKkZdafH

delta 1386
zcmV-w1(o`kAn+dyM@dFFIbj+ApbF>ykqkP2pa20JCmyQ+03;<NtpEb01OTrB0Js1E
zDkwF@001T`HpBo2DJ&nm1Om(e0?q&cRwE=YFdx4S4K+6<H8(WD6BoG`6T=oB#~d3$
zLqWhICBh>hLq}goNk>ddPRcDTN=|0OFfUS2RLn3l)h{xgMMus&J)}!avrA24WMR|=
zNlDC3O_6^X58qo`-C-)(USDK^X4PR|k)Rj@-Dzu)xFH7Ma&g;rc9Gd61LJ&sk^MFd
z=7xz{snKAl%HxWPlQ{t!1LBa5lT-mD59ODcZnf9@oHKT_*Xo&^lYs#<A?l{2`>I)i
z!rzI&-+IO2`L0`g#^Qy=<M^;?jl|>XuCJ5N0Z0b&!@%&v#*-HUArJJ`)b-cG|Jk$2
z<?#60*pop59uoTH=icu1<n;Ud@Z;+9`~C3nlWPJSfB*mgA^8LW3IP8AEC2ui02%<G
z3IGWH0RR1aRii_P8m|QY!^XqH01G^@DV!*9%8M?2`gD0Q<=-C&Kt`Dw1%$yLiUL)=
zm^A6oA(k8^Aewee*s*4aB%C;K07k-pF}fT=lM&6KE(nw~QzS{4Bt^}Xm@sD!6p4-<
z4yAFxe}qYa4Fmu*Dz<<EFbWHbHEMA0p1yS^RCVZch)JIr5q>lg(5P9NGROWlYn0&K
zJ74))u?V{8kdO#jxNsSv^jJ;HQ2{Vw1i;$611ei?2*Slkl^qWxH50}frvxJF*4fGT
z`Jcru1fnDXphE|M1R+NPQ82r0zQin2)(FsqK?@EkQg93z0pKBv59{(7hpTEL3({Py
z{#cP5BzZ*>pr~5yI8ha3$&#}~=&n!|44yFPQ=F2wiIg7^u!qus?ZJ~t1U!G}gcf3m
zvBny5<bg*Xf)qkY9t_^7g%)0zAqOqGKmrLTsknm5APZ`71(Ivj!HGKR%mU>sv)sbT
zf?^=)2`PmP(+xP+fcXn9v!Jrz8fL7aPCVeKbImpJuoF)_%hWQaf;`sI4Kl;fBab}x
z>`BfqUM~1X9fAx4PAc*2vyXo~xPbGGE2&VjU>=1)f(f7f{PIgb@_;i-D*l`lGU}75
zfRpJm#_SUhIj}+^$by1Exy_@QZaPah-9S<ZkqS~0B{|%DqiZ|+aHD1_cgV3IC1C#f
z4LjRhqfRz=dLqXf+txCRs<T`J4mij>=}8@Ch_Nl0>Y{>+I_<b}M;(83;<(@-sDKG8
zCb}T=?;2hpxdnrRP{Ii%g$R;I9_Ox+<HI#}?D5AShb;2QB$sUR$tb6+^2#i??DESn
zFL=foY_LJc&3y0y2q0`Y7zY+#kkLjPd-!39A(dp3$t4V)frTE@5F<*_M<<<0CzbT9
zARAw3($ClUKy!)JSQ~%B$AWB-k%%|$@B?-(S65=l9&{{7$IwMz@(lhy{qU2F+<UZ9
zw}N+zG7ma`pW;s6xdcvz)&$bA2P|LrGmkByERGKyWPAbnfPDDzNG{s&&5taX@U6@j
zSj4d)A5~|fxaEKZ(>E4SjPW|s(Tu~&DSY#yhTD-Kp}T^7R3d-N*XI}lO+V>;Ax=NN
z7{4GOvh%IY9-{Pv4;IYy<BauNU(E_Efvd4fDNw*+$s9!-ui)5ox6wK7NaP>CgErGq
zvl?m`g8;{HhL{=ffCx;W0vE`@20HM85R9M%CrCjJJ>h~F%wPr?q`?kqa6ujn;S)e8
z!VZ$Kgd0>)2frB>!V_MwaxGLL1}jIyex#5<8LS};G3df4vl$0K1tI>hfDG7x3wUV$
sP(l&7Q4<(K6G%c8ctH%Pfe_e15BLPLdJLKZ0ojuk57h=mUjYFCJDoFYjsO4v

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index c08a03061d..a283930e51 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -410,8 +410,10 @@ background-position: 0 -1714px;
 .notice .attachment {
 background-position:0 -394px;
 }
-#attachments .attachment,
 .notice .attachment.more {
+background-position:0 -2770px;
+}
+#attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 62a9e25d81..69d265a6b7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -409,8 +409,10 @@ background-position: 0 -1714px;
 .notice .attachment {
 background-position:0 -394px;
 }
-#attachments .attachment,
 .notice .attachment.more {
+background-position:0 -2770px;
+}
+#attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {

From 7dd701fbb38dea575db889d3723f9938dd0251d2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 23:00:38 +0100
Subject: [PATCH 3/3] Added processing indicator for more anchor

---
 js/util.js                     | 1 +
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index 79fd40deba..60eeb418f6 100644
--- a/js/util.js
+++ b/js/util.js
@@ -402,6 +402,7 @@ var SN = { // StatusNet
             var attachment_more = notice.find('.attachment.more');
             if (attachment_more.length > 0) {
                 attachment_more.click(function() {
+                    $(this).addClass(SN.C.S.Processing);
                     $.get($(this).attr('href')+'/ajax', null, function(data) {
                         notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
                     });
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a283930e51..d89607ebe5 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -213,7 +213,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 69d265a6b7..1af853c496 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -214,7 +214,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }