From 1fe431ae5c301615b01703318a7cf3457f9f4fbb Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 2 Nov 2007 00:44:00 +0000 Subject: [PATCH] Ticket #1469 - new images for pagination, and consistent button look across the board! :-) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44137 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 4 +-- css/cms_left.css | 4 +++ css/cms_right.css | 42 ++++++++++++++++++++++----- images/pagination/record-first-g.png | Bin 671 -> 1127 bytes images/pagination/record-first.png | Bin 769 -> 1142 bytes images/pagination/record-last-g.png | Bin 587 -> 1095 bytes images/pagination/record-last.png | Bin 696 -> 1111 bytes images/pagination/record-next-g.png | Bin 521 -> 1046 bytes images/pagination/record-next.png | Bin 606 -> 1045 bytes images/pagination/record-prev-g.png | Bin 528 -> 429 bytes images/pagination/record-prev.png | Bin 575 -> 1051 bytes 11 files changed, 41 insertions(+), 9 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index e7620d0b..436bd4f9 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -279,7 +279,7 @@ HTML; "

"._t('AssetAdmin.UNUSEDTHUMBNAILSTITLE', 'Unused thumbnails')."

- "._t('AssetAdmin.DELETEUNUSEDTHUMBNAILS', 'Delete unused thumbnails')." + "._t('AssetAdmin.DELETEUNUSEDTHUMBNAILS', 'Delete unused thumbnails')."
" ) ) @@ -705,7 +705,7 @@ JS; foreach($this->getUnusedThumbnailsArray() as $file) { unlink("../assets/" . $file); } - echo "statusMessage('All unused thumbnails has been deleted','good')"; + echo "statusMessage('All unused thumbnails have been deleted','good')"; } /** diff --git a/css/cms_left.css b/css/cms_left.css index 57881529..1b76cd7e 100644 --- a/css/cms_left.css +++ b/css/cms_left.css @@ -23,6 +23,10 @@ width: auto; }*/ +#TreeActions li { + float: left; +} + #TreeActions li button { cursor: pointer; float: left; diff --git a/css/cms_right.css b/css/cms_right.css index 492616a0..737527b1 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -89,14 +89,19 @@ text-align: right; } -.ajaxActions input { +.ajaxActions input, +#MemberFilterButton, +#CommentFilterButton, +.actions input, +#deletemarked input.action, +#UnusedThumbnails a { cursor: pointer; float: left; height: 25px; background-image: url(../images/textures/ToolBar.png); padding-left: 10px; padding-right: 10px; - color: #333333; + color: #333; overflow: visible; width: auto; border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); @@ -105,6 +110,22 @@ font-weight: bold; font-size: 11px; } + #MemberFilterButton, + #CommentFilterButton, + #deletemarked input.action, + .actions input { + float: none; + padding: 0; + } + #UnusedThumbnails { + display: block; + } + #deletemarked { + text-align: right; + } + #deletemarked span { + background: none; + } .ajaxActions input:active { background: #F4F4F4 none repeat scroll 0%; @@ -115,7 +136,8 @@ background: #fff; } -input.delete:hover { +input.delete:hover, +#deletemarked input.delete:hover { background: #ce0000; color: #fff; } @@ -328,9 +350,9 @@ input.loading { } #statusMessage.bad { padding: 2px 20px 2px 40px; - border-color: #c80700; + border-color: #ff8e8e; color: #c80700; - background: #ffe3e2 url(../images/alert-bad.gif) 7px 50% no-repeat; + background: #ffe9e9 url(../images/alert-bad.gif) 7px 50% no-repeat; max-height: 300px; overflow: auto; } @@ -352,20 +374,26 @@ div.MemberListFilter, div.MemberFilter, div.CommentFilter { /*float: right;*/ - width: 40em; + width: 30em; margin: 5px 0; padding: 5px; background-color : #ebeadb; border: 1px solid #aca899; } + div.MemberListFilter span.middleColumn, + div.MemberFilter span.middleColumn, + div.CommentFilter span.middleColumn { + display: inline !important; + } .right form div.MemberListFilter label, .right form div.MemberFilter label, .right form div.CommentFilter label { display: block; - width: 10em; + width: 5em; float: left; margin-left: 0em; + line-height: 2.3; } div.MemberListFilter div.field, diff --git a/images/pagination/record-first-g.png b/images/pagination/record-first-g.png index 7ceeabc7948cb8fee3cc6c3117d87706a26d2fdb..a3bfef6deaa201c5404fb119976be4463ef0300b 100755 GIT binary patch delta 768 zcmV+b1ONP=1?LEmB#|^E0s{b%THk+3Nl8jdN=r*iOiWBoO-)WtPESuyP*6}&QBhJ- zQd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRroVq;@t zWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&v!kb98ic zb#--ic6N7ncX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKN zhK7fShlq%XiHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7 zmzbECnVFfInwp!No1C1Sot=N3o}QkcpP!(hprN6mqN1Xsqobsxq@|^$rlzK+r>Cf> zsHv%`s;a81tE;T6tgWrBuCA`HudlGMu(7eRva+(Xv$M3cw6(Rhwzjsnx3{>sxVgEx zy1Kf%ySu!+yuH1>zP`S{zrVo1z`?=6!otGC!^6bH#KpzM#>U3S$H#xj$jHgb$;!&g z%gf8m%*@Tr&Cbrw&(F`$(9qG*(bCe=)6>(`)YR40)z;S5*VotB*x1?G+1lFL+uPgR z+}z#W-QM2b-{0Th;Naom;o{=ruz*=jZ3>=;-O`>FVn0>+9?6?CkCB z?e6aG@9*#M@bK~R@$xP5^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_ z{{R2~N@KOblRW`gf2c`BK~#9!V(`EM7)Ta;e-lW&x`-n9?$k;TkGH25A`8Ah|8$AR zxARZuAql=Y|MKpvTL)g=ZQHYb>rRN^tBWu1UOYMT_T7uuFPuD54-q`|;@-tGi;e(^ zgFDyHu7U_Yn6&=PuFb9M&um|}bk5XbsF`2%iOzBn<>-K}|sb0I$e51&ZmBAtwR=+mTA&3^r@&IsgCwNpw<9Q zL6dL;2Y&zz2%l8|008w#L_t(|+G6m)0ssPt0h=H|0Ko;_kpuw(2rB5#Bk$qC#0TX8 z1Q3LBw_#WCa5rbSg9riy5CcRV8@H;5Ase>|L=Yf=K!WZPY^;oCI_j*9Dh9$Dl1v@| z0R$4{V_;=u;OFFEWNX=!O{ zYHDk1Yiw+6ZEbCCZflarK`l$Dj0mX?;6mzS8Bn3Cf>sHv%`s;a81tE;T6tgWrBuCA`H zudlGMu(7eRva+(Xv$M3cw6(Q=wYIjlx3{;rxVX8wxw^W#ySux*yu7`=y}rJ_zrVl0 zz`()5!NS7A!^6YG#KgtL#m2_Q$H&LW$jHgb$;!&g%gf8m%*@Tr&Cbrw&(F`$(9qG* z(bCe=)6>(`)YR40)z;S5*VotB*x1?G+1lFL+uPgR+}z#W-QM2b-{0SC;Nall;o;)q z;^X7vlt)=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa z^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_{{R2~FNc?g0001CbW%=JlaT>j zlb`_vlkEWrf1gQ2K~#9!Vo1OO7)Tbh(E$=lfhdBK0_q6~_5v!%f-)@p1_|yg{KiOv z0W8dnrY@Guj6T{<8qN?wF==K-26o#ZMh4$l_6R+Qpl2u>1CwYBkWjYPvSNh@D!B17 z$%UEmGRcPMi|g`1%{1f^6qd3B5)R?fuE8+d%{fFIH4_v$M7&Vk>Bs7wkRZ<*iRvQ> lpiv1%apVRFVL^ZZ0{}o?Zb6fjU3UNg002ovPDHLkV1mI}p&tMM delta 330 zcmeyy(a1JIg_kAW(btiIVf_hn)~=Tm71fy-l{b2+GxD&MJH2FJU`Q+p@(Z4v$Q(Jj zfSJ9XVO>MMAyD+Yr;B4q#jPZd156A|9gMRT92gF=KAyitI36;x z2)G!;1v%I%-ivc!RpJnENH|y_DOT6aQZ81P+yT_o$nuyuVuqw|tj}I9`SVV`^+|aH!yzdz2F8|90fmMQTudxt a5)5}UvkJ4q+zo(%z~JfX=d#Wzp$PyoZExiO diff --git a/images/pagination/record-last-g.png b/images/pagination/record-last-g.png index 8654e336b4399b2d89dfa63aa945a05ced77e5ee..ede7e36c47c60eb0b54f1180c22b4f5238ce1d52 100755 GIT binary patch delta 826 zcmV-A1I7Hy1jh)FB#|^E0s{b%TB(0GH#ayqI5{~vIyyQ#J3Bl)JUu-_~R#sM5S65hASXo(FT3T9LTU%UQTwPsVUS3{bUteHgU}1k@VPaxp zV`F1vWMpM!WoBk(XJ=<VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T; zsHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY7h?wzjvox45{t zxw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve z%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO z+uYpT-QC^Z-rnEe-{5QD;Njun;^N}tgww2>+9_7 z?CtIC?(XjI@9*&N@bU5S^78WY^Yird^!4@i_V)Jo_xJet`1$$y`uh6&`}_R-{Qdp? z{{H^||Nr=HIWhnM05^0}PE(T+0W^RA{{RqKor?ef0GdfeK~#9!Vlcx37)TX7^a4bl zeT5>pXZ<}Od1CzoWWnv%*WWcWJ8~T?2NJw?XwUWyw-2wsasWi$g$Q1KbnouX>w7k@ zzW^rhf(5TUxOnE+o~`Q^%z=<#!OM5IZCt%%-Ndv7VDcPT@M2DJRsH;lY1=xtg2)R9 z+kq-hgURzqPFk0C6il8%cIWzQAadVrG6RGNL4W`Q0I{cpqW;hb-T(jq07*qoM6N<$ Ef_0M4&Hw-a delta 310 zcmX@kahhd<3NK5#qpu?a!}=5EtX(fBDylOvES>1Jl1KL4f%gmy4CW<4e!-Iyne`_Z zFtbmdz|2wq($mE;q~cbR!C@u_rVhs03JwelIk>o-G8!0~xV$o&B#NSR6672h99boO zZ#3#u3fFDW0P!p%d}m0WDT(yG(c5U#z`(@y$;+UqpqO)}$IC{K1#=`F7#Jru=~!=8 z(O$fRlYd5vnK3hm!h!`N`&SsrE6)~O&e3855~*LXfN%4pMKiVtPS#YPam5^>YQ@5y zwg!XAn(WdYPZ)3U3phA9im|b=E#P8KPF7gSwn6>r#?G0HECL}H zTEthJj+n}=lg1|C5W&o%(6E7viA5mHv4P=`7KcCrLwul(>){Uzw1DBj;OXk;vd$@? F2>^lwV|xGq diff --git a/images/pagination/record-last.png b/images/pagination/record-last.png index ba1d68ae6d47245c98d409923f36f37e51e6a3d3..68448e35d90769fd5e5e770e1f8aff1985bbef13 100755 GIT binary patch delta 736 zcmV<60w4Xj1=k3WB#|^E0s{b%TK9iZQBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_I zT3cINTwGjTU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2 zY;0_8ZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzzdV7C+dwhI+ zeSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%XiHV7dii(Sii;Rqnjg5_t zj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfInwp!No1C1Sot>SYo}Qnd zpP-Cf>sHv%`s;a81tE;T6tgWrBuCA`HudlGM zu(7eRva+(Xv$M3cw6(Rhwzjsnx3{>sxVgExy1Kf%ySu!+yuH1>zP`S{zrVo1z`?=6 z!otGC!^6bH#KpzM#>U3S$H&OX$jQmc%F4>i%gfBn%+1Zs&d$!y&(D9*(9qG*(bCe= z)6>(`)YR40)z;S5*VotB*x1?G+1lFL+uPgR+}z#W-QM2b-{0Th;Naom;o{=ruz*=jZ3>=;-O`>FVn0>+9?6?CkCB?e6aG@9*#M@bK~R@$&NW^Yioc^z`-h z_4fAm_xJbs`1twx`T8CD`uqF){QUg={r&#_{{R2~R}xfv0000{bW%=JlVJf&lW+k9 zldS;=e~?K;K~#9!VhF$j7)TYAQ38>+YAAxT{#rm%)n5ZyP+G{JH6XwQOo9c~Wn`sA z_=No(%|Rq9M9|m6kV}k*S;F5MOv-}=RZM+6rI>k{Bn2QOSkQpW$W>6BiNQ|~Oj>~j z<-9c&I7AuzoGn14JHmEG20wi;X^i9~Mn5MoCTWT6PJ0&+Y34;{fDj=F5MTh+_+1#T Svi9%*0000x;TbZ+)Cm&z{J4R!8lvNfngy>QL%GI149$nDUFZJp3$a$2K)*Q z3z|0li*g7It>@jK;lSX?y0rCAq%4z9!xFs->;euBj-`^3nSyqS_3p(2Cs#=bFo4A3 z`JMF)<arJ7Rj2w~>A!a@0aK}P5HhWuxOi_rCWxg*fUm%-( zI=8^fcVZB+GBGhRH#Ym)Tv>(8Gi+OAfll&E`cfRkw;}nuC*bU*|%i$cQ&E+!U%FvkXlLs}dH2@HxH5lYDyd3ZB{erND>^>bP0l+XkKmeX8g diff --git a/images/pagination/record-next-g.png b/images/pagination/record-next-g.png index 74f72943c21e09968ac4fe258081ccc2785b5a8d..f48422920450a79c28c9832f4b18568566726bb5 100755 GIT binary patch delta 801 zcmV++1K#|J1eOSpB#|^E0s{b%T9tIXOBy zIy*Z%JUl!-Jv}}?K0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*i zOiWBoO-)WtPESuyP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3dfxTU=aR zU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCC zZf3}bii(Phi;IkmjE#+rj*gCxkB^X$ zkdcv*l9G~>larK`l$Dj0mX?;6mzS8Bn3Cf>sHv%`s;a81tE;T6tgWrBuCA`Hudjcwu&}YQv9hwV zv$M0bw6wLgwYIjlx3{;rxVX8wxw^W#ySux*yu7`=y}rJ_zrVl0z`()5!NS7A!^6YG z#KgtL#m2_Q$H&LW$jHgb$;!&g%gf8m%*@Tr&Cbrw&(F`$(9qG*(bCe=)6>(`)YR40 z)z;S5*VotB*x1?G+1h{F+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7vlt) z=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq z`1ttw`T6?#`uqF){QUg={r&#_{{R2~&i?2&0000nbW%=J|NoN%0V4u6;yA&&D*4IN0sX?@>FVdQ&MBb@0IbAazyJUM diff --git a/images/pagination/record-next.png b/images/pagination/record-next.png index e1c5340afca7bbdd210cbb375989040da0cf60a8..f6c055063d77040997088ed57d5aca8b58aa75b5 100755 GIT binary patch literal 1045 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3-p0n&d&0WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW`+Qt5Z9Jz)e;I4UZqYwhl|f$KGrg;ddZ%-#jBF{zFyn1 zEjxKq(5&^7=Wm?RvZ>h6(QxVQo*idaO*!5&W%-o7&zBZ2N*np7v!_Mv+rMq? z<0;8~LA{Gx6*Uw!O*HpDUV7oiiRJqiocp}>{FURI53j3UmHqJ9t*wuj?%2A)($lhf zQuVR-Yp1U6ZP}E)_xak+d7a6n$vby#TEAxbobxR`i&}sl83m&uK+_O-|84#}parHS zL4Lvi$p8#BTQ7jJVwR_iV@SoVBm+lAo+AY}Ljrf);`wwUCfSlrRU_QNab|mH_=HB* zL#e@69tngcUt|2(7?T(1S*M)lSEg5M5I(Cp+|^~y+|EFrGpSQ2KD|64DapiPhR%^A rEBaC<$}Lvhw0D+}N(CdkxWWO3MpkWk@i#8^pm6bY^>bP0l+XkK4R6}V delta 486 zcmV-K}|sb0I$e51&ZmBAt!$T%uq~JMHnC$`ug~UmV5mB`$}~} z&eO*K|Nn%Vd%f$e{r&xOs$-{2?eIDKshg_w~l_wZ`wQxw^8AqlLZat^EA_gtBwc*vS6< z{jT1#$rb2*}lxvb1A25oBW3adrj>ARw39%8*0Mnn#X_mDw2} zfPh>91AcK49t|!nM`mY$00MH2In0!#`M73S7-Tt}0RjlfW!KeHQ*?v~ ze}8}I=;+MM%$S&%eSLkw!NJhb&~|oqm6ess%F4XFyyD{G;Nalb*Vo+K+_$&4v9Ym) zgoNMU-`?Kdjg5_kg@ufajHsxnzrVkdl9HU9oYKiKkD~8F*$)%;G>gwvm z#KgL~y3Wqd;o;%z?ChJHn*aa+t(?pp0000pbW%=JlMw+dlOO>Ge*kfwy^a6?0BcD^ zK~#9!VlYAh48(9bB#^lV!fZ%f4rX-)1ecqclT|}Rl0^y3)n?>mWfT|C)Zqei^|)mj zdH7k_4H>{(F=cihT{SHgAts1k897BME(Rt+d8o;vY`lEP_Ubb*ptwp^nglQ4-~t2~ Z0GgC3ZDU&Tp#T5?2>?k&PDHLkV1l&Qt26)r delta 415 zcmV;Q0bu^E1CRueBn<>-K}|sb0I$e51&ZmBAt-;JP)t-s{r&xVdV0~((dg*tb8~aA zudm(R-G6_7&(F`fxw+}->Few3nVFf)%*@Kl%Fxiz($do2-rnNk;*ye*m6es{<>kS_ z!PnQV$-ZjEs!By1L29$y4R(6|5rgvJF3FaQDuDj0@r5UT(H002ov JPDHLkV1mSb$~6E0 diff --git a/images/pagination/record-prev.png b/images/pagination/record-prev.png index 33330922ced7c6d7f9f5cecd062af574641d32b3..951e5229ab92c7256005fce9202bc3c050fcefb7 100755 GIT binary patch literal 1051 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3-p0n&d&0WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW`+Qt5LZJ-!?lm6tUbN-+V^9Yo|b!GuhlfsTzb3b@sqpL zm$y6nI^TbGGpQuXDby*d&ntUYRL{QRYoCuTJw3(E*R6V0a`C$4wb$p&T|KpDQOo1! zclJJB+OjPB$c=pm4(>2CH(Yyc`O?F4qPo1EKD}4HD*Mv4OH&T__(c1(>?)pey4uXu ztaw)PlvO>2pH91|rd^so+fn{~t~ z*XpKt@k^@PLU$g5j2s{^5me6;DCI;pyt?86;$Hv& delta 459 zcmV;+0W|)b2)_i7Bn<>-K}|sb0I$e51&ZmBAt!$Tz)(z7MgIQ&F+nl?{rs)tlsQQ` zt;?nS`}-+0Dc1MKrQ3|X>#asjMwh3DQfX3Jib|BKjMnqUG(R-u<=%|GbEV6aLrp__ zs$+AmW39%gz`?lI^Sy+oYt+%rrNf+Snp(BbrT+f?t=F9W{rxdFG2`dl#_z42tCdV! zOk-1ZT3U`u)6>&hf=V_;HofDel*@a2s%zuq)#K#dVsu(kVM@~0(%DtQ=gH{8l___Vxe)1mv2^b8s>1DvH>!FxUeG5RfY&pvugtXD!ahs9+BeKtQeq zuQaEyn4G2=JCi*?00CFIY%<2?`Yep>%G|d0009ItnaM;$TL)q?KmbAP)nXKcZ~+1c z>PSgZ2n`TGFgLS7D1ZP$^8!Esp>Y8M2#pI6U;uknGOj9sJq7>(002ovPDHLkV1m1@ B)iD47