From f357d2f8eb91bbb90a01127f514b468c24632120 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Thu, 11 Nov 2010 18:04:43 +0000 Subject: [PATCH] Fixed portfolio UI integration in forum thread There was not enough space to put yet another discussion thread control widget. --- mod/forum/discuss.php | 19 ++++++++++--------- mod/forum/lang/en/forum.php | 1 + mod/forum/styles.css | 9 +++++---- mod/forum/version.php | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index c439baa4e46..147a08191b9 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -189,24 +189,25 @@ /// Print the controls across the top echo '
'; - // groups selector not needed here - echo '
'; - forum_print_mode_form($discussion->id, $displaymode); - echo "
"; - if (has_capability('mod/forum:exportdiscussion', $modcontext) && (!empty($CFG->enableportfolios))) { - echo '
'; 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'); - $button->render(); - echo '
'; + echo html_writer::tag('div', $button->to_html(PORTFOLIO_ADD_FULL_FORM, get_string('exportdiscussion', 'mod_forum')), + array('class' => 'discussioncontrol exporttoportfolio')); + } else { + echo html_writer::tag('div', ' ', array('class'=>'discussioncontrol nullcontrol')); } + // groups selector not needed here + echo '
'; + forum_print_mode_form($discussion->id, $displaymode); + echo "
"; + if ($forum->type != 'single' && has_capability('mod/forum:movediscussions', $modcontext)) { - echo '
'; + echo '
'; // Popup menu to move discussions to other forums. The discussion in a // single discussion forum can't be moved. $modinfo = get_fast_modinfo($course); diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index da61a9c6716..403d2ba87ae 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -138,6 +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['forcessubscribe'] = 'This forum forces everyone to be subscribed'; $string['forum'] = 'Forum'; $string['forum:addnews'] = 'Add news'; diff --git a/mod/forum/styles.css b/mod/forum/styles.css index b952606b8d2..802d9d0f4e6 100644 --- a/mod/forum/styles.css +++ b/mod/forum/styles.css @@ -69,10 +69,11 @@ /** Styles for discuss.php **/ #page-mod-forum-discuss .discussioncontrols {width:100%;margin:5px;} -#page-mod-forum-discuss .displaymode {float:left;width:55%;} -#page-mod-forum-discuss .exporttoportfolio {float:left;width:15%;text-align:right;} -#page-mod-forum-discuss .movediscussion .movediscussionoption {float:right;width:25%;text-align:right;padding-right:10px;} -#page-mod-forum-discuss .discussioncontrols .displaymode .singleselect {text-align:right;margin: 0;} +#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 .movediscussionoption {} /** Styles for view.php **/ #page-mod-forum-view .forumaddnew {margin-bottom: 20px;} diff --git a/mod/forum/version.php b/mod/forum/version.php index 207c4f3eba3..e7f8c1128d3 100644 --- a/mod/forum/version.php +++ b/mod/forum/version.php @@ -24,8 +24,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$module->version = 2010091900; -$module->requires = 2010091900; // Requires this Moodle version +$module->version = 2010111100; +$module->requires = 2010111002; // Requires this Moodle version $module->cron = 60; -- 2.43.0