Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 02:19:02 +0000 (10:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:54 +0000 (16:26 +0100)
1  2 
lib/outputrenderers.php

diff --combined lib/outputrenderers.php
@@@ -1394,8 -1394,11 +1394,11 @@@ class core_renderer extends renderer_ba
              $output = '';
              $skipdest = '';
          } else {
-             $output = html_writer::tag('a', get_string('skipa', 'access', $skiptitle), array('href' => '#sb-' . $bc->skipid, 'class' => 'skip-block'));
-             $skipdest = html_writer::tag('span', '', array('id' => 'sb-' . $bc->skipid, 'class' => 'skip-block-to'));
+             $output = html_writer::link('#', get_string('skipa', 'access', $skiptitle),
+                       array('class' => 'skip skip-block', 'id'=>'fsb-' . $bc->skipid,
+                       'data-target' => '#sb-'.$bc->skipid));
+             $skipdest = html_writer::span('', 'skip-block-to',
+                       array('id' => 'sb-' . $bc->skipid, 'tabindex' => '-1'));
          }
  
          $output .= html_writer::start_tag('div', $bc->attributes);
@@@ -2960,7 -2963,7 +2963,7 @@@ EOD
       * @return string the HTML to output.
       */
      public function skip_link_target($id = null) {
-         return html_writer::tag('span', '', array('id' => $id));
+         return html_writer::span('', '', array('id' => $id, 'tabindex' => '-1'));
      }
  
      /**
                          'page' => $this->page
                      )
                  );
 +                $this->page->requires->string_for_js('changesmadereallygoaway', 'moodle');
              }
          }