Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.1054
diff -u -r1.1054 weblib.php
--- lib/weblib.php	4 Apr 2008 02:54:32 -0000	1.1054
+++ lib/weblib.php	8 Apr 2008 13:49:04 -0000
@@ -3863,10 +3863,10 @@
  * @param string $icon Image to display if needed
  */
 function print_heading_with_help($text, $helppage, $module='moodle', $icon='', $return=false) {
-    $output = '';
-    $output .= '<h2 class="main help">'.$icon.stripslashes_safe($text);
+    $output = '<div class="heading-with-help">';
+    $output .= '<h2 class="main help">'.$icon.stripslashes_safe($text).'</h2>';
     $output .= helpbutton($helppage, $text, $module, true, false, '', true);
-    $output .= '</h2>';
+    $output .= '</div>';
 
     if ($return) {
         return $output;
Index: theme/standard/styles_layout.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
retrieving revision 1.570
diff -u -r1.570 styles_layout.css
--- theme/standard/styles_layout.css	24 Mar 2008 20:24:57 -0000	1.570
+++ theme/standard/styles_layout.css	8 Apr 2008 13:49:05 -0000
@@ -392,6 +392,16 @@
   vertical-align: top;
 }
 
+.heading-with-help {
+  text-align:center;
+  margin:0.83em 0;
+}
+
+.heading-with-help h2 {
+  margin:0;
+  display:inline;
+}
+
 .helplink img {
   vertical-align: middle;
   margin: 0 2px;
Index: theme/standard/styles_fonts.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_fonts.css,v
retrieving revision 1.158
diff -u -r1.158 styles_fonts.css
--- theme/standard/styles_fonts.css	18 Mar 2008 18:58:29 -0000	1.158
+++ theme/standard/styles_fonts.css	8 Apr 2008 13:49:04 -0000
@@ -123,6 +123,14 @@
   font-weight:bold;
 }
 
+.heading-with-help {
+  font-size:1.4em;
+}
+
+.heading-with-help h2.main {
+  font-size:1em;
+}
+
 .helplink {
   font-size:0.8em;
 }
Index: theme/formal_white/fw_fonts.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_fonts.css,v
retrieving revision 1.10
diff -u -r1.10 fw_fonts.css
--- theme/formal_white/fw_fonts.css	10 Mar 2008 16:27:37 -0000	1.10
+++ theme/formal_white/fw_fonts.css	8 Apr 2008 13:49:04 -0000
@@ -41,9 +41,12 @@
     font-weight: bold;
 }
 
-h2 {
+h2, .heading-with-help {
     font-size:1.15em;
 }
+.heading-with-help h2 {
+    font-size:1.0em;
+}
 h3 {
     font-size:1.1em;
 }
Index: theme/formal_white/fw_color.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v
retrieving revision 1.23
diff -u -r1.23 fw_color.css
--- theme/formal_white/fw_color.css	10 Mar 2008 16:03:09 -0000	1.23
+++ theme/formal_white/fw_color.css	8 Apr 2008 13:49:04 -0000
@@ -27,10 +27,14 @@
   color: #333333;
 }
 
-h2 {
+h2,.heading-with-help {
   background-color: #E3DFD4;
   border-color:#C6BDA8;
 }
+.heading-with-help h2 {
+  background:none;
+  border:none;
+}
 
 h2.headingblock.header  {
  background: url(pix/grad/gradient_h.jpg);
Index: theme/formal_white/fw_layout.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_layout.css,v
retrieving revision 1.17
diff -u -r1.17 fw_layout.css
--- theme/formal_white/fw_layout.css	10 Mar 2008 16:03:09 -0000	1.17
+++ theme/formal_white/fw_layout.css	8 Apr 2008 13:49:04 -0000
@@ -27,6 +27,13 @@
   padding: 4px;
 
 }
+.heading-with-help {
+  text-align:left;
+  padding:4px 4px 4px 5px;
+}
+.heading-with-help h2.main {
+  padding:0;
+}
 
 h3 {
   padding: 3px;
@@ -48,7 +55,7 @@
 clear:both;
 }
   
-h1, h2, h3, th.header {
+h1, h2, h3, th.header, .heading-with-help {
   border-width: 1px;
   border-style: solid; 
 }
Index: theme/custom_corners/user_styles.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/custom_corners/user_styles.css,v
retrieving revision 1.40
diff -u -r1.40 user_styles.css
--- theme/custom_corners/user_styles.css	27 Feb 2008 18:41:18 -0000	1.40
+++ theme/custom_corners/user_styles.css	8 Apr 2008 13:49:04 -0000
@@ -51,6 +51,12 @@
   margin: 0 0 10px 0;
   font-size: 180%;
 }
+.heading-with-help {
+  font-size:120%;
+}
+.heading-with-help h2.main {
+  font-size:100%;
+}
 h2.main {
   background-image: url(pix/header.png);
   background-repeat: repeat-x;
Index: theme/metal/fonts.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/metal/fonts.css,v
retrieving revision 1.3
diff -u -r1.3 fonts.css
--- theme/metal/fonts.css	20 Sep 2006 19:46:53 -0000	1.3
+++ theme/metal/fonts.css	8 Apr 2008 13:49:04 -0000
@@ -2,3 +2,10 @@
 .logininfo, .helplink, .minicalendar *, .link, .footer {
   font-size: 9pt !important;
 }
+.heading-with-help {
+  font-size:1.4em;
+}
+
+.heading-with-help h2 {
+  font-size:1em;
+}
Index: theme/orangewhite/styles_layout.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/orangewhite/styles_layout.css,v
retrieving revision 1.42
diff -u -r1.42 styles_layout.css
--- theme/orangewhite/styles_layout.css	21 Dec 2007 11:58:15 -0000	1.42
+++ theme/orangewhite/styles_layout.css	8 Apr 2008 13:49:04 -0000
@@ -36,10 +36,14 @@
 h3.main,
 h4.main,
 h5.main,
-h6.main {
+h6.main,
+.heading-with-help {
   margin-left:1em;
   text-align:left
 }
+.heading-with-help h2 {
+  margin:0;
+}
 #content {
   clear:both
 }
Index: theme/wood/styles_color.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/wood/styles_color.css,v
retrieving revision 1.41
diff -u -r1.41 styles_color.css
--- theme/wood/styles_color.css	8 Mar 2008 22:29:10 -0000	1.41
+++ theme/wood/styles_color.css	8 Apr 2008 13:49:05 -0000
@@ -189,6 +189,7 @@
 div.header,
 h2.header,
 h2.main,
+.heading-with-help,
 .sideblock .header,
 .navbar,
 table.files th,
@@ -206,6 +207,10 @@
     background-position:bottom;
     background-repeat:repeat;  
 }
+.heading-with-help h2.main {
+    border:none;
+    background:none;
+}
 
 /** Places using the horizontal medium wood texture without borders **/