WP Easy Columns - Version 1.2.1

Version Description

Added 4/5 column support
Added custom CSS logic for the 1/5-4/5 columns
Updated and simplified the visual editor

Release Info

Developer	kcfried
Plugin	WP Easy Columns
Version	1.2.1
Comparing to
See all releases

Code changes from version 1.2 to 1.2.1

Files changed (9) hide show

css/wp-ez-columns.css +5 -1
easy-columns-options.php +31 -0
easy-columns.php +80 -9
readme.txt +16 -3
tinymce/editor_plugin.js +2 -2
tinymce/langs/en.js +4 -4
tinymce/langs/en_US.js +3 -3
tinymce/langs/en_en.js +3 -3
tinymce/window.php +181 -103

css/wp-ez-columns.css CHANGED Viewed

	@@ -21,7 +21,8 @@
21	.wpcol-two-third,
22	.wpcol-one-fifth,
23	.wpcol-two-fifth,
24	- .wpcol-three-fifth

25	{
26	float: left;
27	margin-right: 4%;
	@@ -51,6 +52,9 @@
51	.wpcol-three-fifth {
52	width: 58.4%;
53	}



54	.wpcol-last {
55	clear: right;
56	margin-right: 0;


21	.wpcol-two-third,
22	.wpcol-one-fifth,
23	.wpcol-two-fifth,
24	+ .wpcol-three-fifth,
25	+ .wpcol-four-fifth
26	{
27	float: left;
28	margin-right: 4%;

52	.wpcol-three-fifth {
53	width: 58.4%;
54	}
55	+ .wpcol-four-fifth {
56	+ width: 79.2%;
57	+ }
58	.wpcol-last {
59	clear: right;
60	margin-right: 0;

easy-columns-options.php CHANGED Viewed

@@ -280,6 +280,33 @@ function write_sel($n,$v){
             					</td>
             				</tr>
             			</table>
             			<p>
@@ -321,6 +348,10 @@ function write_sel($n,$v){
             		[wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]<br />
             		[wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]<br />
             		<br />
             		<strong>special columns</strong><br />
             		[wpdiv id="" class="" style=""][/wpdiv] (easily create DIVs in your content without editing HTML)<br />
             		<br />


280	</td>
281	</tr>
282
283	+ <tr>
284	+ <td valign="middle" colspan="6">
285	+ <strong>4/5 Column Options</strong>
286	+ </td>
287	+ </tr>
288	+
289	+ <tr>
290	+ <td valign="middle">
291	+ Width
292	+ </td>
293	+ <td valign="middle" colspan="5">
294	+ <input type="text" id="fourfifth_width" name="fourfifth_width" value="<?php echo $fourfifth_width; ?>" size="6">
295	+
296	+ <?php write_sel('fourfifth_width_type',$fourfifth_width_type); ?>
297	+ </td>
298	+ </tr>
299	+ <tr>
300	+ <td valign="middle">
301	+ Margin
302	+ </td>
303	+ <td valign="middle" colspan="5">
304	+ <input type="text" id="fourfifth_margin" name="fourfifth_margin" value="<?php echo $fourfifth_margin; ?>" size="6">
305	+
306	+ <?php write_sel('fourfifth_margin_type',$fourfifth_margin_type); ?>
307	+ </td>
308	+ </tr>
309	+
310	</table>
311
312	<p>

348	[wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]<br />
349	[wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]<br />
350	<br />
351	+ <strong>4/5 columns</strong><br />
352	+ [wpcol_4fifth id="" class="" style=""][/wpcol_4fifth]<br />
353	+ [wpcol_4fifth_end id="" class="" style=""][/wpcol_4fifth_end]<br />
354	+ <br />
355	<strong>special columns</strong><br />
356	[wpdiv id="" class="" style=""][/wpdiv] (easily create DIVs in your content without editing HTML)<br />
357	<br />

easy-columns.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/*
3	Plugin Name: Easy Columns
4	Plugin URI: http://www.affiliatetechhelp.com/wordpress/easy-columns
5	- Version: v1.2
6	Author: <a href="http://www.affiliatetechhelp.com">Pat Friedl</a>
7	Description: Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them. Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, and 3/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page or post. Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface! For usage and more information, visit <a href="http://www.affiliatetechhelp.com" target="_blank">affiliatetechhelp.com</a>.
8
	@@ -52,6 +52,18 @@ if(!class_exists("EasyColumns")){
52	var $twothird_width_type;
53	var $twothird_margin;
54	var $twothird_margin_type;












55
56	function EasyColumns() { //constructor
57
	@@ -75,6 +87,8 @@ if(!class_exists("EasyColumns")){
75	add_shortcode('wpcol_2fifth_end', array(&$this, 'wpcol_two_fifth_end'));
76	add_shortcode('wpcol_3fifth', array(&$this, 'wpcol_three_fifth'));
77	add_shortcode('wpcol_3fifth_end', array(&$this, 'wpcol_three_fifth_end'));


78	add_shortcode('wpdiv', array(&$this, 'wpcol_div'));
79	add_shortcode('wpcol_divider', array(&$this, 'wpcol_add_divider'));
80	add_shortcode('wpcol_end_right', array(&$this, 'wpcol_end_column_right'));
	@@ -122,6 +136,10 @@ if(!class_exists("EasyColumns")){
122	$this->threefifth_width_type = $options['threefifth_width_type'];
123	$this->threefifth_margin = $options['threefifth_margin'];
124	$this->threefifth_margin_type = $options['threefifth_margin_type'];




125
126	} // end function EasyColumns
127
	@@ -189,6 +207,14 @@ if(!class_exists("EasyColumns")){
189	return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
190	}
191








192	function wpcol_div($atts, $content = null) {
193	return '<div' . $this->wpcol_div_atts($atts,'') . '>' . $this->wpcol_strip_autop($content) . '</div>';
194	}
	@@ -246,13 +272,19 @@ if(!class_exists("EasyColumns")){
246	<?php
247	if($this->use_custom)
248	{
249	- if($this->quarter_width != '' \|\| $this->quarter_margin != '' \|\| ~~$this->onehalf_width != '' \|\|~~
250	- $this->~~onehalf_margin~~ != '' \|\| $this->~~threequarter_width~~ != '' \|\| ~~$this->threequarter_margin != '' \|\|~~
251	- $this->~~onethird_width~~ != '' \|\| $this->~~onethird_margin~~ != '' \|\| ~~$this->twothird_width != ''~~
252	- \|\| $this->~~twothird_margin~~ != '')






253	{
254	?>
255	- <!-- Begin Easy Columns 1.0 Custom CSS -->
256	<style type="text/css" media="screen, projection">
257	<?php
258	if($this->quarter_width != '' \|\| $this->quarter_margin != '')
	@@ -290,10 +322,38 @@ if(!class_exists("EasyColumns")){
290	if($this->twothird_margin != '') { echo 'margin-right:'.$this->twothird_margin.$this->twothird_margin_type.';'; }
291	echo '}';
292	}




























293	?>
294	echo "\n";
295	</style>
296	- <!-- End Easy Columns 1.0 Custom CSS -->
297	<?php
298	}
299	} // end if($this->use_custom)
	@@ -358,7 +418,11 @@ if(!class_exists("EasyColumns")){
358	'threefifth_width' => '',
359	'threefifth_width_type' => '%',
360	'threefifth_margin' => '',
361	- 'threefifth_margin_type' => '%'




362	);
363
364	// get saved options
	@@ -432,7 +496,10 @@ if(!class_exists("EasyColumns")){
432	$options['threefifth_width_type'] = $_POST['threefifth_width_type'];
433	$options['threefifth_margin'] = trim($_POST['threefifth_margin']);
434	$options['threefifth_margin_type'] = $_POST['threefifth_margin_type'];
435	-



436	update_option($this->EasyColumns_DB_option, $options);
437
438	echo '<div class="updated fade"><p>Plugin settings saved.</p></div>';
	@@ -475,6 +542,10 @@ if(!class_exists("EasyColumns")){
475	$threefifth_width_type = $options['threefifth_width_type'];
476	$threefifth_margin = $options['threefifth_margin'];
477	$threefifth_margin_type = $options['threefifth_margin_type'];




478
479	$plugin_url = $this->plugin_url;
480


2	/*
3	Plugin Name: Easy Columns
4	Plugin URI: http://www.affiliatetechhelp.com/wordpress/easy-columns
5	+ Version: v1.2.1
6	Author: <a href="http://www.affiliatetechhelp.com">Pat Friedl</a>
7	Description: Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them. Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, and 3/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page or post. Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface! For usage and more information, visit <a href="http://www.affiliatetechhelp.com" target="_blank">affiliatetechhelp.com</a>.
8

52	var $twothird_width_type;
53	var $twothird_margin;
54	var $twothird_margin_type;
55	+ var $fifth_width;
56	+ var $fifth_width_type;
57	+ var $fifth_margin;
58	+ var $fifth_margin_type;
59	+ var $twofifth_width;
60	+ var $twofifth_width_type;
61	+ var $twofifth_margin;
62	+ var $twofifth_margin_type;
63	+ var $threefifth_width;
64	+ var $threefifth_width_type;
65	+ var $threefifth_margin;
66	+ var $threefifth_margin_type;
67
68	function EasyColumns() { //constructor
69

87	add_shortcode('wpcol_2fifth_end', array(&$this, 'wpcol_two_fifth_end'));
88	add_shortcode('wpcol_3fifth', array(&$this, 'wpcol_three_fifth'));
89	add_shortcode('wpcol_3fifth_end', array(&$this, 'wpcol_three_fifth_end'));
90	+ add_shortcode('wpcol_4fifth', array(&$this, 'wpcol_four_fifth'));
91	+ add_shortcode('wpcol_4fifth_end', array(&$this, 'wpcol_four_fifth_end'));
92	add_shortcode('wpdiv', array(&$this, 'wpcol_div'));
93	add_shortcode('wpcol_divider', array(&$this, 'wpcol_add_divider'));
94	add_shortcode('wpcol_end_right', array(&$this, 'wpcol_end_column_right'));

136	$this->threefifth_width_type = $options['threefifth_width_type'];
137	$this->threefifth_margin = $options['threefifth_margin'];
138	$this->threefifth_margin_type = $options['threefifth_margin_type'];
139	+ $this->fourfifth_width = $options['fourfifth_width'];
140	+ $this->fourfifth_width_type = $options['fourfifth_width_type'];
141	+ $this->fourfifth_margin = $options['fourfifth_margin'];
142	+ $this->fourfifth_margin_type = $options['fourfifth_margin_type'];
143
144	} // end function EasyColumns
145

207	return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
208	}
209
210	+ function wpcol_four_fifth($atts, $content = null) {
211	+ return '<div' . $this->wpcol_div_atts($atts,'wpcol-four-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
212	+ }
213	+
214	+ function wpcol_four_fifth_end($atts, $content = null) {
215	+ return '<div' . $this->wpcol_div_atts($atts,'wpcol-four-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
216	+ }
217	+
218	function wpcol_div($atts, $content = null) {
219	return '<div' . $this->wpcol_div_atts($atts,'') . '>' . $this->wpcol_strip_autop($content) . '</div>';
220	}

272	<?php
273	if($this->use_custom)
274	{
275	+ if($this->quarter_width != '' \|\| $this->quarter_margin != '' \|\|
276	+ $this->onehalf_width != '' \|\| $this->onehalf_margin != '' \|\|
277	+ $this->threequarter_width != '' \|\| $this->threequarter_margin != '' \|\|
278	+ $this->onethird_width != '' \|\| $this->onethird_margin != '' \|\|
279	+ $this->twothird_width != '' \|\| $this->twothird_margin != '' \|\|
280	+ $this->twothird_width != '' \|\| $this->twothird_margin != '' \|\|
281	+ $this->fifth_width != '' \|\| $this->fifth_margin != '' \|\|
282	+ $this->twofifth_width != '' \|\| $this->twofifth_margin != '' \|\|
283	+ $this->threefifth_width != '' \|\| $this->threefifth_margin != '' \|\|
284	+ $this->fourfifth_width != '' \|\| $this->fourfifth_margin != '')
285	{
286	?>
287	+ <!-- Begin Easy Columns 1.2.1 Custom CSS -->
288	<style type="text/css" media="screen, projection">
289	<?php
290	if($this->quarter_width != '' \|\| $this->quarter_margin != '')

322	if($this->twothird_margin != '') { echo 'margin-right:'.$this->twothird_margin.$this->twothird_margin_type.';'; }
323	echo '}';
324	}
325	+ if($this->fifth_width != '' \|\| $this->fifth_margin != '')
326	+ {
327	+ echo '.wpcol-one-fifth {';
328	+ if($this->fifth_width != '') { echo 'width:'.$this->fifth_width.$this->fifth_width_type.'; '; }
329	+ if($this->fifth_margin != '') { echo 'margin-right:'.$this->fifth_margin.$this->fifth_margin_type.';'; }
330	+ echo '}';
331	+ }
332	+ if($this->twofifth_width != '' \|\| $this->twofifth_margin != '')
333	+ {
334	+ echo '.wpcol-two-fifth {';
335	+ if($this->twofifth_width != '') { echo 'width:'.$this->twofifth_width.$this->twofifth_width_type.'; '; }
336	+ if($this->twofifth_margin != '') { echo 'margin-right:'.$this->twofifth_margin.$this->twofifth_margin_type.';'; }
337	+ echo '}';
338	+ }
339	+ if($this->threefifth_width != '' \|\| $this->threefifth_margin != '')
340	+ {
341	+ echo '.wpcol-three-fifth {';
342	+ if($this->threefifth_width != '') { echo 'width:'.$this->threefifth_width.$this->threefifth_width_type.'; '; }
343	+ if($this->threefifth_margin != '') { echo 'margin-right:'.$this->threefifth_margin.$this->threefifth_margin_type.';'; }
344	+ echo '}';
345	+ }
346	+ if($this->fourfifth_width != '' \|\| $this->fourfifth_margin != '')
347	+ {
348	+ echo '.wpcol-four-fifth {';
349	+ if($this->fourfifth_width != '') { echo 'width:'.$this->fourfifth_width.$this->fourfifth_width_type.'; '; }
350	+ if($this->fourfifth_margin != '') { echo 'margin-right:'.$this->fourfifth_margin.$this->fourfifth_margin_type.';'; }
351	+ echo '}';
352	+ }
353	?>
354	echo "\n";
355	</style>
356	+ <!-- End Easy Columns 1.2.1 Custom CSS -->
357	<?php
358	}
359	} // end if($this->use_custom)

418	'threefifth_width' => '',
419	'threefifth_width_type' => '%',
420	'threefifth_margin' => '',
421	+ 'threefifth_margin_type' => '%',
422	+ 'fourfifth_width' => '',
423	+ 'fourfifth_width_type' => '%',
424	+ 'fourfifth_margin' => '',
425	+ 'fourfifth_margin_type' => '%'
426	);
427
428	// get saved options

496	$options['threefifth_width_type'] = $_POST['threefifth_width_type'];
497	$options['threefifth_margin'] = trim($_POST['threefifth_margin']);
498	$options['threefifth_margin_type'] = $_POST['threefifth_margin_type'];
499	+ $options['fourfifth_width'] = trim($_POST['fourfifth_width']);
500	+ $options['fourfifth_width_type'] = $_POST['fourfifth_width_type'];
501	+ $options['fourfifth_margin'] = trim($_POST['fourfifth_margin']);
502	+ $options['fourfifth_margin_type'] = $_POST['fourfifth_margin_type'];
503	update_option($this->EasyColumns_DB_option, $options);
504
505	echo '<div class="updated fade"><p>Plugin settings saved.</p></div>';

542	$threefifth_width_type = $options['threefifth_width_type'];
543	$threefifth_margin = $options['threefifth_margin'];
544	$threefifth_margin_type = $options['threefifth_margin_type'];
545	+ $fourfifth_width = $options['fourfifth_width'];
546	+ $fourfifth_width_type = $options['fourfifth_width_type'];
547	+ $fourfifth_margin = $options['fourfifth_margin'];
548	+ $fourfifth_margin_type = $options['fourfifth_margin_type'];
549
550	$plugin_url = $this->plugin_url;
551

readme.txt CHANGED Viewed

	@@ -5,7 +5,7 @@ Tags: columns, column, grid layout, layout, magazine, page, posts, magazine colu
5
6	Requires at least: 2.7
7	Tested up to: 3.1.3
8	- Stable tag: 1.2
9
10	Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.
11
	@@ -13,7 +13,7 @@ Easy Columns provides the shortcodes to create a grid system or magazine style c
13
14	Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.
15
16	- Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, and 3/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page or post.
17
18	Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface!
19
	@@ -21,8 +21,11 @@ For usage and more information, visit <a href="http://www.affiliatetechhelp.com"
21
22	<b>Example</b>
23	To create content with 3 columns, you would use the shortcodes like this:

24	[wpcol_1third]this is column 1[/wpcol_1third]

25	[wpcol_1third]this is column 2[/wpcol_1third]

26	[wpcol_1third_end]this is column 3[/wpcol_1third_end]
27
28	== Installation ==
	@@ -64,6 +67,10 @@ To create content with 3 columns, you would use the shortcodes like this:
64	[wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]
65	[wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]
66




67	special columns
68	[wpdiv id="" class="" style=""][/wpdiv]
69	(easily create DIVs in your content without editing HTML)
	@@ -90,9 +97,15 @@ Yes, as long as the content isn't larger than the column, otherwise the CSS will
90	Columns can be used in CMS layouts, magazine layouts and squeeze page layouts - it's only limited by your imagination.
91
92	== Upgrade Notice ==






93
94	= 1.2 =
95	- Additional shortcodes added. Please upgrade!
96
97	== Changelog ==
98	= 1.2 =


5
6	Requires at least: 2.7
7	Tested up to: 3.1.3
8	+ Stable tag: 1.2.1
9
10	Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.
11

13
14	Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.
15
16	+ Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, 3/5 and 4/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page or post.
17
18	Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface!
19

21
22	<b>Example</b>
23	To create content with 3 columns, you would use the shortcodes like this:
24	+
25	[wpcol_1third]this is column 1[/wpcol_1third]
26	+
27	[wpcol_1third]this is column 2[/wpcol_1third]
28	+
29	[wpcol_1third_end]this is column 3[/wpcol_1third_end]
30
31	== Installation ==

67	[wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]
68	[wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]
69
70	+ 4/5 columns
71	+ [wpcol_4fifth id="" class="" style=""][/wpcol_4fifth]
72	+ [wpcol_4fifth_end id="" class="" style=""][/wpcol_4fifth_end]
73	+
74	special columns
75	[wpdiv id="" class="" style=""][/wpdiv]
76	(easily create DIVs in your content without editing HTML)

97	Columns can be used in CMS layouts, magazine layouts and squeeze page layouts - it's only limited by your imagination.
98
99	== Upgrade Notice ==
100	+ * Additional shortcodes and fixes - please update!
101	+
102	+ = 1.2.1 =
103	+ * Added 4/5 column support
104	+ * Added custom CSS logic for the 1/5-4/5 columns
105	+ * Updated and simplified the visual editor
106
107	= 1.2 =
108	+ * Additional shortcodes added. Please upgrade!
109
110	== Changelog ==
111	= 1.2 =

tinymce/editor_plugin.js CHANGED Viewed

	@@ -18,8 +18,8 @@
18	ed.addCommand('mceEZColumns', function() {
19	ed.windowManager.open({
20	file : url + '/window.php',
21	- width : ~~400~~ + ed.getLang('ezColumns.delta_width', 0),
22	- height : ~~580~~ + ed.getLang('ezColumns.delta_height', 0),
23	inline : 1
24	}, {
25	plugin_url : url // Plugin absolute URL


18	ed.addCommand('mceEZColumns', function() {
19	ed.windowManager.open({
20	file : url + '/window.php',
21	+ width : 540 + ed.getLang('ezColumns.delta_width', 0),
22	+ height : 480 + ed.getLang('ezColumns.delta_height', 0),
23	inline : 1
24	}, {
25	plugin_url : url // Plugin absolute URL

tinymce/langs/en.js CHANGED Viewed

@@ -1,4 +1,4 @@
-            -
            tinyMCE.addI18n({en:{
-            -
            cookieJar:{
-            -
            desc : 'Drop an Affiliate Cookie'
-            -
            }}});


1	+ tinyMCE.addI18n({en:{
2	+ cookieJar:{
3	+ desc : 'Drop an Affiliate Cookie'
4	+ }}});

tinymce/langs/en_US.js CHANGED Viewed

@@ -1,4 +1,4 @@
-            -
            tinyMCE.addI18n({en_US:{
-            -
            cookieJar:{
-            -
            desc : 'Drop an Affiliate Cookie'
             }}});


1	+ tinyMCE.addI18n({en_US:{
2	+ cookieJar:{
3	+ desc : 'Drop an Affiliate Cookie'
4	}}});

tinymce/langs/en_en.js CHANGED Viewed

@@ -1,4 +1,4 @@
-            -
            tinyMCE.addI18n({en_US:{
-            -
            cookieJar:{
-            -
            desc : 'Drop an Affiliate Cookie'
             }}});


1	+ tinyMCE.addI18n({en_US:{
2	+ cookieJar:{
3	+ desc : 'Drop an Affiliate Cookie'
4	}}});

tinymce/window.php CHANGED Viewed

@@ -57,6 +57,9 @@ function insertColumns(col) {
             		case 'threefifths':
             			colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
             			break;
             		case '4quarter':
             			colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
             			colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
@@ -110,6 +113,16 @@ function insertColumns(col) {
             			colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
             			colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
             			break;
             		case '2fifth3fifth':
             			colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
             			colTxt += '[wpcol_3fifth_end id="" class="" style=""]Three Fifths Column[/wpcol_3fifth_end] ';
@@ -118,10 +131,24 @@ function insertColumns(col) {
             			colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
             			colTxt += '[wpcol_2fifth_end id="" class="" style=""]Two Fifths Column[/wpcol_2fifth_end] ';
             			break;
+            	}
             	insertText();
+            }
             function insertDiv(){
             	colTxt = ' ';
             	divID = document.getElementById('txtID').value;
@@ -203,122 +230,178 @@ select {
             		<div class="panel">
-            -
            			<table border="0" cellpadding="2" cellspacing="0">
-            -
            				<tr>
-            -
            					<td colspan="2" class="hdrRow">
-            -
            						Insert Single Column
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td colspan="2">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('quarter')";><img src="img/quarter.jpg" alt="One Quarter Column"></a>
-            -
            						&nbsp;
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('half')";><img src="img/half.jpg" alt="One Half Column"></a>
-            -
            						&nbsp;
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('threequarter')";><img src="img/threequarter.jpg" alt="One Three Quarter Column"></a>
-            -
            						<br />
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('third')";><img src="img/third.jpg" alt="One Third Column"></a>
-            -
            						&nbsp;
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('twothirds')";><img src="img/twothirds.jpg" alt="One Two Thirds Column"></a>
-            -
            						<br />
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('onefifth')";><img src="img/onefifth.jpg" alt="One One Fifth Column"></a>
-            -
            						&nbsp;
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('twofifths')";><img src="img/twofifth.jpg" alt="One Two Fifths Column"></a>
-            -
            						&nbsp;
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('threefifths')";><img src="img/threefifth.jpg" alt="One Three Fifths Column"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td colspan="2" class="hdrRow">
-            -
            						Insert Columns (1/4, 1/2, 3/4)
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td width="50%" align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('4quarter')";><img src="img/4quarter.jpg" alt="Four Quarter Columns"></a>
-            -
            					</td>
-            -
            					<td width="50%" align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('2half')";><img src="img/2half.jpg" alt="Two Half Columns"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('2quarter1half')";><img src="img/2quarter1half.jpg" alt="Two Quarter &amp; One Half Column"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('1quarter3quarter')";><img src="img/1quarter3quarter.jpg" alt="One Quarter &amp; One Three Quarter Column"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('1half2quarter')";><img src="img/1half2quarter.jpg" alt="One Half &amp; Two Quarter Columns"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('3quarter1quarter')";><img src="img/3quarter1quarter.jpg" alt="One Three Quarter &amp; One Quarter Column"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('quarterhalfquarter')";><img src="img/quarterhalfquarter.jpg" alt="One Quarter, One Half &amp; One Quarter Column"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						&nbsp;
-            -
            					</td>
-            -
            				</tr>
             				<tr>
             					<td class="hdrRow">
-            -
            						Insert Columns (1/3, 2/3)
             					</td>
             					<td class="hdrRow">
-            -
            						Insert Columns (1/5, 2/5, 3/5)
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('3third')";><img src="img/3third.jpg" alt="Three One Third Columns"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('5fifth')";><img src="img/5fifth.jpg" alt="Five One Fifth Columns"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('1third2third')";><img src="img/1third2third.jpg" alt="One Third &amp; One Two Thirds Column"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('2fifth3fifth')";><img src="img/2fifth3fifth.jpg" alt="One Two Fifths &amp; One Three Fifths Column"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            				<tr>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('2third1third')";><img src="img/2third1third.jpg" alt="One Two Thirds &amp; One Third Column"></a>
-            -
            					</td>
-            -
            					<td align="center">
-            -
            						<a href="javascript:void(0);" onclick="insertColumns('3fifth2fifth')";><img src="img/3fifth2fifth.jpg" alt="One Three Fifths &amp; One Two Fifths Column"></a>
-            -
            					</td>
-            -
            				</tr>
-            -
            			</table>
-            -
-            -
            			<table border="0" cellpadding="2" cellspacing="0">
-            -
            				<tr>
-            -
            					<td colspan="2" class="hdrRow">
             						Insert Clear Div
             					</td>
             				</tr>
             				<tr>
-            -
            					<td align="center">
             						<select id="selClearType">
             							<option value="left" selected="selected">left</option>
             							<option value="right">right</option>
             							<option value="both">both</option>
             							<option value="divider">divider</option>
             						</select>
-            -
            					</td>
-            -
            					<td>
             						<input type="button" id="insert" name="insert" value="Insert" onclick="insertClear();" />
             					</td>
             				</tr>
             			</table>
             			<table border="0" cellpadding="2" cellspacing="0">
             				<tr>
             					<td colspan="4" class="hdrRow">
@@ -358,11 +441,6 @@ select {
             		<div style="float: left">
             			<input type="button" id="cancel" name="cancel" value="Cancel" onclick="tinyMCEPopup.close();" />
             		</div>
-            -
            		<!--
-            -
            		<div style="float: right">
-            -
            			<input type="submit" id="insert" name="insert" value="Insert" onclick="insertAffiliateCookie();" />
-            -
            		</div>
-            -
            		-->
             	</div><!-- mceActionPanel -->
             </form>


57	case 'threefifths':
58	colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
59	break;
60	+ case 'fourfifths':
61	+ colTxt += '[wpcol_4fifth id="" class="" style=""]Four Fifths Column[/wpcol_4fifth] ';
62	+ break;
63	case '4quarter':
64	colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
65	colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';

113	colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
114	colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
115	break;
116	+ case '21fifth3fifth':
117	+ colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
118	+ colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
119	+ colTxt += '[wpcol_3fifth_end id="" class="" style=""]Three Fifths Column[/wpcol_3fifth_end] ';
120	+ break;
121	+ case '3fifth21fifth':
122	+ colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
123	+ colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
124	+ colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
125	+ break;
126	case '2fifth3fifth':
127	colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
128	colTxt += '[wpcol_3fifth_end id="" class="" style=""]Three Fifths Column[/wpcol_3fifth_end] ';

131	colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
132	colTxt += '[wpcol_2fifth_end id="" class="" style=""]Two Fifths Column[/wpcol_2fifth_end] ';
133	break;
134	+ case '1fifth4fifth':
135	+ colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
136	+ colTxt += '[wpcol_4fifth_end id="" class="" style=""]Four Fifths Column[/wpcol_4fifth_end] ';
137	+ break;
138	+ case '4fifth1fifth':
139	+ colTxt += '[wpcol_4fifth id="" class="" style=""]Four Fifths Column[/wpcol_4fifth] ';
140	+ colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
141	+ break;
142	}
143	insertText();
144	}
145
146	+ function singleInsert(){
147	+ sel = document.getElementById("selSingles");
148	+ selVal = sel.options[sel.selectedIndex].value;
149	+ insertColumns(selVal);
150	+ }
151	+
152	function insertDiv(){
153	colTxt = ' ';
154	divID = document.getElementById('txtID').value;

230
231	<div class="panel">
232
233	+ <table border="0" cellpadding="2" cellspacing="0" width="100%">
234	+ <tr>
235	+ <td class="hdrRow" colspan="3">
236	+ <h3>Insert Column Combinations</h3>
237	+ </td>
238	+ </tr>
239	+ <tr>
240	+ <td valign="top" align="center" width="31%">
241	+
242	+ <!-- third columns -->
243	+ <table border="0" cellpadding="2" cellspacing="0">
244	+ <tr>
245	+ <td class="hdrRow" align="center">
246	+ 1/3, 2/3 Columns
247	+ </td>
248	+ </tr>
249	+ <tr>
250	+ <td align="center">
251	+ <a href="javascript:void(0);" onclick="insertColumns('3third')"><img src="img/3third.jpg" alt="Three One Third Columns"></a>
252	+ </td>
253	+ </tr>
254	+ <tr>
255	+ <td align="center">
256	+ <a href="javascript:void(0);" onclick="insertColumns('1third2third')"><img src="img/1third2third.jpg" alt="One Third & One Two Thirds Column"></a>
257	+ </td>
258	+ </tr>
259	+ <tr>
260	+ <td align="center">
261	+ <a href="javascript:void(0);" onclick="insertColumns('2third1third')"><img src="img/2third1third.jpg" alt="One Two Thirds & One Third Column"></a>
262	+ </td>
263	+ </tr>
264	+ </table>
265	+
266	+ </td>
267	+ <td valign="top" align="center" width="31%">
268	+
269	+ <!-- quarter columns -->
270	+ <table border="0" cellpadding="2" cellspacing="0" class="colSelect">
271	+ <tr>
272	+ <td class="hdrRow" align="center">
273	+ 1/4, 1/2, 3/4 Columns
274	+ </td>
275	+ </tr>
276	+ <tr>
277	+ <td width="50%" align="center">
278	+ <a href="javascript:void(0);" onclick="insertColumns('4quarter')"><img src="img/4quarter.jpg" alt="Four Quarter Columns"></a>
279	+ </td>
280	+ </tr>
281	+ <tr>
282	+ <td align="center">
283	+ <a href="javascript:void(0);" onclick="insertColumns('2quarter1half')"><img src="img/2quarter1half.jpg" alt="Two Quarter & One Half Column"></a>
284	+ </td>
285	+ </tr>
286	+ <tr>
287	+ <td align="center">
288	+ <a href="javascript:void(0);" onclick="insertColumns('1half2quarter')"><img src="img/1half2quarter.jpg" alt="One Half & Two Quarter Columns"></a>
289	+ </td>
290	+ </tr>
291	+ <tr>
292	+ <td align="center">
293	+ <a href="javascript:void(0);" onclick="insertColumns('quarterhalfquarter')"><img src="img/quarterhalfquarter.jpg" alt="One Quarter, One Half & One Quarter Column"></a>
294	+ </td>
295	+ </tr>
296	+ <tr>
297	+ <td width="50%" align="center">
298	+ <a href="javascript:void(0);" onclick="insertColumns('2half')"><img src="img/2half.jpg" alt="Two Half Columns"></a>
299	+ </td>
300	+ </tr>
301	+ <tr>
302	+ <td align="center">
303	+ <a href="javascript:void(0);" onclick="insertColumns('1quarter3quarter')"><img src="img/1quarter3quarter.jpg" alt="One Quarter & One Three Quarter Column"></a>
304	+ </td>
305	+ </tr>
306	+ <tr>
307	+ <td align="center">
308	+ <a href="javascript:void(0);" onclick="insertColumns('3quarter1quarter')"><img src="img/3quarter1quarter.jpg" alt="One Three Quarter & One Quarter Column"></a>
309	+ </td>
310	+ </tr>
311	+ </table>
312	+
313	+ </td>
314	+ <td valign="top" align="center" width="38%">
315	+
316	+ <!-- fifth columns -->
317	+ <table border="0" cellpadding="2" cellspacing="0">
318	+ <tr>
319	+ <td class="hdrRow" align="center">
320	+ 1/5, 2/5, 3/5, 4/5 Columns
321	+ </td>
322	+ </tr>
323	+ <tr>
324	+ <td align="center">
325	+ <a href="javascript:void(0);" onclick="insertColumns('5fifth')"><img src="img/5fifth.jpg" alt="Five One Fifth Columns"></a>
326	+ </td>
327	+ </tr>
328	+ <tr>
329	+ <td align="center">
330	+ <a href="javascript:void(0);" onclick="insertColumns('21fifth3fifth')"><img src="img/21fifth3fifth.jpg" alt="Two One Fifth & One Three Fifths Column"></a>
331	+ </td>
332	+ </tr>
333	+ <tr>
334	+ <td align="center">
335	+ <a href="javascript:void(0);" onclick="insertColumns('3fifth21fifth')"><img src="img/3fifth21fifth.jpg" alt="One Three Fifths & Two One Fifth Columns"></a>
336	+ </td>
337	+ </tr>
338	+ <tr>
339	+ <td align="center">
340	+ <a href="javascript:void(0);" onclick="insertColumns('2fifth3fifth')"><img src="img/2fifth3fifth.jpg" alt="One Two Fifths & One Three Fifths Column"></a>
341	+ </td>
342	+ </tr>
343	+ <tr>
344	+ <td align="center">
345	+ <a href="javascript:void(0);" onclick="insertColumns('3fifth2fifth')"><img src="img/3fifth2fifth.jpg" alt="One Three Fifths & One Two Fifths Column"></a>
346	+ </td>
347	+ </tr>
348	+ <tr>
349	+ <td align="center">
350	+ <a href="javascript:void(0);" onclick="insertColumns('4fifth1fifth')"><img src="img/4fifth1fifth.jpg" alt="One Four Fifths & One Fifth Column"></a>
351	+ </td>
352	+ </tr>
353	+ <tr>
354	+ <td align="center">
355	+ <a href="javascript:void(0);" onclick="insertColumns('1fifth4fifth')"><img src="img/1fifth4fifth.jpg" alt="One Fifth & One Four Fifths Column"></a>
356	+ </td>
357	+ </tr>
358	+ </table>
359	+
360	+ </td>
361	+ </tr>
362	+ </table>
363	+
364	+ <hr>
365	+
366	+ <table border="0" cellpadding="2" cellspacing="0" width="100%">
367	<tr>
368	<td class="hdrRow">
369	+ Insert Single Column
370	</td>
371	<td class="hdrRow">
































372	Insert Clear Div
373	</td>
374	</tr>
375	<tr>
376	+
377	+ <td valign="top">
378	+ <select id="selSingles">
379	+ <option value="quarter">One Quarter Column</option>
380	+ <option value="half">One Half Column</option>
381	+ <option value="threequarter">One Three Quarter Column</option>
382	+ <option value="third">One Third Column</option>
383	+ <option value="twothirds">One Two Thirds Column</option>
384	+ <option value="onefifth">One One Fifth Column</option>
385	+ <option value="twofifths">One Two Fifths Column</option>
386	+ <option value="threefifths">One Three Fifths Column</option>
387	+ <option value="fourfifths">One Four Fifths Column</option>
388	+ </select>
389	+ <input type="button" id="insert" name="insert" value="Insert" onclick="singleInsert()">
390	+ </td>
391	+
392	+ <td valign="top">
393	<select id="selClearType">
394	<option value="left" selected="selected">left</option>
395	<option value="right">right</option>
396	<option value="both">both</option>
397	<option value="divider">divider</option>
398	</select>


399	<input type="button" id="insert" name="insert" value="Insert" onclick="insertClear();" />
400	</td>
401	+
402	</tr>
403	</table>
404	+
405	<table border="0" cellpadding="2" cellspacing="0">
406	<tr>
407	<td colspan="4" class="hdrRow">

441	<div style="float: left">
442	<input type="button" id="cancel" name="cancel" value="Cancel" onclick="tinyMCEPopup.close();" />
443	</div>





444	</div><!-- mceActionPanel -->
445
446	</form>