Moving commands under hero-unit

dorgan@donaldorgan.com · dorgan@donaldorgan.com · commit 5094e96fd4ff · 2013-06-02T18:01:47.000Z
diff --git a/lib/androLib.php b/lib/androLib.php
@@ -9518,19 +9518,13 @@ function DoCommand(e) {
    ?>
    </span>
    */
-   ?>
-
-		<div class="btn-group" style="padding-bottom:10px;">
-			<?php echo vgfGet('html_buttonbar')?>
-		</div>
 
+   return '<div class="btn-group" style="padding-bottom:10px;">' .vgfGet('html_buttonbar') .'</div>
 		<div class="pull-right">
 			<div class="btn-group">
-				<?php echo vgfGet('html_navbar')?>
+				' .vgfGet('html_navbar') .'
 			</div>
-		</div>
-
-   <?php
+		</div>';
 }
 
 
diff --git a/lib/x_table2.php b/lib/x_table2.php
@@ -388,9 +388,23 @@ function ehMain() {
       ?>
       
 		<div class="hero-unit"><h1><?php echo $this->PageSubtitle?></h1></div>
-
         <?php
             ehErrors();
+
+            if (mosCountModules('commands')) {
+                $commands = ehModuleCommands('commands');
+
+                if ( !empty($commands))  {
+                    $commands = '
+                            <div class="container" style="padding-bottom:15px;">
+                                <div class="span' .($left === false ? '12' : '9') .'">' .$commands .'
+                                </div>
+                            </div>';
+                } else {
+                    $commands = '';
+                }
+            }
+            echo $commands;
 			if(is_null($this->table_obj_child)) { 
 				echo $this->h['ButtonBar'];
 			} 
diff --git a/templates/bootstrap/index.php b/templates/bootstrap/index.php
@@ -12,7 +12,7 @@ function tmpLoadModules($module_name,$var=null) {
       case 'left':     return tmpModuleLeft();
       case 'right':    tmpModuleRight();    break;
       case 'top':      tmpModuleTop();      break;
-      case 'commands': ehModuleCommands();  break;
+      case 'commands': return ehModuleCommands();  break;
       case 'menuright':fwModuleMenuRight();break;
    }
 }
@@ -166,22 +166,8 @@ function tmpModuleLeft() {
 					}
 				} 
 				echo '<div class=" test span' .($left === false ? '12' : '9')  .'" style="padding-bottom:15px;">';
-					
-				if (mosCountModules('commands')) {
-			?>
-
-					<div class="container" style="padding-bottom:15px;">
-						<div class="span<?php echo ($left === false ? '12' : '9') ?>">
-							<?php
-								mosLoadModules('commands');
-							?>
-						</div>
-					</div>
 
-
-			<?php
-				}
-				echo mosMainBody();
+				echo str_replace( '--COMMANDS--', $commands, mosMainBody() );
 				echo '</div>';
 			?>
 		</div>
