Author: ssthkjer
Date: 2007-07-23 12:41:34 +0200 (Mon, 23 Jul 2007)
New Revision: 5542
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/RolesDirective.java
Log:
removed inline css and cleanup
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-23 10:26:35 UTC (rev 5541)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/AccountingDirective.java
2007-07-23 10:41:34 UTC (rev 5542)
@@ -74,7 +74,7 @@
// The text string from datafield which all the accountingsnumber is
stored
final String s = getArgument(context, node, 0);
- final StringBuilder html = new StringBuilder("<table
bgcolor=\"#CCCCCC\" cellspacing=\"1\">");
+ final StringBuilder html = new StringBuilder("<table
cellspacing=\"1\">");
// New line seperator
final String[] row = s.split("#sepnl#");
@@ -131,12 +131,7 @@
} else
text = col[k];
- if (!bgcolor) {
- html.append("<td class=\"col"+ (k+1) + "\">" + text.trim()
+ "</td>");
- } else {
- html.append("<td class=\"col"+ (k+1) + "\">"
- + text.trim() + "</td>");
- }
+ html.append("<td class=\"col"+ (k+1) + "\">" + text.trim() +
"</td>");
}
if (!quitLoop) {
bgcolor = !bgcolor;
@@ -145,11 +140,10 @@
break;
}
html.append("</table>");
- html.append("<div class=\"lindorff\">");
- html.append("* Regnskapet viser kun hovedtall, og er levert av
Lindorff Decision.</div>");
- html.append("<div style=\"clear:both; padding-top:4px;\">");
+ html.append("<div id=\"lindorff\">");
+ html.append("* Regnskapet viser kun hovedtall, og er levert av
Lindorff Decision.</div>");
html.append("<a href=\"" + lpUrl + "\" target=\"_blank\">");
- html.append("<img src=\"/images/lindorff_logo.gif\" alt=\"Linforff
logo\" /></a></div>");
+ html.append("<img src=\"/images/lindorff_logo.gif\" width=\"81\"
height=\"31\" alt=\"Linforff logo\" /></a>");
writer.write(html.toString());
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/RolesDirective.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/RolesDirective.java
2007-07-23 10:26:35 UTC (rev 5541)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/RolesDirective.java
2007-07-23 10:41:34 UTC (rev 5542)
@@ -96,18 +96,22 @@
final MD5Generator md5 = new MD5Generator("S3SAM rockz");
final StringBuilder html
- = new StringBuilder("<div><table class=\"roletable\"
bgcolor=\"#CCCCCC\" cellspacing=\"1\">");
+ = new StringBuilder("<div><table class=\"roletable\"
cellspacing=\"1\">");
// print rows
for (int i = 0; i < row.length; i++) {
+ if (!bgcolor) {
+ html.append("<tr class=\"bg1\">");
+ } else {
+ html.append("<tr class=\"bg2\">");
+ }
+
- html.append("<tr>");
-
// show 30 first rows
if (i == LAST_ROW) {
html.append("</tr></table></div><div id=\"more_roles\"
style=\"display: none;\">");
- html.append("<table class=\"roletable\" bgcolor=\"#CCCCCC\"
cellspacing=\"1\">");
+ html.append("<table class=\"roletable\" cellspacing=\"1\">");
}
// column seperator
@@ -156,13 +160,8 @@
}else{
text = col[k].trim();
}
- if (!bgcolor) {
- html.append("<td class=\"col" + (k + 1) + "\"
style=\"background-color: #FFF;\">"
- + 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>");
- }
}
bgcolor = !bgcolor;
html.append("</tr>");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
