MDL-7137 permission UI improvements merged into role overrides; s() used instead...

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index ca4c77873a0d467ddeb2f3c1e0d58a5f5213ea6a..94c5aed2ba812f1e18a52f1e57e2c1f37a696e63 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -78,6 +78,9 @@
 $contextlevel = 0;
 $component = '';
 
+$strrisks = s(get_string('risks', 'role'));
+$strcapabilities = s(get_string('capabilities', 'role'));
+
 foreach ($capabilities as $capability) {
     // prints a breaker if component or name or context level
     if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
@@ -100,9 +103,6 @@ foreach ($capabilities as $capability) {
 
     $disabled = ($action != 'edit' and $action != 'add') ? ' disabled="disabled" ' : '';
 
-    $strrisks = htmlentities(get_string('risks', 'role'));
-    $strcapabilities = htmlentities(get_string('capabilities', 'role'));
-
     $riskinfo = '<td class="risk managetrust">';
     $rowclasses = '';
     if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {

diff --git a/admin/roles/override.html b/admin/roles/override.html
index d1860a445406657d3b43834330b5c0bf4801943c..67947a353f80c7b8b9b2630f1913ab0d7835a9cc 100755 (executable)
--- a/admin/roles/override.html
+++ b/admin/roles/override.html
@@ -1,4 +1,4 @@
-<?php 
+<?php
     $strinherit = get_string('inherit','role');
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
@@ -19,7 +19,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
 
@@ -27,10 +27,13 @@
         $contextlevel = 0;
         $component = '';
 
+        $strrisks = s(get_string('risks', 'role'));
+        $strcapabilities = s(get_string('capabilities', 'role'));
+
         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>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
+                echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
             }
 
             // these 2 are used to see to group same mod/core capabilities together
@@ -56,34 +59,39 @@
 
             $isdisabled = $isprohibit || islegacy($capability->name);
 
-            $riskinfo = '';
+            $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"><?php echo get_capability_string($capability->name); ?></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="0"
@@ -112,7 +120,7 @@
                    if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked"';}
                    if ($isdisabled)                      {echo ' disabled="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 965b3d857b0a07c9b32e774067334a10a0b155e5..9992884eaae9c07e962be58e77ada1f21d9e1392 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -977,11 +977,14 @@ body#mod-quiz-report table#attempts .r1 {
   border: 1px solid #cecece;
 }
 
-#admin-roles-manage .rolecap  {
+#admin-roles-manage .rolecap,
+#admin-roles-override .rolecap {
   border:none;
   border-bottom:1px solid;
   border-bottom-color: #cecece;
 }
-#admin-roles-manage .rolecap .cap-desc .cap-name {
+
+#admin-roles-manage .rolecap .cap-desc .cap-name,
+#admin-roles-override .rolecap .cap-desc .cap-name {
   color: #888;
 }

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

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 11b2c06651aa7c7f830ccfaf762d633a0a4e34e8..61296910a3d20df1cab47c005f001618846cd441 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -549,8 +549,9 @@ body#admin-roles-manage table.generalbox {
   text-align:center;
 }
 
-#admin-roles-manage .rolecap .cap-desc .cap-name {
-  display: block;
+#admin-roles-manage .rolecap .cap-desc .cap-name,
+#admin-roles-override .rolecap .cap-desc .cap-name {
+         display: block;
 }
 
 #adminsettings fieldset {