mirror of
https://github.com/moodle/moodle.git
synced 2025-03-13 20:26:32 +01:00
MDL-25225 forum: fixed discussion control layout
The display mode selector is supposed to display in the middle of the row. Move discussion selector should be on the right, portfolio export selector on the left. Thanks Sam Marshall for the report and testing the patches.
This commit is contained in:
parent
ab152de445
commit
f3cc571af2
@ -193,8 +193,14 @@
|
||||
require_once($CFG->libdir.'/portfoliolib.php');
|
||||
$button = new portfolio_add_button();
|
||||
$button->set_callback_options('forum_portfolio_caller', array('discussionid' => $discussion->id), '/mod/forum/locallib.php');
|
||||
echo html_writer::tag('div', $button->to_html(PORTFOLIO_ADD_FULL_FORM, get_string('exportdiscussion', 'mod_forum')),
|
||||
array('class' => 'discussioncontrol exporttoportfolio'));
|
||||
$button = $button->to_html(PORTFOLIO_ADD_FULL_FORM, get_string('exportdiscussion', 'mod_forum'));
|
||||
$buttonextraclass = '';
|
||||
if (empty($button)) {
|
||||
// no portfolio plugin available.
|
||||
$button = ' ';
|
||||
$buttonextraclass = ' noavailable';
|
||||
}
|
||||
echo html_writer::tag('div', $button, array('class' => 'discussioncontrol exporttoportfolio'.$buttonextraclass));
|
||||
} else {
|
||||
echo html_writer::tag('div', ' ', array('class'=>'discussioncontrol nullcontrol'));
|
||||
}
|
||||
|
@ -138,7 +138,7 @@ $string['everyonecannowchoose'] = 'Everyone can now choose to be subscribed';
|
||||
$string['everyoneisnowsubscribed'] = 'Everyone is now subscribed to this forum';
|
||||
$string['everyoneissubscribed'] = 'Everyone is subscribed to this forum';
|
||||
$string['existingsubscribers'] = 'Existing subscribers';
|
||||
$string['exportdiscussion'] = 'Export whole discussion to portfolio';
|
||||
$string['exportdiscussion'] = 'Export whole discussion';
|
||||
$string['forcessubscribe'] = 'This forum forces everyone to be subscribed';
|
||||
$string['forum'] = 'Forum';
|
||||
$string['forum:addnews'] = 'Add news';
|
||||
|
@ -72,7 +72,7 @@
|
||||
#page-mod-forum-discuss .discussioncontrols .discussioncontrol {width:33%;float:left;}
|
||||
#page-mod-forum-discuss .discussioncontrol.exporttoportfolio {text-align:left;}
|
||||
#page-mod-forum-discuss .discussioncontrol.displaymode {text-align:center;}
|
||||
#page-mod-forum-discuss .discussioncontrol.movediscussion {text-align:right;padding-right:10px;}
|
||||
#page-mod-forum-discuss .discussioncontrol.movediscussion {float:right;width:auto;text-align:right;padding-right:10px;}
|
||||
#page-mod-forum-discuss .discussioncontrol.movediscussion .movediscussionoption {}
|
||||
|
||||
/** Styles for view.php **/
|
||||
|
@ -24,7 +24,7 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
$module->version = 2010111100;
|
||||
$module->version = 2010111500;
|
||||
$module->requires = 2010111002; // Requires this Moodle version
|
||||
$module->cron = 60;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user