From 9302dd6cbe3ab7a4309454ad30a4d07a89a29b6d Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sun, 25 Nov 2007 08:14:30 +0000
Subject: [PATCH] nice graphics in search results. also, cocks.

git-svn-id: http://yolanda.mister-muffin.de/svn@186 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/images/tango/go-first.png    | Bin 0 -> 1331 bytes
 trunk/images/tango/go-last.png     | Bin 0 -> 1342 bytes
 trunk/images/tango/go-previous.png | Bin 0 -> 1200 bytes
 trunk/style/default.css            |   5 ++
 trunk/xsl/xhtml/results.xsl        | 103 +++++++++++++++--------------
 5 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 trunk/images/tango/go-first.png
 create mode 100644 trunk/images/tango/go-last.png
 create mode 100644 trunk/images/tango/go-previous.png

diff --git a/trunk/images/tango/go-first.png b/trunk/images/tango/go-first.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e2a6b1ea8da3a5f30c1a391c885b1eac6c58e39
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS000E)Nkl<ZScUDDYlu}<6vuyS?{mklT3{(k4~-H*Ni40*@sVLgqEuExYEjUG
z(gFz|5%eJml!$^d5uze|L`9YrsU)Ev%7R4G9!QSGq!W#fuX)_L_nf`=>cctr&UKuJ
z&8MIiZ1z6)Zr1;|*JGap|J#4v1fX_lq+S20xzOczy+E-q2UC~Y*@|r4{fd+R07T`*
zswX#K#A3wo?7I1-)(!?h?*P-5=ayVF=;GCFg%-f|M;}vJsj~a`&8VIejB~864qLm-
zzIoZOt5&aA_*y;}4d|CRR7D^V2*IQD4lr{ugBu4%pH3J(c}m?ai}I1p^;;aOBA}{x
zb*TCtH&0%{<?*0s@2u<ZntuPRr}Fj9dvLzbGC5y>Gy*|Gw;QJ|%}uJIX8--Op169(
zwR3X^8h3H3@E2Y^2yV(V<og5AnF95=kPy0wz|<A?&KjG4@1eO%1`fSwxa@EIir5ti
z>Qiv<BeBt$+GXcfVq|j|vBXI+-(9Cv0R&u#&jFaaELuKf(6E&c&v_>AC1HQ#&Qw?e
zDgk4K=O0-^P|c}^oN6Fw8cEea;$uK~dHwRfBj7_q2q}OyM77K8J68-JJ%7RNi}J_X
z8aR6TV0v>H1p=V#`fUSBKna--hYy|*94<JVi@9yg<L8%x#K(B`s8SOp(T)jYCXbzc
z)BFn#HSgg>+fgtelIp8uwIZ1~0mY-nqw4XJpprf#J$F`@8mOc|Zk{;jnj6Q>$n872
zgVxdsj1fcyQALfUPDL{S%^*AhkD7pzc9e?igzXK$hlIqJ2<n+X_ff7KIxhG1;mwp>
zJ7NTb!5|1qP>6kjIJ6UM0guCLjA}p-L?R3kq6Q;2OIIHNZKcyRw;iD)X`|`%5iT7v
znw+hnwR8dv9`z0{F^P7NP(X~PU<O14F<?Z}YfK$JI8>Do6sM)W0RUoOBz7I_{Q64{
z)&E+&b;_L=w3Lq1*m?*P3C0T6N@Z<~AXX4bYlE!GR6#>J@MJ~Xy_p_<jT@U9KKp#v
z`-N*p%w+6{+U&HcpfMSM6^sQNrBF69*bLIz&OIX1qh7ZFqG(e?^7Qdz$5wr`eSOD>
z{1_%(b_d4V&Qn)IWa1_gOl7VHsJPB`)r`7|m(8_fzkA)So%mSGpPRRDTsvphJ^3jk
z?`3b(X9Sa^xwkO)s^v&l2W3;$sx&AXDk&(xxnfAmrDuR57O;EY^4rGED=paKKiF{F
z^x1=_ja(?-H+@V(dm0S`FTJs{CpTTql2t`E_Y9zca#@*QKJh<{s+GHUgfBKtzG2!W
z)5kxM+jIOA3ZWSQ5lQxKNbV~%aSBMX6UN=FrE1VCfEW}yN5gLSN9!@>1^wpjmX<SD
z-#Vjiz>lZ4b%tI@vQv4=_jKo6J)r7h=)Ma8o1@%B<>5}&bK<}|ZsE^A{`Ae3tsfT0
z51CySS7RxXe!`Vcn~;8|xh`Pkxp#nQU@FSlVJx+uruEx3ZgKsghD{qkdbj9G>7h)H
z0??6-B2elAlT`Vt*jWH|*F9HRUpT5FS`p727lHOY>->w2_022SZG5#ugVxvqbU+27
zysuORQeK~RE1l10xgl+zh_s4L)hrVpv@-_{mk$nZaU)M2rkI7dJbYCYy1fqn$+x^z
piQB5@YEwFM?C9++^uPUE>~HeYjU=^o74QH6002ovPDHLkV1jGcdj$Xh

literal 0
HcmV?d00001

diff --git a/trunk/images/tango/go-last.png b/trunk/images/tango/go-last.png
new file mode 100644
index 0000000000000000000000000000000000000000..48fe95bd3b2f60ba64d4134c94d410c7dadd5af9
GIT binary patch
literal 1342
zcmV-E1;P4>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS000E_Nkl<ZScUDEZEO@p7{`Cl>|U?clB(ERA&6)oLJ%w@qBR;~_y8Kf7f=(0
zM1uH1G-?9`6UD>?BSMUUM2#o`BuXqXh(gn7swhR%Xt5C90~AW2m6qCTuf4sU89(f9
zdmMdB<2RYhWcGGv=Kq`L|IF<iTr2<gB10WmTIO2BE~s9szZj_R^tZ|N5^iU=s0h|t
zs@M7A4i&(4VvH&ryGfQG9<^_c|89SM6P?6!h146*ua6t6F-G&=<}v`(Pyv)uT}z*M
z$1S<@p|?txIa{YLAvTzCl}9!Lwr8H90$59q<2cNJcuDSzsq^OL7PwVYS5VOZ7#r4}
zdqV~QRNACC+E~qllV|2WIep2rTpK%3TE^&p5HQy8pF{va8=s`t#-WRQ8GGA!chRHE
zN5^yWYwv$8c5m<U7K_1V0Q8!KrDd+|?S6JKMw8Yl42DA&_Hz61N%F$nl{apw_^_&U
zS@Xi`_w|k|0F1#HjkTtK0Dx7CKS7%`f*_(01f?95I6a*NeB+_5##+m<#@`uPFpkBu
zS6sKPV*S<!mN$&c+#wc=3HuHRAR^S%e~%I;01$<>rkmb|A8g=jFtOoO^8pI;TUhYO
zD|z4iwE0bz9l9&6^y_G_)}XCFumw?gJJao`P+W;3`rQ(daFPH(hhP!J`PO5!r&@Sy
z`g3_d*6e!vujAE|ttD=(K@ZjfV>M}$LUAR4C_-BRvE7MftU+5%mzTuToiulx=VIGw
zrcIh1kH>Q+)E@o~ZGDXK!<{eyfVMuq_PT|YD8vyQ1e64^5KBrY>Gax2dI^$VJKFa#
zI@s$i$qQWSXkgZa7h@wv+)7uvgSJ#NzVQYIXzOgIDN#?%iQ_sk99Q8O1<In+DSVS6
zWs(@HLnkcafI>jP_yI(I{00E(n~qXkFebEWkQQ`!tpF%ja9jymM-U|_1>%4s3arH%
zL9|7Lz#d>^{&*&joWY)7%2N#&&%~#VopqJYfG;Capd3Ltfw*#mYo!1Qtgu$F#*&ez
zjJx?hMi0A(Z>zpcUT$sLjbaXvGZ+9T^GhHewoxP;L8%}i0jvdM03SpY6N_h%FU6Es
zZtYAY+SatT_#1{7xwCs)U^ajQJ#V$ArmPGSPl1F{5Jey^K?HW6SsSe0KuqOOQaGEg
zgrU50OXok$sin1_>hdvj$fKzD2xkIF2;c&IynS^l`?zAm0E>V%<g9pU6;4dB2J&n^
zQwkrap`pQ6R_*DybXqSw^0nR%#M143Tb=npMfK=Te^hP(`F@HV;}bJJF{_CgL(GQt
z?q}Rx;slml?-WsT(_Cr~*7*DO|9bgc4bPtaS)T|Oq>bPAOD~&D09sDc1sDQ5ax&V?
zYm|bb{4q=zHj^LrR(N%F2hX1T&R_KRaT>`y?wP)iewhF^6ph-b>S!f^pV1dl!o-4E
z?AW!v>(q(*KkK%oUrjdCo;BWzi=mH_2@r{C0xSG*6%l;|=7-PmJ<H~=KJU74u4!k@
zM!gyjFMOU3s}J~Y96cBSGDIW6NHhX-=*bl}Y+BdVaz63FAD`(>8U6gMn$EkWXKT+d
zS=lcDA-N{-Ia;wBibntf(0Hcp<+?4pf-7x{AappFS9}NBOA!BP`|7L22KrwRZOd%&
z?5xhtn<)H!dOuiz?7k5|c5Y-Q@Su)!*Gg3W1x?s%KLh<>cmMzZ07*qoM6N<$f=h^W
AWdHyG

literal 0
HcmV?d00001

diff --git a/trunk/images/tango/go-previous.png b/trunk/images/tango/go-previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..c37bc0414c24b6e4f34096d0c0f20fbe0bf84045
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS000DMNkl<ZScUDDZD`e19LGQBod18j&diD&q$0z#6%iC!v)!p>R-4&_N(%y0
z5>0!N*ydiwAf#TXK|#<H%r`|%$}sRnN|xwF1BnId7G>&u+I8MN-n)D6dFaLezuUdn
zt@c3g_Jtq6Kj+W+{l4e-bPh~m3X{a*Mpa+k;JJzJmy_@<qC32u3+}pqukV#k*vNzk
zJl)9jnkMhS;`>&-_4*5MM?B?En1DCl4OLCdP2wL~vvkw^MfWcAl~faU4&#hKb))y#
zbnn)-H&(y1@ZriOetXwRtkaVsFy;tE8`Sz)GiQIa^~L5g<tsY6PLeTc93a5_e*~J5
z(WJM#a?V3rHq`Bi^kw3l@BSTQHO^UZ4hL#1op5}&7ULoiZDIz4-u{{g>Z+fMZirm!
zX(y4oiggBS4aRAtkTk#c3D#L02J37n1{Z2$4ez$RIW(>a)NGH;cfuTAyKLi}MU_wZ
z9bG3#X8LfroMGz>vA@2>SdFn79cp8<Xq(OH<@dZg>LEuYP}Ar=UgG=Tt*hHHWA>f%
zMBC*b$(nTd*Ws`r92SGc;H1W)aW2rq<g7C|EY6Ldotp?m8~iPI%q-utu6Fx0=|kJ)
zBSEf(KnM^L5C9e{3>F)Z5E>^9<fSJFzXmK0M(o!D0?{V_tBUf<=hv@nj9ltFOK104
z1Og!hQU+Q8LJ*t`OUm?<%=9v(lW3F18i#NS>3kF=VQpA&j5w_d2v}>Yg$IL~1bsu-
z(Ix`~&Xo`W861O|9{MwJ`m@)`*i_I74x9yR9acN6aTx9Jh>+H)v87<{c~fzYv%5at
zzjO1mOJ6Ee(&x;z7^NjX(gQ;pEz%$jQVE0<cv9dH;2hS1FkyxO=OCL+<r7d8&5VLc
z*xHIYwo7mC?MrOk_ru<#Z_3=G6?LTTAOqQMG7KV=MR^kCi9mdT=Zk;Vlt6j{sRUAi
zR0XZ?Q&bBhjba(wW4`XclBxavr+tYlSFh?P7p~{FvRR?gz=854$`>eKqI`+;L&rJi
zLF$6qDTsJM)JJMV3CL3|x^3PPmK?K(TW=(~?p|8;O6hOi2Z^WuMCCbIS<wKFum*xO
z1lnPBSQEw-*bc>xMj(d^M~U}#=vBJDZBI{MqIT6&Ya^XQzjA)?mw<#9)WLfnH2<5K
ze2i%nyO5m&Z0|LOPJC##WjA(i{$ik|Va=-g$nE9jobEq_P$rk-<GXbf(4l1WB$M}T
z^X%tBQVdfh8qlXc*PnKt?%DL^H!TB$ap$Va>zU@?5)7sQNni*_7dh2=V#2i?Mte=T
z5x!mgjJqHe2QR12tca+xvPTv?qe@gMM`K607_;veow%4pHY8WjhNIPh3k}#j(SUdE
zXWc$<iRI27{j94yUbVWmK9U!K;qVqmaG20dm%@L&r-mJyaI*n)GC}HM%(j*;xG}xs
zkM;+XLj&H$nB7@)@^qd|?%7lX5fb+RfAKc;a`+hW!?oOXHH9gR1%CsLV@9Tom>C)X
O0000<MNUMnLSTYFF-HFY

literal 0
HcmV?d00001

diff --git a/trunk/style/default.css b/trunk/style/default.css
index 3630784..14176d3 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -180,6 +180,11 @@ span.videotitle
 	font-size:			1.5em;
 }
 
+table.results
+{
+	display:			inline;
+}
+
 table.videometadata
 {
 	border-width:	0px;
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index 12ecb81..883d8cf 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -8,7 +8,8 @@
 >
 
 <xsl:template name="innerresults">
-	<table class="results" align="center">
+
+	<table class="results">
 		<xsl:for-each select="//results/result">
 			<tr class="result">
 				<td>
@@ -168,12 +169,12 @@
 	<div>
 		<xsl:value-of select="//results/@resultcount" /> results on <xsl:value-of select="//results/@lastpage" /> pages
 	</div>
-	
-	<xsl:call-template name="pagination"/>
-	
+
+	<xsl:call-template name="pagination-numbers"/>	
+	<xsl:call-template name="pagination-arrows"/>
 	<xsl:call-template name="innerresults"/>
-	
-	<xsl:call-template name="pagination"/>
+	<xsl:call-template name="pagination-arrows"/>
+	<xsl:call-template name="pagination-numbers"/>
 	
 	<div>
 		<form method="get">
@@ -293,85 +294,91 @@
 			</fieldset>
 		</form>
 	</div>
-
+	
 </xsl:template>
 
-<xsl:template name="pagination">
+<xsl:template name="pagination-arrows">
 	<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
 	<div>
 		<xsl:choose>
 			<xsl:when test="//results/@currentpage&lt;=1">
-				&lt;&lt; &lt;
+				<img src="./images/placeholder32x32.png" />
+				<img src="./images/placeholder32x32.png" />
 			</xsl:when>
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=1')" />
 					</xsl:attribute>
-					&lt;&lt;
+					<img src="./images/tango/go-first.png" />
 				</a>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
 					</xsl:attribute>
-					&lt;
+					<img src="./images/tango/go-previous.png" />
 				</a>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:if test="//results/@currentpage > 2">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage - 2" />
-			</a>
-		</xsl:if>
-		<xsl:if test="//results/@currentpage > 1">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage - 1" />
-			</a>
-		</xsl:if>
-		<xsl:value-of select="//results/@currentpage" />
-		<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
-		<xsl:if test="$temp > 0">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage + 1" />
-			</a>
-		</xsl:if>
-		<xsl:if test="$temp > 1">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
-				</xsl:attribute>
-				<xsl:value-of select="//results/@currentpage + 2" />
-			</a>
-		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="//results/@lastpage&lt;=//results/@currentpage">
-				&gt; &gt;&gt;
+				<img src="./images/placeholder32x32.png" />
+				<img src="./images/placeholder32x32.png" />
 			</xsl:when>
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
 					</xsl:attribute>
-					&gt;
+					<img src="./images/tango/go-next.png" />
 				</a>
 				<a>
 					<xsl:attribute name="href">
 						<xsl:value-of select="concat($query_string, '&amp;page=', //results/@lastpage)" />
 					</xsl:attribute>
-					&gt;&gt;
+					<img src="./images/tango/go-last.png" />
 				</a>
 			</xsl:otherwise>
 		</xsl:choose>
 	</div>
 </xsl:template>
 
+<xsl:template name="pagination-numbers">
+	<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
+	<xsl:if test="//results/@currentpage > 2">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage - 2" />
+		</a>
+	</xsl:if>
+	<xsl:if test="//results/@currentpage > 1">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage - 1" />
+		</a>
+	</xsl:if>
+	<xsl:value-of select="//results/@currentpage" />
+	<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
+	<xsl:if test="$temp > 0">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage + 1" />
+		</a>
+	</xsl:if>
+	<xsl:if test="$temp > 1">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
+			</xsl:attribute>
+			<xsl:value-of select="//results/@currentpage + 2" />
+		</a>
+	</xsl:if>
+</xsl:template>
+
 </xsl:stylesheet>