From de65acaa48cb6b47f6475239ed2a5794db03ee33 Mon Sep 17 00:00:00 2001 From: "ccooper%deadsquid.com" Date: Mon, 13 Feb 2006 23:10:42 +0000 Subject: [PATCH] b=321120 - mark completed testcases with a checkmark, and shade the background in the same manner as the testgroup/subgroup selection page. - change is_completed to return a list of results (if they exist) Misc. - some CSS standarization --- webtools/litmus/Litmus/DB/Test.pm | 2 +- webtools/litmus/css/litmus.css | 114 +++++++++++------- webtools/litmus/images/confirm.png | Bin 2135 -> 1409 bytes .../en/default/runtests/testdisplay.html.tmpl | 6 +- .../en/default/sidebar/widget_testcases.tmpl | 4 +- 5 files changed, 78 insertions(+), 48 deletions(-) diff --git a/webtools/litmus/Litmus/DB/Test.pm b/webtools/litmus/Litmus/DB/Test.pm index 90b864d20f3..210e88de675 100755 --- a/webtools/litmus/Litmus/DB/Test.pm +++ b/webtools/litmus/Litmus/DB/Test.pm @@ -117,7 +117,7 @@ sub is_completed { # ); } - return scalar @results; + return @results; } ######################################################################### diff --git a/webtools/litmus/css/litmus.css b/webtools/litmus/css/litmus.css index 64595cd4b4f..fc7f34dd91e 100755 --- a/webtools/litmus/css/litmus.css +++ b/webtools/litmus/css/litmus.css @@ -2,8 +2,8 @@ body { margin: 0 30px 2em 30px; - color: #333; - background: #fff url("images/body_back.gif") repeat-x; + color: #333333; + background: #ffffff url("images/body_back.gif") repeat-x; font-size: 65%; } @@ -35,7 +35,7 @@ h1.firstHeading, h1.errorHeading { } h1.errorHeading { - color: #F00; + color: #FF0000; } select { @@ -89,7 +89,7 @@ a:active { position: relative; margin: 0 0 10px 0; height: 60px; - border: solid #BBB 1px; + border: solid #bbbbbb 1px; } #header h1 { @@ -213,7 +213,7 @@ a:active { font-family: verdana, arial, sans-serif; text-decoration: none; font-weight: bold; - color: #fff; + color: #ffffff; height: 2em; line-height: 2em; background-image: url("images/tab-left.gif"); @@ -245,7 +245,7 @@ a:active { #navigation #personal a { font-family: tahoma, arial, sans-serif; font-weight: bold; - color: #fff; + color: #ffffff; display: block; text-decoration: none; margin: 0; @@ -293,8 +293,8 @@ a:active { #sidebar hr { width: 60%; - color: #BBBBBB; - background-color: #BBBBBB; + color: #bbbbbb; + background-color: #bbbbbb; height: 1px; border: 0; } @@ -359,7 +359,7 @@ div.pagetools ul { } #breadcrumbs a, #breadcrumbs span { - color: #888; + color: #888888; text-decoration: none; background-image: url("images/breadcrumbs.gif"); background-repeat: no-repeat; @@ -406,7 +406,7 @@ table.section { .run-tests { border: solid #666666 1px; - background: #ffffff; + background-color: #ffffff; margin-bottom: 10px; } @@ -415,9 +415,9 @@ table.section { } .comments { - border: solid #BBB 1px; - background: #DDD; - color: #000; + border: solid #bbbbbb 1px; + background-color: #dddddd; + color: #000000; } .test-results td, .single-result td, .comments td { @@ -427,7 +427,7 @@ table.section { } .single-result td { - border: solid #BBB 1px; + border: solid #bbbbbb 1px; } .run-tests tr { @@ -440,13 +440,13 @@ table.section { } .test-results td, .run-tests td { - border: solid #BBB 1px; + border: solid #bbbbbb 1px; } td.header, th { vertical-align: middle; - background: #DDD; - border: solid #BBB 1px; + background: #dddddd; + border: solid #bbbbbb 1px; font-weight: bold; text-transform: lowercase; text-align: center; @@ -455,8 +455,8 @@ td.header, th { } .run-tests td.header { - background: #DDD; - border: solid #BBB 1px; + background: #dddddd; + border: solid #bbbbbb 1px; font-weight: bold; font-size: 1.05em; text-transform: lowercase; @@ -466,12 +466,12 @@ td.header, th { .no-results { background: inherit; - color: #F00; + color: #ff0000; text-align: center; } .radio-testresults { - border: solid #BBB 1px; + border: solid #bbbbbb 1px; border-collapse: collapse; padding: 3px 5px 3px 5px; margin: 5px; @@ -484,19 +484,19 @@ td.header, th { } .testresults-submitted td { - border: solid #BBB 1px; + border: solid #bbbbbb 1px; padding: 3px; padding-left: 10px; padding-right: 10px; } table.radio-testresults tr { - border: solid #BBB 1px; + border: solid #bbbbbb 1px; padding: 3px 5px 3px 5px; } .pass { - background: #9F9; + background: #99ff99; } .pass a:hover { @@ -504,7 +504,7 @@ table.radio-testresults tr { } .fail { - background: #F99; + background: #ff9999; } .fail a:hover { @@ -512,7 +512,7 @@ table.radio-testresults tr { } .unclear { - background: #FF9; + background: #ffff99; } .unclear a:hover { @@ -520,8 +520,8 @@ table.radio-testresults tr { } .test-results tr.search { - background: #DDD; - border: solid #BBB 1px; + background: #dddddd; + border: solid #bbbbbb 1px; font-size: 1em; text-align: center; padding: 0px 5px 0px 5px; @@ -548,7 +548,7 @@ table.radio-testresults tr { .legend td { vertical-align: top; padding: 3px 5px 3px 5px; - border: solid #BBB 1px; + border: solid #bbbbbb 1px; text-align: center; } @@ -586,7 +586,7 @@ div.sec_head { } div.testcase-head { - background-color: #cccccc; + background-color: inherit; padding: 0px; font-weight: bold; } @@ -602,9 +602,20 @@ div.sec_head td.l, div.testcase-head td.l { color: #666666; } -div.sec_head td.r, div.testcase-head td.r { +div.testcase-head td.l { + color: #333333; +} + +div.sec_head td.r { text-align: right; vertical-align: middle; + color: #666666; +} + +div.testcase-head td.r { + text-align: right; + vertical-align: middle; + color: #333333; } div.nav { @@ -741,15 +752,15 @@ p.comment { /* 13 Authentication and login **************************************** */ div.loginbox { - background: #DDD; - border: solid #BBB 1px; + background: #dddddd; + border: solid #bbbbbb 1px; padding: 5px; font-size: 120%; } div.login_form { background-color: #efefef; - border: solid #BBB 1px; + border: solid #bbbbbb 1px; padding: 10px; width: 45%; height: 150px; @@ -761,13 +772,13 @@ div.login_form { } .login_important { - color: #F00; + color: #ff0000; font-size: 120%; } .login_forhelp { - border: solid #BBB 1px; - color: #000; + border: solid #bbbbbb 1px; + color: #000000; font-weight: bold; font-size: 120%; position: relative; @@ -816,6 +827,7 @@ div.login_form { background: url(../images/warning.png) 7px center no-repeat; background-color: #EF9398; border: 1px solid #DC5757; + color: #000000; } #message div.confirmation, @@ -824,6 +836,7 @@ div.login_form { background: url(../images/confirm.png) 7px center no-repeat; background-color: #A6EF7B; border: 1px solid #76C83F; + color: #000000; } @@ -832,6 +845,7 @@ div.login_form { background: url(../images/loading.gif) 7px center no-repeat; background-color: #EBEBEB; border: 1px solid #CCCCCC; + color: #000000; } /* Misc ************************************************************** */ @@ -846,8 +860,8 @@ legend { } div.error { - background: #DDD; - border: solid #BBB 1px; + background-color: #dddddd; + border: solid #bbbbbb 1px; padding: 5px; } @@ -871,11 +885,11 @@ div.error { } .legend { - border: solid #666 1px; + border: solid #666666 1px; border-collapse: collapse; width: 100%; margin-bottom: 10px; - background: #FFF; + background: #ffffff; } textarea { @@ -938,17 +952,31 @@ ol { background-color: #666666; } -div.section-full, div.category, div.section, div.testcase { +div.section-full, div.category, div.section { padding: 10px; margin-bottom: 5px; border: solid #bbbbbb 1px; background-color: #dddddd; + color: #000000; overflow: auto; } div.testcase { + padding: 10px; + margin-bottom: 5px; + border: solid #bbbbbb 1px; background-color: #cccccc; overflow: auto; + color: #333333; +} + +div.testcase-completed { + padding: 10px; + margin-bottom: 5px; + border: solid #bbbbbb 1px; + background-color: #999999; + overflow: auto; + color: #333333; } div.section-full, div.category { @@ -980,7 +1008,7 @@ div.category h2 { div.category h3 { margin: 5px 0px 5px 0px; - color: #363636; + color: #333333; font-size: 0.9em; line-height: 0.9em; } diff --git a/webtools/litmus/images/confirm.png b/webtools/litmus/images/confirm.png index 27265f8a62d62d916abe1c4934e4ec9009033e34..2193d547e5d5d461b2e7f1f56daadf8d5b09e43f 100644 GIT binary patch literal 1409 zcmV-{1%CR8P)QL9Hg(L?6_sM5Do|iSnR9U-S(Xjh93djWI@JR7?alK6puriNQ-^ zqVk|rszr;`0!wSVy>7SL*`1x8otg9b(Cxw&&~Nh3c{nrw-#6!+`Myyi!iA!%xAO+z zA)p6nUp768=11-8H;&yKACQZg0BZSMS8wM!;6QVAQ_pQ3x3jfj3mx?xhzNoPG;u4= z;M{QzjeNsQHhI`f`MU-m8HryAR0ink?c5PHBL{YFyf1cJ$1V62u(gG)Ei@Vf5Hw*G zrCLP^sSsbE`Ie7Pd}_%;@bJK{Ghc{^z968hw{u5zMfBi{*FMAA+BQ;pinLBHn#yAC z0E)BEM~ymaR6S#v1h4kJ$^2yIzQIREJ`<6k4A9lvxvs7vI`GUjPsLj6Rx{|r4R^#^YF9Gu{Y_3= zh0P)I=P^Zsmom-r>PbyJ@T0$b2@*yq@CvwU^UW7wcZX zx1}2h0hquOH??oa(H6;Ia&Z}!mgAgd(ONU`&k#Kg_i}UFj?z8^fs2?vmQE2e47%4| z&U7-p8~8;j6_`NJhD+L5&`ARE5HwnZ5D+NAKqDfY8c&>O{`#>OaLiNGMw;=&C9Bi4 z#~KMmjBX$b9qM@b+Oj?03po|Ko@W?N&xu0itTJii9?{U|v$2mDMf#cfDrVQ?0|3Jz7wPVlW zR1Xu5893sUWRoW&_R?)8pbP*{9DMP}+8M5Ex)p$p^_#iB?J2(dv!6$|JY6zBJo!Bn z=20Rs6IZ$9&$$ZX;E7ZAB^#ay1)awyk2ZXM`sYw-a%25wUb^}NR#&e9Ame5DWc)Q& zHdQ0aMN7FnaVabZ0Hb4>1SSTBNRFBC?;INKErTq@JI7yPO=|_H#bdi%h{tqh9()pK z0h%9&Q*msa#wJZ;OPJotw-{bHQI^T@!U=}F@6o1zL32-B6h0H_G-3xw03Q&;2;{)8 zW2bS&rc#9ni~^0V0dN2Iav5OXiC0+FTv<90%Vppbh{s=vS>})C_5&^;M*q&!KV%&D z@So%3n1IGdDt%^+0s51D0Q4vOm^22EN*|xXc~TTG&GSlYM+S`XMVA586;`h5O0U;)|l8ctb@Q_27$>-V;F*IZh)I}|axi?!u!_$0&*j?5p;?JsVq zQ#8+Cv}G=XsA4@27pr2pSX;_5i$~Eej=}#n{fmGMKoxavNKyK~ep~(pXNN7-=P54G P00000NkvXXu0mjfc?y$% literal 2135 zcmV-d2&ngoP)+a;RozIqW#;Z zrcWbeCO`n;wb(m%uKTz5PiHf;u*m9}STh(I>M{Id=3;pH@gKuqs5WMx{o?#g3`~E& zF`PSpiQ&?jqYQul{CUjAFP*Y;YVs~zW&;EePK&*AW;A?x^QhX$&X2{?!ieF@owc(;prY`L=CS((AFQ2M8dn7JFt+oA&$H zj|~6FM8@BYoD7F={AKw0o47>C&dSJOtHI2``u{t_#%1&Wv$Au{+&(=k6I~rZ0AX0{ zl{+W(`-c}Z!c+5^o_=6sID7vOG!4PEV6hHj2C`AciYyG$0>2nm&Yt*>Q$Rd@+vL~f4^tgwz&7F zkgSgKroOnRF!cZdgp!@Ue}1=8M#F+#SX6{z>xI7zj4X@{OvtXp<6$dhCWa6rh;g5P z{AXy`@|)r0{r?PJ`oat{8dmIYp5I#zl(K_q0SF+txjqGpq`$p;Y+>)}%5du5e}@16 zfUX5XMn))Rf?`HY%*oEgkZQxipd!i$#wUOl{{73u@E2&tX&~Fy#hKyzhi8_)`SV0! z_5lPC+~U8#ztxGzX)yn0@N+>oHS_ToRo z_Ur$_`ayCpKQl7?Vd7#CkyU5;^Xq35%szksf(P}lZy%kMv}_rkyk`WL4U90%gos~Q znSmVI;(QDY{<=)CvV@^~`&WinZ+?Rl+V9_g!45uoorQr{Ooie8r6W!-eEFkF513mC-z8UFnH z2X;A#{p|f;1|bn?hM(U*OTz2}2q3tR|NZ{KDIh4w@D1o=kS{^LWoAJnD6nrCLF)c7 zeEIU5;oJ9L3>LsFW1$2w;`Qf$4D*lu1Uixl>?lTH(e@vt9%%m$U>U$GAk6Up&rdFx zeE1hTp(2Vg?rfff1DK%loH^h@ zK4H&KhCjdr#lj2<^8a9mf`T3t=70VI3l7s;LxY9oFU&rG0D@c0!p8aI!~6FPT&$1;1(MkRfPvxYeMphO z&Bn-3DyB=7%bV3>C3H_$>R2nJft1abfq#DO4-dDxj5KE8hkbTr2| zn0){N1h<%tgXiUor;iwf`GIi@vKVOYmruVL`u6-{c<~8hxw<$LLxKe>Ly9FU11H2@ zhSeATFueQ02(b`k5ip)W4q%4*9uz_Xz^wM>VWF5c%b`v3w6ZZS8H(B5ZvuQ7=6 z0DTOy^z$EvU%&n{`~*g5&%QsvR0>fSq{qx)uL9Bb@cn;=t=IlTECK~FE64$iV4t$E zz8q1`cikcr^(SKyZtJt%$}CPj3AE|K|q-3o!rv`Uy;Aph5s>;2mH} zUw#g=I-GavA26W-Ed!r zMMusf*H7GP;~@fo5*IdJzs!=1Mb;NS#du#chYLHa-z zgW_3Hl!@Wi*}V+BLb6A;Oo)F5(+?0pOemE(k6_rd%g25In=uUXBB1=t2+khhq7i8D z%#;5aKK@`}`1*^1VbxVgh%mE33Ku43NNxbBXM`3w^1_S^-#&d{_;CODPcA;;C}g_; z0tll%4k((R{Neq}nWh2x%wPYpGraueE=yb3bnAF#mq z3ycjA2IX53ZeY4${K;@`)5O1gf@0~L`jh4&+XE0lSX&^z1v94t^IfK~cPisQCSaxU zl>uC6fC>d>SQ!rV+5f)~OF`|ge_+cYj*$Q+PzGRHxww7ye@-^`>6<5|XQSHz5I{KF zT!BS%Yd^hvQmmMLy z2NjRMzA-$#dzInQ<--h&zkfdA6_(Ci-5Iw9m)QUTgkdowBO^N~cY(?jAO;l^tWJ@Y z$v{;}zkhs{WaklL=HeFx20IftnEwN7fp4E)G5q-Y{x2Il*K?rYg8eHy=YtA0P^AZ| zae??J&>ob=K0p9rvzQxHo&YhZCgB8P4wyqYxOlm=EWF)0x%u@N82__C+E|Q#eti9S z>Dq~{JAZup{0(Li5dVN$4iftcwC5|bJpcj3I8c2jfB<4*7$5);U;tYw!yWp>&+`BP N002ovPDHLkV1m;}_^$u} diff --git a/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl b/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl index 022758e8cac..f8975a0455c 100755 --- a/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl +++ b/webtools/litmus/templates/en/default/runtests/testdisplay.html.tmpl @@ -119,12 +119,14 @@ -