MDL-14260: Changed print_heading_with_help so that the help button is outside the...

diff --git a/lib/weblib.php b/lib/weblib.php
index 2bb44ee8e6851a43a2e109d3a8efe93548a7c0a9..d88ec2dbc00a8a2a6bfa31f87c4b20de420a8bc3 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3863,10 +3863,10 @@ function print_heading($text, $align='', $size=2, $class='main', $return=false)
  * @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;

diff --git a/theme/custom_corners/user_styles.css b/theme/custom_corners/user_styles.css
index 46182e245e7685ee8b8008d1f2984169ea59113e..4bdd853962dd25ca0fd57c4f0e5ac51e5fd2eefa 100644 (file)
--- a/theme/custom_corners/user_styles.css
+++ b/theme/custom_corners/user_styles.css
@@ -51,6 +51,12 @@ h1.headermain {
   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;

diff --git a/theme/formal_white/fw_color.css b/theme/formal_white/fw_color.css
index 93f9da6a0d00283b4dda0b956a1fc2a9b95316f0..3986e5108a6ef540fa8af80422545e0591ef9564 100644 (file)
--- a/theme/formal_white/fw_color.css
+++ b/theme/formal_white/fw_color.css
@@ -27,10 +27,14 @@ h1 {
   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);

diff --git a/theme/formal_white/fw_fonts.css b/theme/formal_white/fw_fonts.css
index 1f1e1035f4bb703523df1dff4af5375a286f4eee..d62a0d1e4989e8758c0352eae6fd3cfacf1c61f4 100644 (file)
--- a/theme/formal_white/fw_fonts.css
+++ b/theme/formal_white/fw_fonts.css
@@ -41,9 +41,12 @@ h1 {
     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;
 }

diff --git a/theme/formal_white/fw_layout.css b/theme/formal_white/fw_layout.css
index 9fc5d8c76f323d5a5c65856be2ea12290ff5ed52..2ae185e580a713aea09c617e4990945be3d561c1 100644 (file)
--- a/theme/formal_white/fw_layout.css
+++ b/theme/formal_white/fw_layout.css
@@ -27,6 +27,13 @@ h2 {
   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 @@ border-bottom-width:1px;
 clear:both;
 }
   
-h1, h2, h3, th.header {
+h1, h2, h3, th.header, .heading-with-help {
   border-width: 1px;
   border-style: solid; 
 }

diff --git a/theme/metal/fonts.css b/theme/metal/fonts.css
index 9dfd6aa04bdbdc38ce72de16486636a01a02b013..d39fd1ef12ff332fc270a950f0e26493b172b3df 100755 (executable)
--- a/theme/metal/fonts.css
+++ b/theme/metal/fonts.css
@@ -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;
+}

diff --git a/theme/orangewhite/styles_layout.css b/theme/orangewhite/styles_layout.css
index cf2aecac7d0effe743016aa83fb795cbafe515d5..b8c751ea30ec6adf5a3d0155e02ba202cfde6514 100644 (file)
--- a/theme/orangewhite/styles_layout.css
+++ b/theme/orangewhite/styles_layout.css
@@ -36,10 +36,14 @@ h2.main,
 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
 }

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index 5cc0b755008e0b3cc2407f9c348a63310e563fac..ab7223e1ef2378b57754cd29f38a0e64dbe4cb98 100644 (file)
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -123,6 +123,14 @@ h4 {
   font-weight:bold;
 }
 
+.heading-with-help {
+  font-size:1.4em;
+}
+
+.heading-with-help h2.main {
+  font-size:1em;
+}
+
 .helplink {
   font-size:0.8em;
 }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index dfaefa847015be5e8b53a1c426fd24fa9f23ecc2..55e3bdc293abce5061ad2beb39a32fed8dbc80f5 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -392,6 +392,16 @@ table.formtable tbody .htmlarea th
   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;

diff --git a/theme/wood/styles_color.css b/theme/wood/styles_color.css
index be46cee7612fac68d8f69a2318cd3f8d9fd8b1f6..3b66307ba29d71221bd162ab0161e66f6cb5af85 100644 (file)
--- a/theme/wood/styles_color.css
+++ b/theme/wood/styles_color.css
@@ -189,6 +189,7 @@ td.header,
 div.header,
 h2.header,
 h2.main,
+.heading-with-help,
 .sideblock .header,
 .navbar,
 table.files th,
@@ -206,6 +207,10 @@ legend,
     background-position:bottom;
     background-repeat:repeat;  
 }
+.heading-with-help h2.main {
+    border:none;
+    background:none;
+}
 
 /** Places using the horizontal medium wood texture without borders **/