Fixed portfolio UI integration in forum thread

There was not enough space to put yet another discussion thread control
widget.

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index c439baa..147a081 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -189,24 +189,25 @@
 /// Print the controls across the top
     echo '<div class="discussioncontrols clearfix">';
 
-    // groups selector not needed here
-    echo '<div class="displaymode">';
-    forum_print_mode_form($discussion->id, $displaymode);
-    echo "</div>";
-
     if (has_capability('mod/forum:exportdiscussion', $modcontext) && (!empty($CFG->enableportfolios))) {
-        echo '<div class="exporttoportfolio">';
         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 '</div>';
+        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', '&nbsp;', array('class'=>'discussioncontrol nullcontrol'));
     }
 
+    // groups selector not needed here
+    echo '<div class="discussioncontrol displaymode">';
+    forum_print_mode_form($discussion->id, $displaymode);
+    echo "</div>";
+
     if ($forum->type != 'single'
                 && has_capability('mod/forum:movediscussions', $modcontext)) {
 
-        echo '<div class="movediscussion">';
+        echo '<div class="discussioncontrol movediscussion">';
         // 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 da61a9c..403d2ba 100644 (file)
--- 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 b952606..802d9d0 100644 (file)
--- 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 207c4f3..e7f8c11 100644 (file)
--- 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;