Skip to content
This repository
Browse code

Merge branch 'master' into develop

  • Loading branch information...
commit 69bdc2f406938ca32e34e8e01fd68fa244db932d 2 parents a45c38e + d0cf378
Yasuo Harada authored April 12, 2012
2  Console/Templates/bootstrap/views/form.ctp
@@ -38,6 +38,7 @@
38 38
 		?>
39 39
 	</div>
40 40
 	<div class="span3">
  41
+		<div class="well" style="padding: 8px 0; margin-top:8px;">
41 42
 		<ul class="nav nav-list">
42 43
 			<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
43 44
 <?php if (strpos($action, 'add') === false): ?>
@@ -57,5 +58,6 @@
57 58
 	}
58 59
 ?>
59 60
 		</ul>
  61
+		</div>
60 62
 	</div>
61 63
 </div>
2  Console/Templates/bootstrap/views/index.ctp
@@ -46,6 +46,7 @@ echo "\t\t<?php endforeach; ?>\n";
46 46
 		<?php echo "<?php echo \$this->BootstrapPaginator->pagination(); ?>\n"; ?>
47 47
 	</div>
48 48
 	<div class="span3">
  49
+		<div class="well" style="padding: 8px 0; margin-top:8px;">
49 50
 		<ul class="nav nav-list">
50 51
 			<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
51 52
 			<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";
62 63
 			}
63 64
 ?>
64 65
 		</ul>
  66
+		</div>
65 67
 	</div>
66 68
 </div>
2  Console/Templates/bootstrap/views/view.ctp
@@ -24,6 +24,7 @@ foreach ($fields as $field) {
24 24
 		</dl>
25 25
 	</div>
26 26
 	<div class="span3">
  27
+		<div class="well" style="padding: 8px 0; margin-top:8px;">
27 28
 		<ul class="nav nav-list">
28 29
 			<li class="nav-header"><?php echo "<?php echo __('Actions'); ?>"; ?></li>
29 30
 <?php
@@ -44,6 +45,7 @@ foreach ($fields as $field) {
44 45
 	}
45 46
 ?>
46 47
 		</ul>
  48
+		</div>
47 49
 	</div>
48 50
 <div>
49 51
 

0 notes on commit 69bdc2f

Please sign in to comment.
Something went wrong with that request. Please try again.