Permalink
Browse files

Merge branch 'master' into develop

  • Loading branch information...
slywalker committed Apr 12, 2012
2 parents a45c38e + d0cf378 commit 69bdc2f406938ca32e34e8e01fd68fa244db932d
@@ -38,6 +38,7 @@
?>
</div>
<div class="span3">
+ <div class="well" style="padding: 8px 0; margin-top:8px;">
<ul class="nav nav-list">
<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
<?php if (strpos($action, 'add') === false): ?>
@@ -57,5 +58,6 @@
}
?>
</ul>
+ </div>
</div>
</div>
@@ -46,6 +46,7 @@ echo "\t\t<?php endforeach; ?>\n";
<?php echo "<?php echo \$this->BootstrapPaginator->pagination(); ?>\n"; ?>
</div>
<div class="span3">
+ <div class="well" style="padding: 8px 0; margin-top:8px;">
<ul class="nav nav-list">
<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
<li><?php echo "<?php echo \$this->Html->link(__('New %s', __('" . $singularHumanName . "')), array('action' => 'add')); ?>";?></li>
@@ -62,5 +63,6 @@ echo "\t\t<?php endforeach; ?>\n";
}
?>
</ul>
+ </div>
</div>
</div>
@@ -24,6 +24,7 @@ foreach ($fields as $field) {
</dl>
</div>
<div class="span3">
+ <div class="well" style="padding: 8px 0; margin-top:8px;">
<ul class="nav nav-list">
<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
<?php
@@ -44,6 +45,7 @@ foreach ($fields as $field) {
}
?>
</ul>
+ </div>
</div>
<div>

0 comments on commit 69bdc2f

Please sign in to comment.