From d2fdb385c9bf09d4a5d3b0fdfdc6fa4735f0431e Mon Sep 17 00:00:00 2001
From: Matt <matt@uncensored.citadel.org>
Date: Wed, 4 Feb 2009 02:07:02 +0000
Subject: [PATCH] * Fix online users iconbar hover * Attempt to use new iterate
 code to limit summary view messages - doesn't work yet * Revert fixed table
 change - unbreaks the good guys but breaks IE - will fix

---
 webcit/static/summaryview.js                  | 6 ++----
 webcit/static/t/mailsummary_json.html         | 2 +-
 webcit/static/t/mailsummary_json_section.html | 4 +---
 webcit/static/wclib.js                        | 8 ++++----
 webcit/static/webcit.css                      | 9 ++++++---
 webcit/subst.c                                | 2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 0b0e1e405..cc14e8089 100644
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -177,12 +177,10 @@ function resortAndDisplay(sortMode) {
     try {
       var currentRow = rowArray[x];
       var className = currentRow.className;
-    className = className.replace("table-alt-row","");
-    className = className.replace("table-row","");
     if (((x-1) % 2) == 0) {
-      className += " table-alt-row";
+      className = "table-alt-row";
     } else {
-      className += " table-row";
+      className = "table-row";
     }
     currentRow.className = className;
     /* Using element.onclick is evil, but until IE 
diff --git a/webcit/static/t/mailsummary_json.html b/webcit/static/t/mailsummary_json.html
index d5a4eabf5..3369d4570 100644
--- a/webcit/static/t/mailsummary_json.html
+++ b/webcit/static/t/mailsummary_json.html
@@ -1,5 +1,5 @@
 { "nummsgs": <?READLOOP:TOTALMSGS>,
 "startmsg": <?READLOOP:STARTMSG>,
 "roomname": "<?ROOMNAME>",
-"msgs": [ <?ITERATE("MAIL:SUMM:MSGS","mailsummary_json_section")> ]
+"msgs": [ <?ITERATE("MAIL:SUMM:MSGS","mailsummary_json_section"," ",B"startmsg",B"maxmsgs")> ]
 }
\ No newline at end of file
diff --git a/webcit/static/t/mailsummary_json_section.html b/webcit/static/t/mailsummary_json_section.html
index 7f6e00363..cb03fbceb 100644
--- a/webcit/static/t/mailsummary_json_section.html
+++ b/webcit/static/t/mailsummary_json_section.html
@@ -1,3 +1 @@
-<?!("COND:ROOM:DISPLAYMSG",1)>
-[<?MAIL:SUMM:N>,"<?MAIL:SUMM:SUBJECT("J")>","<?MAIL:SUMM:FROM("J")>",<?MAIL:SUMM:DATENO>,"<?MAIL:SUMM:DATEBRIEF>",<?%("COND:MAIL:SUMM:UNREAD",1, 0, 0, "true","false")> ] <??("COND:MAIL:SUMM:LASTMSG", 2)> , <??("X",2)> 
-<?!("X",1)>
\ No newline at end of file
+[<?MAIL:SUMM:N>,"<?MAIL:SUMM:SUBJECT("J")>","<?MAIL:SUMM:FROM("J")>",<?MAIL:SUMM:DATENO>,"<?MAIL:SUMM:DATEBRIEF>",<?%("COND:MAIL:SUMM:UNREAD",1, 0, 0, "true","false")> ] <??("COND:ITERATE:LASTN", 1)> , <??("X",1)> 
\ No newline at end of file
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 5d530d566..155af4e11 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -212,7 +212,7 @@ function IconBarRoomList() {
     var room = mailboxRooms[i];
     currentDropTargets.push(addRoomToList(mailboxUL, room));
   }
-  if (currentExpanded != null && currentExpanded == "Mailbox") {
+  if (currentExpanded != null && currentExpanded == _mailbox ) {
     expandFloor(mailboxSPAN);
   }
   for(var a=0; a<floors.length; a++) {
@@ -794,9 +794,9 @@ function fixbanner() {
   // Use prototype api methods here
   var elems = [$('room_banner'),$('actiondiv')];
   fixMissingCSSTable(elems);
-  var banner = $('banner'); 
+  /* var banner = $('banner'); 
   if (banner != null) {
-  }
+  } */
 }
 
 function fixOffsetBanner() {
@@ -809,7 +809,7 @@ function fixOffsetBanner() {
     contentDiv.style.width = newContentWidth+"px";
   }
 }
-/** Attempt to stop overflowing in x-axis in IE */
+/** Attempt to stop overflowing in x-axis in IE6 */
 function resizeViewport() {
   var documentWidth = 0;
   var viewportWidth = document.viewport.getWidth();
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 269b4dfda..5d8d65645 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -70,11 +70,14 @@ body {
 	text-transform: uppercase;
 }
 
-.ib_button, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, .iconbar_text {
+.ib_button, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, .iconbar_text{
 	background-color: #F0FFFF;
 	color: #333;
+} 
+#online_users:hover { /* separate in order for override */
+    background-color: #F0FFFF !important;
+	color: #333 !important;
 }
-
 #iconbar #button {
 	border: none;
 	list-style: none;
@@ -1096,7 +1099,7 @@ dt { clear: both; }
 	text-align: center;
 }
 #summary_view table {
-    table-layout: fixed; /* stops long subjects overflowing */
+/*    table-layout: fixed; stops long subjects overflowing */
 }
 #summary_view > table { /* hide from IE6 */
     width: 100%;
diff --git a/webcit/subst.c b/webcit/subst.c
index f60083867..f4fde0edb 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1839,10 +1839,10 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
 	if (HAVE_PARAM(5)) {
 		StopAt = GetTemplateTokenNumber(Target, TP, 5, -1);
 	}
+	it = GetNewHashPos(List, StepWidth);
 	if (StopAt < 0) {
 		StopAt = GetCount(List);
 	}
-	it = GetNewHashPos(List, StepWidth);
 	while (GetNextHashPos(List, it, &Status.KeyLen, &Status.Key, &vContext)) {
 		if ((Status.n >= StartAt) && (Status.n <= StopAt)) {
 			if (DetectGroupChange && Status.n > 0) {
-- 
2.30.2