Author: ssthkjer
Date: 2007-07-20 13:08:50 +0200 (Fri, 20 Jul 2007)
New Revision: 5540
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/AccountingDirective.java
Log:
cleanup accountingtable
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/AccountingDirective.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/AccountingDirective.java
2007-07-20 11:01:25 UTC (rev 5539)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/AccountingDirective.java
2007-07-20 11:08:50 UTC (rev 5540)
@@ -100,12 +100,12 @@
if (k==0) {
// #balance0# means print a new table
if (col[0].indexOf("#balanse0#") > -1) {
- html.append("</table><div class=\"lindorff\"></div>");
- html.append("<table id=\"balance\" bgcolor=\"#CCCCCC\"
cellspacing=\"1\">");
+ html.append("</table>");
+ html.append("<table class=\"balance\"
cellspacing=\"1\">");
bgcolor = false;
} else if (col[0].indexOf("#lederlonn0#") > -1) {
html.append("</table>* Alle tall i hele 1000 kroner.");
- html.append("<table id=\"balance\" bgcolor=\"#CCCCCC\"
cellspacing=\"1\">");
+ html.append("<table class=\"balance\"
cellspacing=\"1\">");
bgcolor = false;
// #balance1# means don't show rest of the numbers
} else if (col[0].indexOf("#balanse1#") > -1) {
@@ -115,18 +115,26 @@
// checks if the row should be bold
if (col[0].indexOf("#bold#") == -1) {
text = col[0];
- html.append("<tr>");
+ if (!bgcolor) {
+ html.append("<tr class=\"bg1\">");
+ } else {
+ html.append("<tr class=\"bg2\">");
+ }
} else {
- html.append("<tr class=\"bold_line\">");
+ if (!bgcolor) {
+ html.append("<tr class=\"bold_line bg1\">");
+ } else {
+ html.append("<tr class=\"bold_line bg2\">");
+ }
text = col[0].substring(col[0].indexOf("#bold#")+6);
}
} else
text = col[k];
- if (!bgcolor) {
- html.append("<td class=\"col"+ (k+1) + "\"
bgcolor=\"#FFFFFF\">" + text.trim() + "</td>");
+ if (!bgcolor) {
+ html.append("<td class=\"col"+ (k+1) + "\">" + text.trim()
+ "</td>");
} else {
- html.append("<td class=\"col"+ (k+1) + "\"
style=\"background-color: #EBEBEB;\">"
+ html.append("<td class=\"col"+ (k+1) + "\">"
+ text.trim() + "</td>");
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
