From: Art Cancro <ajc@citadel.org>
Date: Tue, 13 Oct 2009 02:51:50 +0000 (+0000)
Subject: * Shuffled around the room banner so that the room name once again appeared in its... 
X-Git-Tag: v7.86~765
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=92ee639d1ba1eaa732659b5cf07c93d77832c34f

* Shuffled around the room banner so that the room name once again appeared in its own element, because getMessages() in jsonmessageview looks there for the room name.  This should eventually be handled differently but it's ok for now.
---

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 96e0211f3..ed77d2a72 100644
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -1,18 +1,19 @@
-/**
+/*
  * Webcit Summary View v2
- *   All comments, flowers and death threats to Mathew McBride
- *   <matt@mcbridematt.dhs.org> / <matt@comalies>
+ * All comments, flowers and death threats to Mathew McBride
+ * <matt@mcbridematt.dhs.org> / <matt@comalies>
  * Copyright 2009 The Citadel Team
  * Licensed under the GPL V3
+ *
+ * QA reminders: because I keep forgetting / get cursed.
+ * After changing anything in here, make sure that you still can:
+ * 1. Resort messages in both normal and paged view.
+ * 2. Select a range with shift-click 
+ * 3. Select messages with ctrl-click
+ * 4. Normal click will deselect everything done above
+ * 5. Move messages, and they will disappear
  */
-/* QA reminders: because I keep forgetting / get cursed.
-Can you:
-1. Resort messages in both normal and paged view.
-mv 2. Select a range with shift-click 
-3. Select messages with ctrl-click
-4. Normal click will deselect everything done above
-5. Move messages, and they will disappear
-*/
+
 document.observe("dom:loaded", createMessageView);
 
 var msgs = null;
@@ -50,12 +51,12 @@ trTemplate[14] = "</td></tr>";
 
 var currentPage = 0;
 var sortModes = {
-  "rdate" : sortRowsByDateDescending,
-  "date" : sortRowsByDateAscending,
-  "subj" : sortRowsBySubjectAscending,
-  "rsubj" : sortRowsBySubjectDescending,
-  "sender": sortRowsByFromAscending,
-  "rsender" : sortRowsByFromDescending
+	"rdate" : sortRowsByDateDescending,
+	"date" : sortRowsByDateAscending,
+	"subj" : sortRowsBySubjectAscending,
+	"rsubj" : sortRowsBySubjectDescending,
+	"sender": sortRowsByFromAscending,
+	"rsender" : sortRowsByFromDescending
 };
 var toggles = {};
 
@@ -88,37 +89,39 @@ function createMessageView() {
   takeOverSearchOMatic();
   setupDragDrop(); // here for now
 }
+
 function getMessages() {
-  if (loadingMsg.parentNode == null) {
-    message_view.innerHTML = "";
-    message_view.appendChild(loadingMsg);
-  }
-roomName = getTextContent(document.getElementById("rmname"));
- var parameters = {'room':roomName, 'startmsg': startmsg, 'stopmsg': -1};
- if (is_safe_mode) {
-   parameters['stopmsg'] = parseInt(startmsg)+499;
-   //parameters['maxmsgs'] = 500;
-   if (currentSortMode != null) {
-     var SortBy = currentSortMode[0];
-     if (SortBy.charAt(0) == 'r') {
-       SortBy = SortBy.substr(1);
-       parameters["SortOrder"] = "0";
-     }
-     parameters["SortBy"] = SortBy;
-   }
- } 
- if (query.length > 0) {
-   parameters["query"] = query;
- }
-new Ajax.Request("roommsgs", {
-    method: 'get',
-	onSuccess: loadMessages,
-	parameters: parameters,
-	sanitize: false,
-      evalJSON: false,
-      onFailure: function(e) { alert("Failure: " + e);}
+	if (loadingMsg.parentNode == null) {
+		message_view.innerHTML = "";
+		message_view.appendChild(loadingMsg);
+	}
+	roomName = getTextContent(document.getElementById("rmname"));
+	var parameters = {'room':roomName, 'startmsg': startmsg, 'stopmsg': -1};
+	if (is_safe_mode) {
+		parameters['stopmsg'] = parseInt(startmsg)+499;
+		//parameters['maxmsgs'] = 500;
+		if (currentSortMode != null) {
+			var SortBy = currentSortMode[0];
+			if (SortBy.charAt(0) == 'r') {
+				SortBy = SortBy.substr(1);
+				parameters["SortOrder"] = "0";
+			}
+			parameters["SortBy"] = SortBy;
+		}
+	} 
+	if (query.length > 0) {
+		parameters["query"] = query;
+	}
+	new Ajax.Request("roommsgs", {
+		method: 'get',
+		onSuccess: loadMessages,
+		parameters: parameters,
+		sanitize: false,
+		evalJSON: false,
+		onFailure: function(e) { alert("Failure: " + e);}
 	});
 }
+
 function evalJSON(data) {
   var jsonData = null;
   if (typeof(JSON) === 'object' && typeof(JSON.parse) === 'function') {
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 217938af9..a4ade026a 100644
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -2,13 +2,14 @@
 <div>
 <div class="room_banner" id="room_banner" >
 <?ROOMPIC>
-<h1 id="rmname"><?ROOMNAME>
- <?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")>
- : <?BSTR("page")>
- <?!("X", 7)>
-</h1>
+<h1 id="rmname"><?ROOMNAME></h1>
+<?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")>
+<h2><?BSTR("page")></h2>
+<?!("X", 7)>
 <?ROOMINFO>
+<??("COND:ROOM:TYPE_IS", 8, "VIEW_WIKI")>
 <p id="nummsgs"><?NUMMSGS></p>
+<?!("X", 8)>
 </div>
 <div id="actiondiv">
 <ul class="room_actions">