Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle

This commit is contained in:
David Monllao
2016-05-18 11:30:25 +08:00
5 changed files with 6 additions and 6 deletions
@@ -34,7 +34,7 @@
* navigation - array of strings containing buttons for navigation
}}
<div data-region="managecompetencies">
<div class="btn-group pull-left">
<div class="pull-left">
{{#navigation}}
{{{.}}}
{{/navigation}}
@@ -32,7 +32,7 @@
* navigation - array of strings containing buttons for navigation
}}
<div data-region="managetemplates">
<div class="btn-group pull-left">
<div class="pull-left">
{{#navigation}}
{{{.}}}
{{/navigation}}
+1 -1
View File
@@ -34,7 +34,7 @@
}}
<div data-region="plans">
<div class="btn-group pull-left">
<div class="pull-left">
{{#navigation}}
{{{.}}}
{{/navigation}}
@@ -33,7 +33,7 @@
}}
<div data-region="user-evidence-list">
<div class="btn-group pull-left">
<div class="pull-left">
{{#navigation}}
{{{.}}}
{{/navigation}}
+2 -2
View File
@@ -336,10 +336,10 @@ class mod_assign_renderer extends plugin_renderer_base {
// Link to the grading page.
$o .= '<center>';
$o .= $this->output->container_start('submissionlinks btn-group');
$o .= $this->output->container_start('submissionlinks');
$urlparams = array('id' => $summary->coursemoduleid, 'action' => 'grading');
$url = new moodle_url('/mod/assign/view.php', $urlparams);
$o .= '<a href="' . $url . '" class="btn">' . get_string('viewgrading', 'mod_assign') . '</a>';
$o .= '<a href="' . $url . '" class="btn">' . get_string('viewgrading', 'mod_assign') . '</a> ';
$urlparams = array('id' => $summary->coursemoduleid, 'action' => 'grader');
$url = new moodle_url('/mod/assign/view.php', $urlparams);
$o .= '<a href="' . $url . '" class="btn btn-primary">' . get_string('grade') . '</a>';