Permalink
Browse files

Merge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle

  • Loading branch information...
danpoltawski committed Jul 22, 2013
2 parents ffc3f53 + 32b0c69 commit 7bdae0924f6903e763a3d2eb54802b44eec12659
Showing with 13 additions and 9 deletions.
  1. +13 −9 theme/index.php
View
@@ -97,11 +97,11 @@
$table->head = array(get_string('devicetype', 'admin'), get_string('currenttheme', 'admin'), get_string('info'));
$devices = get_device_type_list();
foreach ($devices as $device) {
foreach ($devices as $thedevice) {
$headingthemename = ''; // To output the picked theme name when needed
$themename = get_selected_theme_for_device_type($device);
if (!$themename && $device == 'default') {
$themename = get_selected_theme_for_device_type($thedevice);
if (!$themename && $thedevice == 'default') {
$themename = theme_config::DEFAULT_THEME;
}
@@ -112,7 +112,7 @@
$themename = clean_param($themename, PARAM_THEME);
if (empty($themename)) {
// Likely the theme has been deleted
unset_config(get_device_cfg_var_name($device));
unset_config(get_device_cfg_var_name($thedevice));
} else {
$strthemename = get_string('pluginname', 'theme_'.$themename);
// link to the screenshot, now mandatory - the image path is hardcoded because we need image from other themes, not the current one
@@ -123,19 +123,19 @@
$headingthemename = $OUTPUT->heading($strthemename, 3);
}
// If not default device then show option to unset theme.
if ($device != 'default') {
if ($thedevice != 'default') {
$unsetthemestr = get_string('unsettheme', 'admin');
$unsetthemeurl = new moodle_url('/theme/index.php', array('device' => $device, 'sesskey' => sesskey(), 'unsettheme' => true));
$unsetthemeurl = new moodle_url('/theme/index.php', array('device' => $thedevice, 'sesskey' => sesskey(), 'unsettheme' => true));
$unsetthemebutton = new single_button($unsetthemeurl, $unsetthemestr, 'get');
$unsetthemebutton = $OUTPUT->render($unsetthemebutton);
}
}
$deviceurl = new moodle_url('/theme/index.php', array('device' => $device, 'sesskey' => sesskey()));
$deviceurl = new moodle_url('/theme/index.php', array('device' => $thedevice, 'sesskey' => sesskey()));
$select = new single_button($deviceurl, $strthemeselect, 'get');
$table->data[] = array(
$OUTPUT->heading(ucfirst($device), 3),
$OUTPUT->heading(ucfirst($thedevice), 3),
$screenshotcell,
$headingthemename . $OUTPUT->render($select) . $unsetthemebutton
);
@@ -217,7 +217,11 @@
echo $OUTPUT->header('themeselector');
echo $OUTPUT->heading($heading);
echo $OUTPUT->single_button(new moodle_url('index.php', array('sesskey' => sesskey(), 'reset' => 1, 'device' => $device)), get_string('themeresetcaches', 'admin'));
$params = array('sesskey' => sesskey(), 'reset' => 1);
if (!empty($device)) {
$params['device'] = $device;
}
echo $OUTPUT->single_button(new moodle_url('index.php', $params), get_string('themeresetcaches', 'admin'));
echo html_writer::table($table);

0 comments on commit 7bdae09

Please sign in to comment.