moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-19069' of git://github.com/rwijaya/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2013-01-28 11:32:53 +13:00
commit 0f54ac5698
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
blocks/rss_client/editfeed.php
View file

@ -177,7 +177,7 @@ if ($returnurl) {
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams); $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams); $PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams);
$PAGE->set_pagelayout('base'); $PAGE->set_pagelayout('standard');
if ($rssid) { if ($rssid) {
$isadding = false; $isadding = false;
@ -218,10 +218,9 @@ if ($mform->is_cancelled()) {
$PAGE->set_title($strtitle); $PAGE->set_title($strtitle);
$PAGE->set_heading($strtitle); $PAGE->set_heading($strtitle);
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$PAGE->navbar->add(get_string('blocks')); $PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl); $PAGE->navbar->add(get_string('pluginname', 'block_rss_client'));
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client')); $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds );
$PAGE->navbar->add($strtitle); $PAGE->navbar->add($strtitle);
echo $OUTPUT->header(); echo $OUTPUT->header();

3
blocks/rss_client/managefeeds.php
View file

@ -83,10 +83,9 @@ $PAGE->set_pagelayout('standard');
$PAGE->set_title($strmanage); $PAGE->set_title($strmanage);
$PAGE->set_heading($strmanage); $PAGE->set_heading($strmanage);
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams); $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->navbar->add(get_string('blocks')); $PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl); $PAGE->navbar->add(get_string('pluginname', 'block_rss_client'));
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds); $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds);
echo $OUTPUT->header(); echo $OUTPUT->header();

5
blocks/rss_client/viewfeed.php
View file

@ -71,11 +71,10 @@ $strviewfeed = get_string('viewfeed', 'block_rss_client');
$PAGE->set_title($strviewfeed); $PAGE->set_title($strviewfeed);
$PAGE->set_heading($strviewfeed); $PAGE->set_heading($strviewfeed);
$settingsurl = new moodle_url('/admin/settings.php?section=blocksettingrss_client');
$managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams); $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
$PAGE->navbar->add(get_string('blocks')); $PAGE->navbar->add(get_string('blocks'));
$PAGE->navbar->add(get_string('pluginname', 'block_rss_client'), $settingsurl); $PAGE->navbar->add(get_string('pluginname', 'block_rss_client'));
$PAGE->navbar->add(get_string('managefeeds', 'block_rss_client')); $PAGE->navbar->add(get_string('managefeeds', 'block_rss_client'), $managefeeds);
$PAGE->navbar->add($strviewfeed); $PAGE->navbar->add($strviewfeed);
echo $OUTPUT->header(); echo $OUTPUT->header();