* 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

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 0b0e1e405e019094800f5173ed627e8427a8ad5e..cc14e80899ccf53e57a59a70e73b6598ced6ad1f 100644 (file)
--- 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 d5a4eabf5617392f8a89e3c1b9c53c01c6f94699..3369d45706c8c40c89f7998e6204bafc22135374 100644 (file)
--- 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 7f6e003630c10f54ee724d772c48d87bc8dcfca3..cb03fbcebd3f0f3317a8f772d4dd81757129ac59 100644 (file)
--- 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 5d530d56681c11c3b4b868ddc504c432d54ffeb4..155af4e1149aa9396107f1f5ca77977682f6453f 100644 (file)
--- 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 269b4dfdacac40825d4c06704c5d8eca0d661a72..5d8d6564550da3f7be61b566367ff6fde6aca6a5 100644 (file)
--- 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 f6008386702124207d2e09fc5c5190750ad22df2..f4fde0edb9787d7c2e8c1d3d1bbc5aeb40ddb043 100644 (file)
--- 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) {