← All changes | blocks/container.php +40 -19 7.13 → 6.28 View file →

		@@ -101,9 +101,9 @@
101	101	{
102	102	$data = $this->data[$this->blockname];
103	103	$admin = MB()->getClass('admin');
104	104
105		- /*foreach($this->fields as $field => $options)
	105	+ foreach($this->fields as $field => $options)
106	106	{
107	107	$default = (isset($options["default"])) ? $options["default"] : '';
108	108	$$field = (isset($data[$field])) ? $data[$field] : $default;
109	109	${$field . "_default"} = $default;
		@@ -108,10 +108,9 @@
108	108	$$field = (isset($data[$field])) ? $data[$field] : $default;
109	109	${$field . "_default"} = $default;
110	110
111	111
112		- } */
113		-
	112	+ }
114	113	$maxbuttons_container_alignments = array(
115	114	'' => '',
116	115	'display: inline-block' => 'display: inline-block',
117	116	'float: left' => 'float: left',
		@@ -119,26 +118,32 @@
119	118	);
120	119
121	120	$icon_url = MB()->get_plugin_url() . 'images/icons/' ;
122	121
123		- $start_block = new maxField('block_start');
124		- $start_block->name = __('container', 'maxbuttons');
125		- $start_block->label = __('Container', 'maxbuttons');
126		- $admin->addField($start_block);
	122	+?>
	123	+ <div class="option-container mb_tab">
	124	+ <div class="title"><?php _e('Container', 'maxbuttons') ?></div>
	125	+ <div class="inside">
	126	+ <?php
127	127
128		-
129	128	$u_container = new maxField('switch');
130	129	$u_container->label = __('Use Container', 'maxbuttons');
131	130	$u_container->name = 'container_enabled';
132	131	$u_container->id = $u_container->name;
133		- $u_container->help = __('Creates a container around the button which pushes other content', 'maxbuttons');
134	132	$u_container->value = 1;
135	133
136	134	$u_container->checked = checked( maxBlocks::getValue('container_enabled'), 1, false);
	135	+ //$u_container->output('start', 'end');
	136	+
137	137	$admin->addField($u_container, 'start', 'end');
138	138
139	139	$fspacer = new maxField('spacer');
	140	+ // $fspacer->id = 'fspace';
	141	+ //$fspacer->name = $fspacer->id;
	142	+ //$fspacer
140	143	$fspacer->name = '';
	144	+ // $fspacer->output('start');
	145	+
141	146	$admin->addField($fspacer, 'start');
142	147
143	148	$wrap_cont = new maxField('switch');
144	149	$wrap_cont->name = 'container_center_div_wrap';
		@@ -145,8 +150,10 @@
145	150	$wrap_cont->id = $wrap_cont->name;
146	151	$wrap_cont->value = 1;
147	152	$wrap_cont->checked = checked( maxBlocks::getValue('container_center_div_wrap'), 1, false);
148	153	$wrap_cont->label = __('Center the container', 'maxbuttons');
	154	+ //$wrap_cont->output('','end');
	155	+
149	156	$admin->addField($wrap_cont, '', 'end');
150	157
151	158	$container_width = new maxField('number');
152	159	$container_width->name = 'container_width';
		@@ -154,9 +161,10 @@
154	161	$container_width->min = 0;
155	162	$container_width->value = maxUtils::strip_px( maxBlocks::getValue('container_width') );
156	163	$container_width->label = __('Width', 'maxbuttons');
157	164	$container_width->inputclass = 'small';
158		- $container_width->after_input = __('px', 'maxbuttons');
	165	+ // $container_width->output('start','end');
	166	+
159	167	$admin->addField($container_width, 'start', 'end');
160	168
161	169	// Margin - trouble
162	170	$ptop = new maxField('number');
		@@ -166,8 +174,11 @@
166	174	$ptop->min = 0;
167	175	$ptop->inputclass = 'tiny';
168	176	$ptop->before_input = '<img src="' . $icon_url . 'p_top.png" title="' . __("Margin Top","maxbuttons") . '" >';
169	177	$ptop->value = maxUtils::strip_px(maxBlocks::getValue('container_margin_top'));
	178	+
	179	+ // $ptop->output('start');
	180	+
170	181	$admin->addField($ptop, 'start');
171	182
172	183	$pright = new maxField('number');
173	184	$pright->id = 'container_margin_right';
		@@ -175,8 +186,10 @@
175	186	$pright->min = 0;
176	187	$pright->inputclass = 'tiny';
177	188	$pright->before_input = '<img src="' . $icon_url . 'p_right.png" class="icon padding" title="' . __("Margin Right","maxbuttons") . '" >';
178	189	$pright->value = maxUtils::strip_px(maxBlocks::getValue('container_margin_right'));
	190	+
	191	+ // $pright->output();
179	192	$admin->addField($pright);
180	193
181	194	$pbottom = new maxField('number');
182	195	$pbottom->id = 'container_margin_bottom';
		@@ -184,10 +197,12 @@
184	197	$pbottom->min = 0;
185	198	$pbottom->inputclass = 'tiny';
186	199	$pbottom->before_input = '<img src="' . $icon_url . 'p_bottom.png" class="icon padding" title="' . __("Margin Bottom","maxbuttons") . '" >';
187	200	$pbottom->value = maxUtils::strip_px(maxBlocks::getValue('container_margin_bottom'));
188		- $admin->addField($pbottom);
189	201
	202	+ // $pbottom->output();
	203	+ $admin->addField($pbottom);
	204	+
190	205	$pleft = new maxField('number');
191	206	$pleft->id = 'container_margin_left';
192	207	$pleft->name = $pleft->id;
193	208	$pleft->min = 0;
		@@ -193,24 +208,30 @@
193	208	$pleft->min = 0;
194	209	$pleft->inputclass = 'tiny';
195	210	$pleft->before_input = '<img src="' . $icon_url . 'p_left.png" class="icon padding" title="' . __("Margin Left","maxbuttons") . '" >';
196	211	$pleft->value = maxUtils::strip_px(maxBlocks::getValue('container_margin_left'));
	212	+
	213	+ //$pleft->output('','end');
197	214	$admin->addField($pleft, '', 'end');
198	215
199		- $align = new maxField('option_select');
	216	+ $align = new maxField('generic');
200	217	$align->label = __('Alignment','maxbuttons');
201	218	$align->name = 'container_alignment';
202	219	$align->id = $align->name;
203		- $align->selected = maxBlocks::getValue('container_alignment');
204		- $align->options = $maxbuttons_container_alignments; // maxUtils::selectify($align->name, $maxbuttons_container_alignments, $align->value);
205		- $align->help = __('Float can help to align the button and other content on the same line', 'maxbuttons');
	220	+ $align->value= maxBlocks::getValue('container_alignment');
	221	+ //$align->setDefault(maxBlocks::getDefault('container_alignment'));
	222	+ $align->content = maxUtils::selectify($align->name, $maxbuttons_container_alignments, $align->value);
	223	+ //$align->output('start', 'end');
	224	+
206	225	$admin->addField($align, 'start', 'end');
207	226
208		- $this->sidebar();
209		- $endblock = new maxField('block_end');
210		- $admin->addField($endblock);
	227	+ $admin->display_fields();
	228	+ ?>
211	229
212		- } // admin_fields
	230	+ </div>
	231	+ </div>
	232	+<?php
	233	+} // admin_fields
213	234
214	235	} // class
215	236
216	237