From d5824ac9c5da8cd6cad8440740d89f6a05f1769f Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 9 Jun 2010 21:02:40 +0000
Subject: [PATCH] * Merged the 'banner' and 'room_banner' classes.  There is no
 reason for them to be separate.

---
 webcit/static/t/knrooms.html      |  2 +-
 webcit/static/t/newstartpage.html |  2 +-
 webcit/static/t/roombanner.html   |  2 +-
 webcit/static/t/roombanner.m.html |  2 +-
 webcit/static/t/who.html          |  2 +-
 webcit/static/webcit.css          | 12 ++++++------
 webcit/summary.c                  |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index 02d6661c0..ae96574e4 100644
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -1,7 +1,7 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <div id="banner">
-<div class="room_banner" id="room_banner">
+<div class="banner" id="room_banner">
 <h1><?%("COND:PREF", 1, "roomlistview", "rooms", _("Room list"), "")><?%("COND:PREF", 1, "roomlistview", "folders", _("Folder list"), "")><?%("COND:PREF", 1, "roomlistview", "table", _("Room list"), "")></h1>
 </div>
 
diff --git a/webcit/static/t/newstartpage.html b/webcit/static/t/newstartpage.html
index 15ba39218..3c7c082a6 100644
--- a/webcit/static/t/newstartpage.html
+++ b/webcit/static/t/newstartpage.html
@@ -1,5 +1,5 @@
 <! newstartpage.html start>
-<div class="room_banner" >
+<div class="banner" >
 <div align=center >
 <h1><?_("New start page")></h1>
 &nbsp;
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 6373fbc8e..3171d2a22 100644
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -1,6 +1,6 @@
 <!-- start roombanner.html -->
 <div>
-<div class="room_banner" id="room_banner" >
+<div class="banner" id="room_banner" >
 <?ROOMPIC>
 <h1 id="rmname"><?ROOMNAME></h1>
 <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")>
diff --git a/webcit/static/t/roombanner.m.html b/webcit/static/t/roombanner.m.html
index a026fa08c..3afa12d69 100644
--- a/webcit/static/t/roombanner.m.html
+++ b/webcit/static/t/roombanner.m.html
@@ -1,5 +1,5 @@
 <!-- start roombanner.html -->
-<div class="room_banner" >
+<div class="banner" >
 <h1 class="roomname"><?ROOMPIC> <?ROOMNAME></h1>
 <p><?ROOMINFO> <?NUMMSGS></p>
 <p><?START> <?SEARCHOMATIC></p>
diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 6aab4c59b..5ee28c6a9 100644
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -8,7 +8,7 @@ return confirm('<?_("Do you really want to kill this session?")>');
 </script>
 
 <div id="banner">
-<div class="room_banner">
+<div class="banner">
 <img src="static/usermanag_48x.gif">
 <h1>
 <?_("Users currently on ")><?SERV:HUMANNODE>
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index e342dfc4f..a8df068eb 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -19,7 +19,7 @@ body { font-size: 100%;}
 	font-size: 130%;
 }
 
-#button, #content .msgbuttons a, .button_link a, input#delbutton,.attachfile,.logbuttons input,.buttons input, .buttons a, .customize, .menubar_link, .roomlist_floor, .ib_roomlist_floor, .roomlist_new, .ib_roomlist_new, .roomlist_old, .ib_roomlist_old, #banner ul.room_actions li, .selector_top, .selector_bottom, .room_banner .infos,.room_banner .nummsgs,li.search,li.view, .room_actions form select option, .selectbox, .message_header, ul.adminitems li span, #message_list tr > td {
+#button, #content .msgbuttons a, .button_link a, input#delbutton,.attachfile,.logbuttons input,.buttons input, .buttons a, .customize, .menubar_link, .roomlist_floor, .ib_roomlist_floor, .roomlist_new, .ib_roomlist_new, .roomlist_old, .ib_roomlist_old, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,.banner .nummsgs,li.search,li.view, .room_actions form select option, .selectbox, .message_header, ul.adminitems li span, #message_list tr > td {
 	font-size: 100%;
 }
 
@@ -63,7 +63,7 @@ body {
 	background-color: transparent;
 }
 
-.room_banner .infos {
+.banner .infos {
 	cursor: help;
 }
 
@@ -126,7 +126,7 @@ body {
 	border-top: 1px solid #AAA;
 }
 
-#banner h1,#banner h2,.room_banner .nummsgs,.mimepart div,.required {
+#banner h1,#banner h2,.banner .nummsgs,.mimepart div,.required {
 	font-weight: 700;
 }
 
@@ -856,17 +856,17 @@ body, #global {
 }
 
 /* Banner */
-#banner .room_banner {
+#banner .banner {
 	display: table-cell;
 	width: 90%;
 }
 
-#banner .room_banner img {
+#banner .banner img {
  	float: left;
 	margin: 0 5px 15px 0;
 }
 
-#banner h1, #banner h2, #banner .room_banner .infos, #banner .room_banner p {
+#banner h1, #banner h2, #banner .banner .infos, #banner .banner p {
 	margin: 2px;
  	padding: 0;
 }
diff --git a/webcit/summary.c b/webcit/summary.c
index 240485070..8266714b2 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -285,7 +285,7 @@ void summary(void) {
 
 	output_headers(1, 1, 2, 0, 0, 0);
 	wc_printf("<div id=\"banner\">\n");
-	wc_printf("<div class=\"room_banner\">");
+	wc_printf("<div class=\"banner\">");
         wc_printf("<img src=\"static/summscreen_48x.gif\">");
         wc_printf("<h1>");
         snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
-- 
2.30.2