Skip to content

Commit 8e69c02

Browse files
slywalkerslywalker
committed
update 3.0.0-rc1
1 parent cf73d71 commit 8e69c02

1 file changed

Lines changed: 44 additions & 29 deletions

File tree

‎View/BoostCake/bootstrap3.ctp‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ul>
1111
</div>
1212
<div class="col col-lg-9">
13-
<h1>BoostCake Examples <small>Bootstrap Version 3.0.0-wip</small></h1>
13+
<h1>BoostCake Examples <small>Bootstrap Version 3.0.0-rc1</small></h1>
1414

1515
<section id="forms">
1616
<div class="page-header">
@@ -22,8 +22,9 @@
2222

2323
<?php echo $this->Form->create('BoostCake', array(
2424
'inputDefaults' => array(
25-
'div' => false,
26-
'wrapInput' => false
25+
'div' => 'form-group',
26+
'wrapInput' => false,
27+
'class' => 'form-control'
2728
),
2829
'class' => 'well'
2930
)); ?>
@@ -35,20 +36,22 @@
3536
'after' => '<span class="help-block">Example block-level help text here.</span>'
3637
)); ?>
3738
<?php echo $this->Form->input('checkbox', array(
38-
'label' => 'Check me out'
39+
'label' => 'Check me out',
40+
'class' => false
3941
)); ?>
4042
<?php echo $this->Form->submit('Submit', array(
4143
'div' => false,
42-
'class' => 'btn'
44+
'class' => 'btn btn-default'
4345
)); ?>
4446
</fieldset>
4547
<?php echo $this->Form->end(); ?>
4648

4749
<pre class="prettyprint"><?php
4850
echo h("<?php echo \$this->Form->create('BoostCake', array(
4951
'inputDefaults' => array(
50-
'div' => false,
51-
'wrapInput' => false
52+
'div' => 'form-group',
53+
'wrapInput' => false,
54+
'class' => 'form-control'
5255
),
5356
'class' => 'well'
5457
)); ?>
@@ -60,11 +63,12 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
6063
'after' => '<span class=\"help-block\">Example block-level help text here.</span>'
6164
)); ?>
6265
<?php echo \$this->Form->input('checkbox', array(
63-
'label' => 'Check me out'
66+
'label' => 'Check me out',
67+
'class' => false
6468
)); ?>
6569
<?php echo \$this->Form->submit('Submit', array(
6670
'div' => false,
67-
'class' => 'btn'
71+
'class' => 'btn btn-default'
6872
)); ?>
6973
</fieldset>
7074
<?php echo \$this->Form->end(); ?>");
@@ -78,7 +82,8 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
7882
'inputDefaults' => array(
7983
'div' => false,
8084
'label' => false,
81-
'wrapInput' => false
85+
'wrapInput' => false,
86+
'class' => 'form-control'
8287
),
8388
'class' => 'well form-inline'
8489
)); ?>
@@ -91,7 +96,8 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
9196
'style' => 'width:180px;'
9297
)); ?>
9398
<?php echo $this->Form->input('remember', array(
94-
'label' => 'Remember me'
99+
'label' => 'Remember me',
100+
'class' => false
95101
)); ?>
96102
<?php echo $this->Form->submit('Sign in', array(
97103
'div' => false,
@@ -104,7 +110,8 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
104110
'inputDefaults' => array(
105111
'div' => false,
106112
'label' => false,
107-
'wrapInput' => false
113+
'wrapInput' => false,
114+
'class' => 'form-control'
108115
),
109116
'class' => 'well form-inline'
110117
)); ?>
@@ -117,7 +124,8 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
117124
'style' => 'width:180px;'
118125
)); ?>
119126
<?php echo \$this->Form->input('remember', array(
120-
'label' => 'Remember me'
127+
'label' => 'Remember me',
128+
'class' => false
121129
)); ?>
122130
<?php echo \$this->Form->submit('Sign in', array(
123131
'div' => false,
@@ -134,11 +142,12 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
134142

135143
<?php echo $this->Form->create('BoostCake', array(
136144
'inputDefaults' => array(
137-
'div' => 'row',
145+
'div' => 'form-group',
138146
'label' => array(
139147
'class' => 'col col-lg-2 control-label'
140148
),
141-
'wrapInput' => 'col col-lg-10'
149+
'wrapInput' => 'col col-lg-10',
150+
'class' => 'form-control'
142151
),
143152
'class' => 'well form-horizontal'
144153
)); ?>
@@ -151,6 +160,7 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
151160
<?php echo $this->Form->input('remember', array(
152161
'wrapInput' => 'col col-lg-10 col-offset-2',
153162
'label' => 'Remember me',
163+
'class' => false,
154164
'afterInput' => $this->Form->submit('Sign in', array(
155165
'class' => 'btn'
156166
))
@@ -160,11 +170,12 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
160170
<pre class="prettyprint"><?php
161171
echo h("<?php echo \$this->Form->create('BoostCake', array(
162172
'inputDefaults' => array(
163-
'div' => 'row',
173+
'div' => 'form-group',
164174
'label' => array(
165175
'class' => 'col col-lg-2 control-label'
166176
),
167-
'wrapInput' => 'col col-lg-10'
177+
'wrapInput' => 'col col-lg-10',
178+
'class' => 'form-control'
168179
),
169180
'class' => 'well form-horizontal'
170181
)); ?>
@@ -176,7 +187,8 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
176187
)); ?>
177188
<?php echo \$this->Form->input('remember', array(
178189
'wrapInput' => 'col col-lg-10 col-offset-2',
179-
'label' => Remember me',
190+
'label' => 'Remember me',
191+
'class' => false,
180192
'afterInput' => \$this->Form->submit('Sign in', array(
181193
'class' => 'btn'
182194
))
@@ -192,11 +204,12 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
192204
?>
193205
<?php echo $this->Form->create('BoostCake', array(
194206
'inputDefaults' => array(
195-
'div' => 'row',
207+
'div' => 'form-group',
196208
'label' => array(
197209
'class' => 'col col-lg-2 control-label'
198210
),
199-
'wrapInput' => 'col col-lg-10'
211+
'wrapInput' => 'col col-lg-10',
212+
'class' => 'form-control'
200213
),
201214
'class' => 'well form-horizontal'
202215
)); ?>
@@ -237,6 +250,7 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
237250
'type' => 'radio',
238251
'before' => '<label class="col col-lg-2 control-label">Radio</label>',
239252
'legend' => false,
253+
'class' => false,
240254
'options' => array(
241255
1 => 'Option one is this and that—be sure to include why it\'s great',
242256
2 => 'Option two can be something else and selecting it will deselect option one'
@@ -265,25 +279,25 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
265279
'label' => array(
266280
'text' => 'Show Error Message'
267281
),
268-
'class' => 'input-with-feedback',
269282
'placeholder' => 'Password'
270283
)); ?>
271284
<?php echo $this->Form->input('password', array(
272285
'label' => array(
273286
'text' => 'Hide Error Message'
274287
),
275-
'class' => 'input-with-feedback',
276288
'placeholder' => 'Password',
277289
'errorMessage' => false
278290
)); ?>
279291
<?php echo $this->Form->input('checkbox', array(
280292
'wrapInput' => 'col col-lg-10 col-offset-2',
281293
'label' => array('class' => null),
294+
'class' => false,
282295
'afterInput' => '<span class="help-block">Checkbox Bootstrap Style</span>'
283296
)); ?>
284297
<?php echo $this->Form->input('checkbox', array(
285298
'before' => '<label class="col col-lg-2 control-label">Checkbox</label>',
286299
'label' => false,
300+
'class' => false,
287301
'wrapInput' => 'col col-lg-10',
288302
'afterInput' => '<span class="help-block">Checkbox CakePHP Style</span>'
289303
)); ?>
@@ -293,19 +307,20 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
293307
'div' => false,
294308
'class' => 'btn btn-primary'
295309
)); ?>
296-
<button type="button" class="btn">Cancel</button>
310+
<button type="button" class="btn btn-default">Cancel</button>
297311
</div>
298312
</div>
299313
<?php echo $this->Form->end(); ?>
300314

301315
<pre class="prettyprint"><?php
302316
echo h("<?php echo \$this->Form->create('BoostCake', array(
303317
'inputDefaults' => array(
304-
'div' => 'row',
318+
'div' => 'form-group',
305319
'label' => array(
306320
'class' => 'col col-lg-2 control-label'
307321
),
308-
'wrapInput' => 'col col-lg-10'
322+
'wrapInput' => 'col col-lg-10',
323+
'class' => 'form-control'
309324
),
310325
'class' => 'well form-horizontal'
311326
)); ?>
@@ -346,6 +361,7 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
346361
'type' => 'radio',
347362
'before' => '<label class=\"col col-lg-2 control-label\">Radio</label>',
348363
'legend' => false,
364+
'class' => false,
349365
'options' => array(
350366
1 => 'Option one is this and that—be sure to include why it\'s great',
351367
2 => 'Option two can be something else and selecting it will deselect option one'
@@ -374,25 +390,25 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
374390
'label' => array(
375391
'text' => 'Show Error Message'
376392
),
377-
'class' => 'input-with-feedback',
378393
'placeholder' => 'Password'
379394
)); ?>
380395
<?php echo \$this->Form->input('password', array(
381396
'label' => array(
382397
'text' => 'Hide Error Message'
383398
),
384-
'class' => 'input-with-feedback',
385399
'placeholder' => 'Password',
386400
'errorMessage' => false
387401
)); ?>
388402
<?php echo \$this->Form->input('checkbox', array(
389403
'wrapInput' => 'col col-lg-10 col-offset-2',
390404
'label' => array('class' => null),
405+
'class' => false,
391406
'afterInput' => '<span class=\"help-block\">Checkbox Bootstrap Style</span>'
392407
)); ?>
393408
<?php echo \$this->Form->input('checkbox', array(
394409
'before' => '<label class=\"col col-lg-2 control-label\">Checkbox</label>',
395410
'label' => false,
411+
'class' => false,
396412
'wrapInput' => 'col col-lg-10',
397413
'afterInput' => '<span class=\"help-block\">Checkbox CakePHP Style</span>'
398414
)); ?>
@@ -402,7 +418,7 @@ echo h("<?php echo \$this->Form->create('BoostCake', array(
402418
'div' => false,
403419
'class' => 'btn btn-primary'
404420
)); ?>
405-
<button type=\"button\" class=\"btn\">Cancel</button>
421+
<button type=\"button\" class=\"btn btn-default\">Cancel</button>
406422
</div>
407423
</div>
408424
<?php echo \$this->Form->end(); ?>");
@@ -541,4 +557,3 @@ echo \$this->Session->flash();
541557
</section>
542558
</div>
543559
</div>
544-

0 commit comments

Comments
 (0)