Merged tooltips from stable

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 0b6eaabf8c7d7b61f19bba001f945ac12f9f50b2..d7f611906bb0f8288012b4c562b3f0b398715cf5 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -52,16 +52,23 @@
 </tr>
 </table>
 
-<?php print_heading(get_string('permissions','role')) ?>
+<?php 
+    print_heading(get_string('permissions','role'));
+
+    $strinherit = get_string('inherit','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
 
 <table class="rolecap" align="center">
 
 <tr>
 <th class="name" align="left"><?php print_string('capability','role') ?></th>
-<th class="inherit"><?php print_string('inherit','role') ?></th>
-<th class="allow"><?php print_string('allow','role') ?></th>
-<th class="prevent"><?php print_string('prevent','role') ?></th>
-<th class="prohibit"><?php print_string('prohibit','role') ?></th>
+<th class="inherit"><?php p($strinherit); ?></th>
+<th class="allow"><?php p($strallow); ?></th>
+<th class="prevent"><?php p($strprevent); ?></th>
+<th class="prohibit"><?php p($strprohibit); ?></th>
 <th class="risk"><?php print_string('risks','role') ?></th>
 </tr>
 
@@ -120,10 +127,10 @@ foreach ($capabilities as $capability) {
 
         <tr class="rolecap <?php echo $rowclasses; ?>">
         <td class="name"><span title="<?php echo $capability->name ?>"><?php echo get_capability_string($capability->name); ?></span></td>
-        <td class="inherit"><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="allow"><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prevent" ><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prohibit" ><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="inherit"><input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="allow"><input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prevent" ><input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prohibit" ><input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
         <td class="risk"><?php 
             echo $riskinfo; 
         ?></td>

diff --git a/admin/roles/override.html b/admin/roles/override.html
index 0e91401affe925d823d894ab8c17c61a487f4091..d1860a445406657d3b43834330b5c0bf4801943c 100755 (executable)
--- a/admin/roles/override.html
+++ b/admin/roles/override.html
@@ -1,3 +1,10 @@
+<?php 
+    $strinherit = get_string('inherit','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
+
 <form name="overrideform" action="override.php" method="post">
     <input type="hidden" name="contextid" value="<?php p($contextid) ?>">
     <input type="hidden" name="roleid" value="<?php p($roleid) ?>">
@@ -8,10 +15,10 @@
     <table class="rolecap">
         <tr>
             <th class="name" align="left"><?php print_string('capability','role') ?></th>
-            <th class="inherit"><?php print_string('inherit','role') ?></th>
-            <th class="allow"><?php print_string('allow','role') ?></th>
-            <th class="prevent"><?php print_string('prevent','role') ?></th>
-            <th class="prohibit"><?php print_string('prohibit','role') ?></th>
+            <th class="inherit"><?php p($strinherit); ?></th>
+            <th class="allow"><?php p($strallow); ?></th>
+            <th class="prevent"><?php p($strprevent); ?></th>
+            <th class="prohibit"><?php p($strprohibit); ?></th>
             <th class="risk"><?php print_string('risks','role') ?></th>
         </tr>
         <?php
@@ -79,28 +86,28 @@
           <td class="name"><?php echo get_capability_string($capability->name); ?></td>
 
              <td class="inherit">
-             <input type="radio" name="<?php echo $capability->name; ?>" value="0"
+             <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="0"
                 <?php
                     if ($localpermission == CAP_INHERIT) {echo 'checked="checked"';}
                     if ($isdisabled)           {echo 'disabled="disabled"';}?> />
              </td>
 
-             <td class="inherit <?php if ($isallow) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <td class="allow <?php if ($isallow) {echo ' capcurrent';} ?>">
+             <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_ALLOW.'"';
                    if ($localpermission == CAP_ALLOW) {echo ' checked="checked"';}
                    if ($isdisabled)                   {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prevent <?php if ($isprevent) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PREVENT.'"';
                    if ($localpermission == CAP_PREVENT) {echo ' checked="checked"';}
                    if ($isdisabled)                     {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prohibit <?php if ($isprohibit) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PROHIBIT.'"';
                    if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked"';}
                    if ($isdisabled)                      {echo ' disabled="disabled"';}?> />