Merge branch 'development' of git://github.com/novakps/kemia into dev…

…elopment
kemia · Jan 31, 2011 · ceacc9a · ceacc9a
2 parents 548ab59 + b39a4c6
commit ceacc9a
Show file tree

Hide file tree

Showing 3 changed files with 512 additions and 370 deletions.
diff --git a/kemia/controller/defaulttoolbar.js b/kemia/controller/defaulttoolbar.js
@@ -109,8 +109,6 @@ kemia.controller.DefaultToolbar.makeZoomButtons = function(buttons) {
     kemia.controller.plugins.Zoom.COMMAND.ZOOM_OUT, 'Zoom Out', '',
     goog.getCssName('tr-icon') + ' ' + goog.getCssName('tr-zoom-out')));
 
-    buttons.push(new goog.ui.ToolbarSeparator());
-
     var reagents_button = kemia.controller.ToolbarFactory.makeToggleButton(
     kemia.controller.plugins.View.COMMAND.SHOW_REAGENTS, 
 	'toggle visibility of Reagents text', 
@@ -126,6 +124,8 @@ kemia.controller.DefaultToolbar.makeZoomButtons = function(buttons) {
     conditions_button.queryable = true;
     buttons.push(conditions_button);
 
+    buttons.push(new goog.ui.ToolbarSeparator());
+
     return buttons;
 };