Merged roles gui changes from stable

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index d7f611906bb0f8288012b4c562b3f0b398715cf5..34d93ec0d22d14e72d0f37472e11f28d569f08a9 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -53,7 +53,7 @@
 </table>
 
 <?php 
-    print_heading(get_string('permissions','role'));
+    print_heading_with_help(get_string('permissions','role'), 'permissions');
 
     $strinherit = get_string('inherit','role');
     $strallow = get_string('allow','role');
@@ -69,7 +69,7 @@
 <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>
+<th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
 </tr>
 
 <?php
@@ -81,7 +81,7 @@ $component = '';
 foreach ($capabilities as $capability) {
     // prints a breaker if component or name or context level
     if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-        echo ('<tr class="rolecapheading header"><td colspan="6" class="header"><strong>'.
+        echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
                get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
     }
 
@@ -100,40 +100,48 @@ foreach ($capabilities as $capability) {
 
     $disabled = ($action != 'edit') ? ' disabled="disabled" ' : '';
 
-    $riskinfo = '';
+    $strrisks = htmlentities(get_string('risks', 'role'));
+    $strcapabilities = htmlentities(get_string('capabilities', 'role'));
+
+    $riskinfo = '<td class="risk managetrust">';
     $rowclasses = '';
     if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">T</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
         $rowclasses .= ' riskmanagetrust';
     }
+    $riskinfo .= '</td><td class="risk config">';
     if (RISK_CONFIG & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">C</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
         $rowclasses .= ' riskconfig';
     }
+    $riskinfo .= '</td><td class="risk xss">';
     if (RISK_XSS & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">X</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
         $rowclasses .= ' riskxss';
     }
+    $riskinfo .= '</td><td class="risk personal">';
     if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">P</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
         $rowclasses .= ' riskpersonal';
     }
+    $riskinfo .= '</td><td class="risk spam">';
     if (RISK_SPAM & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">S</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
         $rowclasses .= ' riskspam';
     }
+    $riskinfo .= '</td>';
 
     ?>
 
         <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="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></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>
+
+        <?php echo $riskinfo; ?>
+
         </tr>
 
 <?php } ?>

diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 5d9bdee09d796827d5e4e83750962494ff506140..965b3d857b0a07c9b32e774067334a10a0b155e5 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -976,3 +976,12 @@ body#mod-quiz-report table#attempts .r1 {
   background-color:#FFFFFF;
   border: 1px solid #cecece;
 }
+
+#admin-roles-manage .rolecap  {
+  border:none;
+  border-bottom:1px solid;
+  border-bottom-color: #cecece;
+}
+#admin-roles-manage .rolecap .cap-desc .cap-name {
+  color: #888;
+}

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index a182b5c9c81f9aee38e2c834c1520e2ba750c66a..001b1bee2880aeeecb2491bd83e0b58d11e42f47 100644 (file)
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -227,6 +227,10 @@ body#admin-index .copyright {
   font-size: 0.8em;
 }
 
+#admin-roles-manage .rolecap .cap-desc .cap-name {
+    font-size: 75%;
+}
+
 #adminsettings .form-shortname {
     font-size: 75%;
 }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 445051ccbaf4ad75e8da9e2804c1b652ffb5a91e..11b2c06651aa7c7f830ccfaf762d633a0a4e34e8 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -549,6 +549,10 @@ body#admin-roles-manage table.generalbox {
   text-align:center;
 }
 
+#admin-roles-manage .rolecap .cap-desc .cap-name {
+  display: block;
+}
+
 #adminsettings fieldset {
   margin-top: 1em;
   padding: 1em 0.5em;