Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/CHANGELOG.txt,v
retrieving revision 1.1.2.46
diff -u -p -r1.1.2.46 CHANGELOG.txt
--- CHANGELOG.txt	16 Oct 2008 17:02:10 -0000	1.1.2.46
+++ CHANGELOG.txt	19 Oct 2008 21:26:37 -0000
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 5.x-x.x, xxxx-xx-xx
 ---------------------------
+#308912 by sun: Fixed alignment of editor buttons in TinyMCE 3.
 #316507 by sun: Fixed TinyMCE 3 not detached properly from AJAX contents.
 #320559 by markus_petrux, sun: Added confirmation form to delete profiles.
 
Index: wysiwyg.css
===================================================================
RCS file: wysiwyg.css
diff -N wysiwyg.css
--- wysiwyg.css	14 Oct 2008 21:46:10 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-/* $Id: wysiwyg.css,v 1.1.2.2 2008/10/14 21:46:10 sun Exp $ */
-
-/* TinyMCE 2.x */
-.mceToolbarTop a, .mceToolbarBottom a { float: left; }
-.mceSeparatorLine { float: left; margin-top: 3px; }
-.mceSelectList { float: left; margin-bottom: 1px; }
-#mce_editor_0_table, #mce_editor_1_table { clear: left; }
Index: wysiwyg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 wysiwyg.module
--- wysiwyg.module	15 Oct 2008 14:24:44 -0000	1.1.2.2
+++ wysiwyg.module	19 Oct 2008 21:23:22 -0000
@@ -253,12 +253,21 @@ function wysiwyg_load_editor($profile) {
         drupal_add_js($editor['library path'] . '/' . $file);
       }
       // Load JavaScript integration files for this editor.
+      $files = array();
       if (isset($editor['js files'])) {
         $files = $editor['js files'];
       }
       foreach ($files as $file) {
         drupal_add_js($editor['js path'] . '/' . $file, 'module', 'footer');
       }
+      // Load CSS stylesheets for this editor.
+      $files = array();
+      if (isset($editor['css files'])) {
+        $files = $editor['css files'];
+      }
+      foreach ($files as $file) {
+        drupal_add_css($editor['css path'] . '/' . $file, 'module', 'screen');
+      }
 
       $status = wysiwyg_user_get_status($profile);
       drupal_add_js(array('wysiwyg' => array(
@@ -302,10 +311,6 @@ function wysiwyg_load_editor($profile) {
     // last.
     drupal_add_js(wysiwyg_get_path('wysiwyg.js'), 'module', 'footer');
 
-    // Add our stylesheet to stack editor buttons into one row.
-    // @todo This is TinyMCE 2.x specific at the moment.
-    drupal_add_css(wysiwyg_get_path('wysiwyg.css'));
-
     $settings_added = TRUE;
   }
 
Index: editors/tinymce.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/tinymce.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 tinymce.inc
--- editors/tinymce.inc	14 Oct 2008 21:46:13 -0000	1.1.2.7
+++ editors/tinymce.inc	19 Oct 2008 21:23:07 -0000
@@ -37,11 +37,13 @@ function wysiwyg_tinymce_editor() {
       '2.1' => array(
         // 'include files' => array('tinymce-2.inc'),
         'js files' => array('tinymce-2.js'),
+        'css files' => array('tinymce-2.css'),
         'download url' => 'http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430&release_id=557383',
       ),
       '3.2' => array(
         // 'include files' => array('tinymce-3.inc'),
         'js files' => array('tinymce-3.js'),
+        'css files' => array('tinymce-3.css'),
         // 'plugin callback' => 'wysiwyg_tinymce_3_plugins',
         'libraries' => array(
           '' => array(
@@ -63,8 +65,6 @@ function wysiwyg_tinymce_editor() {
     // 'editor path' => wysiwyg_get_path('tinymce'), // Assumed by default.
     // 'js path' => wysiwyg_get_path('editors/js'), // Assumed by default.
     // 'css path' => wysiwyg_get_path('editors/css'), // Assumed by default.
-    // @todo Not yet implemented.
-    // 'css files' => array('tinymce.css'),
   );
   return $editor;
 }
Index: editors/css/tinymce-2.css
===================================================================
RCS file: editors/css/tinymce-2.css
diff -N editors/css/tinymce-2.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ editors/css/tinymce-2.css	19 Oct 2008 21:20:39 -0000
@@ -0,0 +1,23 @@
+/* $Id: wysiwyg.css,v 1.1.2.2 2008/10/14 21:46:10 sun Exp $ */
+
+/**
+ * TinyMCE 2.x
+ *
+ * Align all buttons and separators in a single row, so they wrap into multiple
+ * rows if required.
+ */
+.mceToolbarTop a, .mceToolbarBottom a {
+  float: left;
+}
+.mceSeparatorLine {
+  float: left;
+  margin-top: 3px;
+}
+.mceSelectList {
+  float: left;
+  margin-bottom: 1px;
+}
+/* Place table plugin buttons into new row */
+#mce_editor_0_table, #mce_editor_1_table {
+  clear: left;
+}
Index: editors/css/tinymce-3.css
===================================================================
RCS file: editors/css/tinymce-3.css
diff -N editors/css/tinymce-3.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ editors/css/tinymce-3.css	19 Oct 2008 21:12:41 -0000
@@ -0,0 +1,21 @@
+/* $Id: wysiwyg.css,v 1.1.2.2 2008/10/14 21:46:10 sun Exp $ */
+
+/**
+ * TinyMCE 3.x
+ *
+ * Align all buttons and separators in a single row, so they wrap into multiple
+ * rows if required.
+ */
+.mceToolbar td {
+  display: inline;
+}
+.mceToolbar a {
+  float: left;
+}
+.mceSeparator {
+  float: left;
+}
+.mceListBox {
+  float: left;
+  margin-bottom: 1px;
+}