WordPress.org
Get WordPress

Plugin Directory

Changeset 763400


Ignore:
Timestamp:
08/28/2013 03:53:33 AM (13 years ago)
Author:
kcfried
Message:

Changelog: 2.1

  • Upgraded visual editor window to WP 3.6 compliance
  • Updated styles in the visual editor
  • Streamlined/optimized code
  • Updated CSS to auto-hyphenate long words to they conform to columns widths
  • Migrated shortcodes from 'wpcol_' to 'ezcol_' (no worries, it's backwards compatible)
Location:
easy-columns/trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • easy-columns/trunk/easy-columns-options.php

    r399963 r763400  
    1414<div class="wrap" style="max-width:950px !important;">
    1515
    16     <a href="http://www.affiliatetechhelp.com/wordpress/easy-columns" target="_blank">
    17         <img src="<?php echo $plugin_url; ?>/img/easy-column-logo.jpg" alt="Easy Columns - take control of your layout" style="margin:10px 0px 5px 0px;border:none;">
     16    <a href="http://www.patrickfriedl.com.com/wordpress/easy-columns" target="_blank">
     17        <img src="<?php echo EZC_PLUGIN_URL; ?>/img/easy-column-logo.jpg" alt="Easy Columns - take control of your layout" style="margin:10px 0px 5px 0px;border:none;">
    1818    </a>
    1919
    2020<div id="paypal-float" style="float:right;margin-top:10px;width:260px;padding-top:8px;">
    21     <img src="<?php echo $plugin_url; ?>/img/coffee.jpg" style="float:left;margin:-8px 8px 8px 0px;">
     21    <img src="<?php echo EZC_PLUGIN_URL; ?>/img/coffee.jpg" style="float:left;margin:-8px 8px 8px 0px;">
    2222    Like Easy Columns?<br />
    2323    Say, then how about a cup o' coffee?<br />
    … …  
    5151    <br />
    5252
    53     <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.affiliatetechhelp.com%2Fwordpress%2Feasy-columns&amp;layout=standard&amp;show_faces=true&amp;width=450&amp;action=like&amp;font=lucida+grande&amp;colorscheme=light&amp;height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:80px;" allowTransparency="true"></iframe>
     53    <!--<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.patrickfriedl.com.com%2Fwordpress%2Feasy-columns&amp;layout=standard&amp;show_faces=true&amp;width=450&amp;action=like&amp;font=lucida+grande&amp;colorscheme=light&amp;height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:80px;" allowTransparency="true"></iframe>-->
    5454
    5555    <div class="dbx-content">
    … …  
    7272                    </td>
    7373                    <td valign="middle">
    74                         <?php if($use_custom){ ?>
     74                        <?php if($this->options['use_custom']){ ?>
    7575                        <input type="checkbox" id="use_custom" name="use_custom" value="true" checked="checked">
    7676                        <?php } else { ?>
    … …  
    104104                    </td>
    105105                    <td valign="middle">
    106                         <input type="text" id="quarter_width" name="quarter_width" value="<?php echo $quarter_width; ?>" size="6">
    107                         &nbsp;
    108                         <?php write_sel('quarter_width_type',$quarter_width_type); ?>
    109                     </td>
    110                     <td valign="middle">
    111                         Width
    112                     </td>
    113                     <td valign="middle">
    114                         <input type="text" id="onehalf_width" name="onehalf_width" value="<?php echo $onehalf_width; ?>" size="6">
    115                         &nbsp;
    116                         <?php write_sel('onehalf_width_type',$onehalf_width_type); ?>
    117                     </td>
    118                     <td valign="middle">
    119                         Width
    120                     </td>
    121                     <td valign="middle">
    122                         <input type="text" id="threequarter_width" name="threequarter_width" value="<?php echo $threequarter_width; ?>" size="6">
    123                         &nbsp;
    124                         <?php write_sel('threequarter_width_type',$threequarter_width_type); ?>
    125                     </td>
    126                 </tr>
    127 
    128                 <tr>
    129                     <td valign="middle">
    130                         Margin
    131                     </td>
    132                     <td valign="middle">
    133                         <input type="text" id="quarter_margin" name="quarter_margin" value="<?php echo $quarter_margin; ?>" size="6">
    134                         &nbsp;
    135                         <?php write_sel('quarter_margin_type',$quarter_margin_type); ?>
    136                     </td>
    137                     <td valign="middle">
    138                         Margin
    139                     </td>
    140                     <td valign="middle">
    141                         <input type="text" id="onehalf_margin" name="onehalf_margin" value="<?php echo $onehalf_margin; ?>" size="6">
    142                         &nbsp;
    143                         <?php write_sel('onehalf_margin_type',$onehalf_margin_type); ?>
    144                     </td>
    145                     <td valign="middle">
    146                         Margin
    147                     </td>
    148                     <td valign="middle">
    149                         <input type="text" id="threequarter_margin" name="threequarter_margin" value="<?php echo $threequarter_margin; ?>" size="6">
    150                         &nbsp;
    151                         <?php write_sel('threequarter_margin_type',$threequarter_margin_type); ?>
     106                        <input type="text" id="quarter_width" name="quarter_width" value="<?php echo $this->options['quarter_width']; ?>" size="6">
     107                        &nbsp;
     108                        <?php write_sel('quarter_width_type',$this->options['quarter_width_type']); ?>
     109                    </td>
     110                    <td valign="middle">
     111                        Width
     112                    </td>
     113                    <td valign="middle">
     114                        <input type="text" id="onehalf_width" name="onehalf_width" value="<?php echo $this->options['onehalf_width']; ?>" size="6">
     115                        &nbsp;
     116                        <?php write_sel('onehalf_width_type',$this->options['onehalf_width_type']); ?>
     117                    </td>
     118                    <td valign="middle">
     119                        Width
     120                    </td>
     121                    <td valign="middle">
     122                        <input type="text" id="threequarter_width" name="threequarter_width" value="<?php echo $this->options['threequarter_width']; ?>" size="6">
     123                        &nbsp;
     124                        <?php write_sel('threequarter_width_type',$this->options['threequarter_width_type']); ?>
     125                    </td>
     126                </tr>
     127
     128                <tr>
     129                    <td valign="middle">
     130                        Margin
     131                    </td>
     132                    <td valign="middle">
     133                        <input type="text" id="quarter_margin" name="quarter_margin" value="<?php echo $this->options['quarter_margin']; ?>" size="6">
     134                        &nbsp;
     135                        <?php write_sel('quarter_margin_type',$this->options['quarter_margin_type']); ?>
     136                    </td>
     137                    <td valign="middle">
     138                        Margin
     139                    </td>
     140                    <td valign="middle">
     141                        <input type="text" id="onehalf_margin" name="onehalf_margin" value="<?php echo $this->options['onehalf_margin']; ?>" size="6">
     142                        &nbsp;
     143                        <?php write_sel('onehalf_margin_type',$this->options['onehalf_margin_type']); ?>
     144                    </td>
     145                    <td valign="middle">
     146                        Margin
     147                    </td>
     148                    <td valign="middle">
     149                        <input type="text" id="threequarter_margin" name="threequarter_margin" value="<?php echo $this->options['threequarter_margin']; ?>" size="6">
     150                        &nbsp;
     151                        <?php write_sel('threequarter_margin_type',$this->options['threequarter_margin_type']); ?>
    152152                    </td>
    153153                </tr>
    … …  
    174174                    </td>
    175175                    <td valign="middle">
    176                         <input type="text" id="onethird_width" name="onethird_width" value="<?php echo $onethird_width; ?>" size="6">
    177                         &nbsp;
    178                         <?php write_sel('onethird_width_type',$onethird_width_type); ?>
    179                     </td>
    180                     <td valign="middle">
    181                         Width
    182                     </td>
    183                     <td valign="middle">
    184                         <input type="text" id="twothird_width" name="twothird_width" value="<?php echo $twothird_width; ?>" size="6">
    185                         &nbsp;
    186                         <?php write_sel('twothird_width_type',$twothird_width_type); ?>
     176                        <input type="text" id="onethird_width" name="onethird_width" value="<?php echo $this->options['onethird_width']; ?>" size="6">
     177                        &nbsp;
     178                        <?php write_sel('onethird_width_type',$this->options['onethird_width_type']); ?>
     179                    </td>
     180                    <td valign="middle">
     181                        Width
     182                    </td>
     183                    <td valign="middle">
     184                        <input type="text" id="twothird_width" name="twothird_width" value="<?php echo $this->options['twothird_width']; ?>" size="6">
     185                        &nbsp;
     186                        <?php write_sel('twothird_width_type',$this->options['twothird_width_type']); ?>
    187187                    </td>
    188188                    <td colspan="2">
    … …  
    195195                    </td>
    196196                    <td valign="middle">
    197                         <input type="text" id="onethird_margin" name="onethird_margin" value="<?php echo $onethird_margin; ?>" size="6">
    198                         &nbsp;
    199                         <?php write_sel('onethird_margin_type',$onethird_margin_type); ?>
    200                     </td>
    201                     <td valign="middle">
    202                         Margin
    203                     </td>
    204                     <td valign="middle">
    205                         <input type="text" id="twothird_margin" name="twothird_margin" value="<?php echo $twothird_margin; ?>" size="6">
    206                         &nbsp;
    207                         <?php write_sel('twothird_margin_type',$twothird_margin_type); ?>
     197                        <input type="text" id="onethird_margin" name="onethird_margin" value="<?php echo $this->options['onethird_margin']; ?>" size="6">
     198                        &nbsp;
     199                        <?php write_sel('onethird_margin_type',$this->options['onethird_margin_type']); ?>
     200                    </td>
     201                    <td valign="middle">
     202                        Margin
     203                    </td>
     204                    <td valign="middle">
     205                        <input type="text" id="twothird_margin" name="twothird_margin" value="<?php echo $this->options['twothird_margin']; ?>" size="6">
     206                        &nbsp;
     207                        <?php write_sel('twothird_margin_type',$this->options['twothird_margin_type']); ?>
    208208                    </td>
    209209                    <td valign="middle" colspan="2">
    … …  
    233233                    </td>
    234234                    <td valign="middle">
    235                         <input type="text" id="onefifth_width" name="onefifth_width" value="<?php echo $onefifth_width; ?>" size="6">
    236                         &nbsp;
    237                         <?php write_sel('onefifth_width_type',$onefifth_width_type); ?>
    238                     </td>
    239                     <td valign="middle">
    240                         Width
    241                     </td>
    242                     <td valign="middle">
    243                         <input type="text" id="twofifth_width" name="twofifth_width" value="<?php echo $twofifth_width; ?>" size="6">
    244                         &nbsp;
    245                         <?php write_sel('twofifth_width_type',$twofifth_width_type); ?>
    246                     </td>
    247                     <td valign="middle">
    248                         Width
    249                     </td>
    250                     <td valign="middle">
    251                         <input type="text" id="threefifth_width" name="threefifth_width" value="<?php echo $threefifth_width; ?>" size="6">
    252                         &nbsp;
    253                         <?php write_sel('threefifth_width_type',$threefifth_width_type); ?>
    254                     </td>
    255                 </tr>
    256                 <tr>
    257                     <td valign="middle">
    258                         Margin
    259                     </td>
    260                     <td valign="middle">
    261                         <input type="text" id="onefifth_margin" name="onefifth_margin" value="<?php echo $onefifth_margin; ?>" size="6">
    262                         &nbsp;
    263                         <?php write_sel('onefifth_margin_type',$onefifth_margin_type); ?>
    264                     </td>
    265                     <td valign="middle">
    266                         Margin
    267                     </td>
    268                     <td valign="middle">
    269                         <input type="text" id="twofifth_margin" name="twofifth_margin" value="<?php echo $twofifth_margin; ?>" size="6">
    270                         &nbsp;
    271                         <?php write_sel('twofifth_margin_type',$twofifth_margin_type); ?>
    272                     </td>
    273                     <td valign="middle">
    274                         Margin
    275                     </td>
    276                     <td valign="middle">
    277                         <input type="text" id="threefifth_margin" name="threefifth_margin" value="<?php echo $threefifth_margin; ?>" size="6">
    278                         &nbsp;
    279                         <?php write_sel('threefifth_margin_type',$threefifth_margin_type); ?>
     235                        <input type="text" id="onefifth_width" name="onefifth_width" value="<?php echo $this->options['onefifth_width']; ?>" size="6">
     236                        &nbsp;
     237                        <?php write_sel('onefifth_width_type',$this->options['onefifth_width_type']); ?>
     238                    </td>
     239                    <td valign="middle">
     240                        Width
     241                    </td>
     242                    <td valign="middle">
     243                        <input type="text" id="twofifth_width" name="twofifth_width" value="<?php echo $this->options['twofifth_width']; ?>" size="6">
     244                        &nbsp;
     245                        <?php write_sel('twofifth_width_type',$this->options['twofifth_width_type']); ?>
     246                    </td>
     247                    <td valign="middle">
     248                        Width
     249                    </td>
     250                    <td valign="middle">
     251                        <input type="text" id="threefifth_width" name="threefifth_width" value="<?php echo $this->options['threefifth_width']; ?>" size="6">
     252                        &nbsp;
     253                        <?php write_sel('threefifth_width_type',$this->options['threefifth_width_type']); ?>
     254                    </td>
     255                </tr>
     256                <tr>
     257                    <td valign="middle">
     258                        Margin
     259                    </td>
     260                    <td valign="middle">
     261                        <input type="text" id="onefifth_margin" name="onefifth_margin" value="<?php echo $this->options['onefifth_margin']; ?>" size="6">
     262                        &nbsp;
     263                        <?php write_sel('onefifth_margin_type',$this->options['onefifth_margin_type']); ?>
     264                    </td>
     265                    <td valign="middle">
     266                        Margin
     267                    </td>
     268                    <td valign="middle">
     269                        <input type="text" id="twofifth_margin" name="twofifth_margin" value="<?php echo $this->options['twofifth_margin']; ?>" size="6">
     270                        &nbsp;
     271                        <?php write_sel('twofifth_margin_type',$this->options['twofifth_margin_type']); ?>
     272                    </td>
     273                    <td valign="middle">
     274                        Margin
     275                    </td>
     276                    <td valign="middle">
     277                        <input type="text" id="threefifth_margin" name="threefifth_margin" value="<?php echo $this->options['threefifth_margin']; ?>" size="6">
     278                        &nbsp;
     279                        <?php write_sel('threefifth_margin_type',$this->options['threefifth_margin_type']); ?>
    280280                    </td>
    281281                </tr>
    … …  
    292292                    </td>
    293293                    <td valign="middle" colspan="5">
    294                         <input type="text" id="fourfifth_width" name="fourfifth_width" value="<?php echo $fourfifth_width; ?>" size="6">
    295                         &nbsp;
    296                         <?php write_sel('fourfifth_width_type',$fourfifth_width_type); ?>
     294                        <input type="text" id="fourfifth_width" name="fourfifth_width" value="<?php echo $this->options['fourfifth_width']; ?>" size="6">
     295                        &nbsp;
     296                        <?php write_sel('fourfifth_width_type',$this->options['fourfifth_width_type']); ?>
    297297                    </td>
    298298                </tr>
    … …  
    302302                    </td>
    303303                    <td valign="middle" colspan="5">
    304                         <input type="text" id="fourfifth_margin" name="fourfifth_margin" value="<?php echo $fourfifth_margin; ?>" size="6">
    305                         &nbsp;
    306                         <?php write_sel('fourfifth_margin_type',$fourfifth_margin_type); ?>
     304                        <input type="text" id="fourfifth_margin" name="fourfifth_margin" value="<?php echo $this->options['fourfifth_margin']; ?>" size="6">
     305                        &nbsp;
     306                        <?php write_sel('fourfifth_margin_type',$this->options['fourfifth_margin_type']); ?>
    307307                    </td>
    308308                </tr>
    … …  
    318318        <h3>Column Shortcodes</h3>
    319319        <strong>1/4 columns</strong><br />
    320         [wpcol_1quarter id="" class="" style=""][/wpcol_1quarter]<br />
    321         [wpcol_1quarter_end id="" class="" style=""][/wpcol_1quarter_end]<br />
     320        [ezcol_1quarter id="" class="" style=""][/ezcol_1quarter]<br />
     321        [ezcol_1quarter_end id="" class="" style=""][/ezcol_1quarter_end]<br />
    322322        <br />
    323323        <strong>1/2 columns</strong><br />
    324         [wpcol_1half id="" class="" style=""][/wpcol_1half]<br />
    325         [wpcol_1half_end id="" class="" style=""][/wpcol_1half_end]<br />
     324        [ezcol_1half id="" class="" style=""][/ezcol_1half]<br />
     325        [ezcol_1half_end id="" class="" style=""][/ezcol_1half_end]<br />
    326326        <br />
    327327        <strong>3/4 columns</strong><br />
    328         [wpcol_3quarter id="" class="" style=""][/wpcol_3quarter]<br />
    329         [wpcol_3quarter_end id="" class="" style=""][/wpcol_3quarter_end]<br />
     328        [ezcol_3quarter id="" class="" style=""][/ezcol_3quarter]<br />
     329        [ezcol_3quarter_end id="" class="" style=""][/ezcol_3quarter_end]<br />
    330330        <br />
    331331        <strong>1/3 columns</strong><br />
    332         [wpcol_1third id="" class="" style=""][/wpcol_1third]<br />
    333         [wpcol_1third_end id="" class="" style=""][/wpcol_1third_end]<br />
     332        [ezcol_1third id="" class="" style=""][/ezcol_1third]<br />
     333        [ezcol_1third_end id="" class="" style=""][/ezcol_1third_end]<br />
    334334        <br />
    335335        <strong>2/3 columns</strong><br />
    336         [wpcol_2third id="" class="" style=""][/wpcol_2third]<br />
    337         [wpcol_2third_end id="" class="" style=""][/wpcol_2third_end]<br />
     336        [ezcol_2third id="" class="" style=""][/ezcol_2third]<br />
     337        [ezcol_2third_end id="" class="" style=""][/ezcol_2third_end]<br />
    338338        <br />
    339339        <strong>1/5 columns</strong><br />
    340         [wpcol_1fifth id="" class="" style=""][/wpcol_1fifth]<br />
    341         [wpcol_1fifth_end id="" class="" style=""][/wpcol_1fifth_end]<br />
     340        [ezcol_1fifth id="" class="" style=""][/ezcol_1fifth]<br />
     341        [ezcol_1fifth_end id="" class="" style=""][/ezcol_1fifth_end]<br />
    342342        <br />
    343343        <strong>2/5 columns</strong><br />
    344         [wpcol_2fifth id="" class="" style=""][/wpcol_2fifth]<br />
    345         [wpcol_2fifth_end id="" class="" style=""][/wpcol_2fifth_end]<br />
     344        [ezcol_2fifth id="" class="" style=""][/ezcol_2fifth]<br />
     345        [ezcol_2fifth_end id="" class="" style=""][/ezcol_2fifth_end]<br />
    346346        <br />
    347347        <strong>3/5 columns</strong><br />
    348         [wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]<br />
    349         [wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]<br />
     348        [ezcol_3fifth id="" class="" style=""][/ezcol_3fifth]<br />
     349        [ezcol_3fifth_end id="" class="" style=""][/ezcol_3fifth_end]<br />
    350350        <br />
    351351        <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 />
     352        [ezcol_4fifth id="" class="" style=""][/ezcol_4fifth]<br />
     353        [ezcol_4fifth_end id="" class="" style=""][/ezcol_4fifth_end]<br />
    354354        <br />
    355355        <strong>special columns</strong><br />
    356         [wpdiv id="" class="" style=""][/wpdiv] (easily create DIVs in your content without editing HTML)<br />
    357         <br />
    358         [wpcol_divider] (clears all floats and creates a 2px high, 100% width div)<br />
    359         [wpcol_end_left] (clears left float)<br />
    360         [wpcol_end_right] (clears right float)<br />
    361         [wpcol_end_both] (clears both)
     356        [ezdiv id="" class="" style=""][/ezdiv] (easily create DIVs in your content without editing raw HTML!)<br />
     357        <br />
     358        [ezcol_divider] (clears all floats and creates a 2px high, 100% width div)<br />
     359        [ezcol_end_left] (clears left float)<br />
     360        [ezcol_end_right] (clears right float)<br />
     361        [ezcol_end_both] (clears both)
    362362
    363363        <p>
    … …  
    366366        </p>
    367367
    368         <h5>Easy Columns plugin by <a href="http://www.affiliatetechhelp.com" target="_blank">AffiliateTechHelp.com</a></h5>
     368        <h5>Easy Columns plugin by <a href="http://www.patrickfriedl.com" target="_blank">PatrickFriedl.com</a></h5>
     369        <h6>If you like Easy Columns, be sure to check out our other plugins
     370            <a href="http://www.fanpageconnect.com" target="_blank">Fanpage Connect</a> to create Facebook fanpages from your blog,
     371            or <a href="http://www.wp-geolocation.com" target="_blank">WP-Geolocation</a> to personalize your content with a user's location.</h6>
    369372
    370373    </div><!-- dbx-content -->

  • easy-columns/trunk/easy-columns.php

    r403470 r763400  
    22/*
    33Plugin Name: Easy Columns
    4 Plugin URI: http://www.affiliatetechhelp.com/wordpress/easy-columns
     4Plugin URI: http://www.patrickfriedl.com/
    55Version: v2.0
    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 
    9 Copyright 2010  AffiliaTetechHelp.com  (email: support[at]affiliatetechhelp[dot]com)
     6Author: <a href="http://www.patrickfriedl.com">Pat Friedl</a>
     7Description: 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 and even in posts! 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.patrickfriedl.com" target="_blank">patrickfriedl.com</a>.
     8
     9Copyright 2013  patrickfriedl.com  (email: support[at]patrickfriedl[dot]com)
    1010
    1111This program is free software; you can redistribute it and/or modify
    … …  
    2929
    3030        var $plugin_url;
    31         var $EasyColumns_DB_option = 'easycol_options';
    32         var $EasyColumns_options;
    33 
    34         var $use_custom;
    35         var $quarter_width;
    36         var $quarter_width_type;
    37         var $quarter_margin;
    38         var $quarter_margin_type;
    39         var $onehalf_width;
    40         var $onehalf_width_type;
    41         var $onehalf_margin;
    42         var $onehalf_margin_type;
    43         var $threequarter_width;
    44         var $threequarter_width_type;
    45         var $threequarter_margin;
    46         var $threequarter_margin_type;
    47         var $onethird_width;
    48         var $onethird_width_type;
    49         var $onethird_margin;
    50         var $onethird_margin_type;
    51         var $twothird_width;
    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;
     31        var $ez_columns_options_name = 'easycol_options';
     32        var $ez_columns_options;
     33        var $options;
    6734
    6835        function EasyColumns() { //constructor
    6936
    70             // define the plugin URL so we can add the CSS
    71             $this->plugin_url  = $this->plugin_url = defined('WP_PLUGIN_URL') ? WP_PLUGIN_URL . '/' . dirname(plugin_basename(__FILE__)) : trailingslashit(get_bloginfo('wpurl')) . PLUGINDIR . '/' . dirname(plugin_basename(__FILE__));
    72 
    73             // define column shortcodes
     37            global $post;
     38
     39            if (!defined('EZC_PLUGIN_NAME'))
     40                define('EZC_PLUGIN_NAME', trim(dirname(plugin_basename(__FILE__)), '/'));
     41            if (!defined('EZC_PLUGIN_DIR'))
     42                define('EZC_PLUGIN_DIR', WP_PLUGIN_DIR . '/' . EZC_PLUGIN_NAME);
     43            if (!defined('EZC_PLUGIN_URL'))
     44                define('EZC_PLUGIN_URL', WP_PLUGIN_URL . '/' . EZC_PLUGIN_NAME);
     45            if (!defined('EZC_PLUGIN_VERSION'))
     46                define('EZC_PLUGIN_VERSION','2.1');
     47            if (!defined('EZC_PLUGIN_TYPE'))
     48                define('EZC_PLUGIN_TYPE','free');
     49
     50            // define OLD column shortcodes
    7451            add_shortcode('wpcol_1half', array(&$this, 'wpcol_one_half'));
    7552            add_shortcode('wpcol_1half_end', array(&$this, 'wpcol_one_half_end'));
    … …  
    9572            add_shortcode('wpcol_end_left', array(&$this, 'wpcol_end_column_left'));
    9673            add_shortcode('wpcol_end_both', array(&$this, 'wpcol_end_column_both'));
    97             // add to tinyMCE
     74
     75            // define NEW column shortcodes
     76            add_shortcode('ezcol_1half', array(&$this, 'wpcol_one_half'));
     77            add_shortcode('ezcol_1half_end', array(&$this, 'wpcol_one_half_end'));
     78            add_shortcode('ezcol_1third', array(&$this, 'wpcol_one_third'));
     79            add_shortcode('ezcol_1third_end', array(&$this, 'wpcol_one_third_end'));
     80            add_shortcode('ezcol_2third', array(&$this, 'wpcol_two_third'));
     81            add_shortcode('ezcol_2third_end', array(&$this, 'wpcol_two_third_end'));
     82            add_shortcode('ezcol_1quarter', array(&$this, 'wpcol_one_quarter'));
     83            add_shortcode('ezcol_1quarter_end', array(&$this, 'wpcol_one_quarter_end'));
     84            add_shortcode('ezcol_3quarter', array(&$this, 'wpcol_three_quarter'));
     85            add_shortcode('ezcol_3quarter_end', array(&$this, 'wpcol_three_quarter_end'));
     86            add_shortcode('ezcol_1fifth', array(&$this, 'wpcol_one_fifth'));
     87            add_shortcode('ezcol_1fifth_end', array(&$this, 'wpcol_one_fifth_end'));
     88            add_shortcode('ezcol_2fifth', array(&$this, 'wpcol_two_fifth'));
     89            add_shortcode('ezcol_2fifth_end', array(&$this, 'wpcol_two_fifth_end'));
     90            add_shortcode('ezcol_3fifth', array(&$this, 'wpcol_three_fifth'));
     91            add_shortcode('ezcol_3fifth_end', array(&$this, 'wpcol_three_fifth_end'));
     92            add_shortcode('ezcol_4fifth', array(&$this, 'wpcol_four_fifth'));
     93            add_shortcode('ezcol_4fifth_end', array(&$this, 'wpcol_four_fifth_end'));
     94            add_shortcode('ezdiv', array(&$this, 'wpcol_div'));
     95            add_shortcode('ezcol_divider', array(&$this, 'wpcol_add_divider'));
     96            add_shortcode('ezcol_end_right', array(&$this, 'wpcol_end_column_right'));
     97            add_shortcode('ezcol_end_left', array(&$this, 'wpcol_end_column_left'));
     98            add_shortcode('ezcol_end_both', array(&$this, 'wpcol_end_column_both'));
     99
     100            // add to tinyMCE, include the window.php file
     101            add_action('wp_ajax_easycolumns_tinymce', array(&$this,'ajax_tinymce'));
    98102            add_action('init', array(&$this, 'add_tinymce'));
    99103            // add admin menu
    … …  
    101105
    102106            // get the options
    103             $options = $this->get_options();
    104 
    105             // assign variables for column styles
    106             $this->use_custom = $options['use_custom'];
    107             $this->quarter_width = $options['quarter_width'];
    108             $this->quarter_width_type = $options['quarter_width_type'];
    109             $this->quarter_margin = $options['quarter_margin'];
    110             $this->quarter_margin_type = $options['quarter_margin_type'];
    111             $this->onehalf_width = $options['onehalf_width'];
    112             $this->onehalf_width_type = $options['onehalf_width_type'];
    113             $this->onehalf_margin = $options['onehalf_margin'];
    114             $this->onehalf_margin_type = $options['onehalf_margin_type'];
    115             $this->threequarter_width = $options['threequarter_width'];
    116             $this->threequarter_width_type = $options['threequarter_width_type'];
    117             $this->threequarter_margin = $options['threequarter_margin'];
    118             $this->threequarter_margin_type = $options['threequarter_margin_type'];
    119             $this->onethird_width = $options['onethird_width'];
    120             $this->onethird_width_type = $options['onethird_width_type'];
    121             $this->onethird_margin = $options['onethird_margin'];
    122             $this->onethird_margin_type = $options['onethird_margin_type'];
    123             $this->twothird_width = $options['twothird_width'];
    124             $this->twothird_width_type = $options['twothird_width_type'];
    125             $this->twothird_margin = $options['twothird_margin'];
    126             $this->twothird_margin_type = $options['twothird_margin_type'];
    127             $this->fifth_width = $options['onefifth_width'];
    128             $this->fifth_width_type = $options['onefifth_width_type'];
    129             $this->fifth_margin = $options['onefifth_margin'];
    130             $this->fifth_margin_type = $options['onefifth_margin_type'];
    131             $this->twofifth_width = $options['twofifth_width'];
    132             $this->twofifth_width_type = $options['twofifth_width_type'];
    133             $this->twofifth_margin = $options['twofifth_margin'];
    134             $this->twofifth_margin_type = $options['twofifth_margin_type'];
    135             $this->threefifth_width = $options['threefifth_width'];
    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'];
     107            $this->options = $this->get_options();
    143108
    144109        } // end function EasyColumns
    145110
    146111        function wpcol_one_half($atts, $content = null) {
    147             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-half') . '>'.$this->wpcol_strip_autop($content).'</div>';
     112            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-half') . '>'.$this->wpcol_strip_autop($content).'</div>';
    148113        }
    149114
    150115        function wpcol_one_half_end($atts, $content = null) {
    151             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-half wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     116            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-half ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    152117        }
    153118
    154119        function wpcol_one_third($atts, $content = null) {
    155             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
     120            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
    156121        }
    157122
    158123        function wpcol_one_third_end($atts, $content = null) {
    159           return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-third wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     124          return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-third ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    160125        }
    161126
    162127        function wpcol_two_third($atts, $content = null) {
    163           return '<div' . $this->wpcol_div_atts($atts,'wpcol-two-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
     128          return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
    164129        }
    165130
    166131        function wpcol_two_third_end($atts, $content = null) {
    167             return '<div' . $this->wpcol_div_atts($atts,'wpcol-two-third wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     132            return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-third ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    168133        }
    169134
    170135        function wpcol_one_quarter($atts, $content = null) {
    171             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
     136            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
    172137        }
    173138
    174139        function wpcol_one_quarter_end($atts, $content = null) {
    175             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-quarter wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     140            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-quarter ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    176141        }
    177142
    178143        function wpcol_three_quarter($atts, $content = null) {
    179             return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
     144            return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
    180145        }
    181146
    182147        function wpcol_three_quarter_end($atts, $content = null) {
    183             return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-quarter wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     148            return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-quarter ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    184149        }
    185150
    186151        function wpcol_one_fifth($atts, $content = null) {
    187             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
     152            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    188153        }
    189154
    190155        function wpcol_one_fifth_end($atts, $content = null) {
    191             return '<div' . $this->wpcol_div_atts($atts,'wpcol-one-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     156            return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    192157        }
    193158
    194159        function wpcol_two_fifth($atts, $content = null) {
    195             return '<div' . $this->wpcol_div_atts($atts,'wpcol-two-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
     160            return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    196161        }
    197162
    198163        function wpcol_two_fifth_end($atts, $content = null) {
    199             return '<div' . $this->wpcol_div_atts($atts,'wpcol-two-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     164            return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    200165        }
    201166
    202167        function wpcol_three_fifth($atts, $content = null) {
    203             return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
     168            return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    204169        }
    205170
    206171        function wpcol_three_fifth_end($atts, $content = null) {
    207             return '<div' . $this->wpcol_div_atts($atts,'wpcol-three-fifth wpcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
     172            return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    208173        }
    209174
    210175        function wpcol_four_fifth($atts, $content = null) {
    211             return '<div' . $this->wpcol_div_atts($atts,'wpcol-four-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
     176            return '<div' . $this->wpcol_div_atts($atts,'ezcol-four-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    212177        }
    213178
    214179        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();
     180            return '<div' . $this->wpcol_div_atts($atts,'ezcol-four-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    216181        }
    217182
    … …  
    221186
    222187        function wpcol_add_divider(){
    223             return '<div class="wpcol-divider"></div>';
     188            return '<div class="ezcol-divider"></div>';
    224189        }
    225190
    226191        function wpcol_end_column_left($atts, $content = null) {
    227            return '<div class="wpcol-left"></div>';
     192           return '<div class="ezcol-left"></div>';
    228193        }
    229194
    230195        function wpcol_end_column_right($atts, $content = null) {
    231            return '<div  class="wpcol-right"></div>';
     196           return '<div  class="ezcol-right"></div>';
    232197        }
    233198
    234199        function wpcol_end_column_both($atts, $content = null) {
    235            return '<div class="wpcol-both"></div>';
     200           return '<div class="ezcol-both"></div>';
    236201        }
    237202
    … …  
    267232        function wpcol_add_css(){
    268233        ?>
    269             <!-- Begin Easy Columns 1.0 by Pat Friedl http://www.affiliatetechhelp.com -->
    270             <link rel="stylesheet" href="<?php echo $this->plugin_url; ?>/css/wp-ez-columns.css?<?php echo time();?>" type="text/css" media="screen, projection" />
    271             <!-- End Easy Columns 1.0 -->
     234            <!-- Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> by Pat Friedl http://www.patrickfriedl.com -->
     235            <link rel="stylesheet" href="<?php echo EZC_PLUGIN_URL; ?>/css/easy-columns.css?<?php echo time();?>" type="text/css" media="screen, projection" />
    272236            <?php
    273237            if($this->use_custom)
    274238            {
    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                 {
     239                if(
     240                    isset($this->options['quarter_width']) || isset($this->options['quarter_margin']) ||
     241                    isset($this->options['onehalf_width']) || isset($this->options['onehalf_margin']) ||
     242                    isset($this->options['threequarter_width']) || isset($this->options['threequarter_margin']) ||
     243                    isset($this->options['onethird_width']) || isset($this->options['onethird_margin']) ||
     244                    isset($this->options['twothird_width']) || isset($this->options['twothird_margin']) ||
     245                    isset($this->options['twothird_width']) || isset($this->options['twothird_margin']) ||
     246                    isset($this->options['fifth_width']) || isset($this->options['fifth_margin']) ||
     247                    isset($this->options['twofifth_width']) || isset($this->options['twofifth_margin']) ||
     248                    isset($this->options['threefifth_width']) || isset($this->options['threefifth_margin']) ||
     249                    isset($this->options['fourfifth_width']) || isset($this->options['fourfifth_margin'])
     250                    ){
    286251                    ?>
    287                     <!-- Begin Easy Columns 1.2.1 Custom CSS -->
     252                    <!-- Begin Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
    288253                    <style type="text/css" media="screen, projection">
    289254                    <?php
    290                     if($this->quarter_width != '' || $this->quarter_margin != '')
    291                     {
    292                         echo '.wpcol-one-quarter {';
    293                         if($this->quarter_width != '') { echo 'width:'.$this->quarter_width.$this->quarter_width_type.'; '; }
    294                         if($this->quarter_margin != '') { echo 'margin-right:'.$this->quarter_margin.$this->quarter_margin_type.';'; }
     255                    if(isset($this->options['quarter_width']) || isset($this->options['quarter_margin']))
     256                    {
     257                        echo '.ezcol-one-quarter {';
     258                        if(isset($this->options['quarter_width'])) { echo 'width:'.$this->options['quarter_width'].$this->options['quarter_width_type'].';'; }
     259                        if(isset($this->options['quarter_margin'])) { echo 'margin-right:'.$this->options['quarter_margin'].$this->options['quarter_margin_type'].';'; }
    295260                        echo '} ';
    296261                    }
    297                     if($this->onehalf_width != '' || $this->onehalf_margin != '')
    298                     {
    299                         echo '.wpcol-one-half {';
    300                         if($this->onehalf_width != '') { echo 'width:'.$this->onehalf_width.$this->onehalf_width_type.'; '; }
    301                         if($this->onehalf_margin != '') { echo 'margin-right:'.$this->onehalf_margin.$this->onehalf_margin_type.';'; }
     262                    if(isset($this->options['onehalf_width']) || isset($this->options['onehalf_margin']))
     263                    {
     264                        echo '.ezcol-one-half {';
     265                        if(isset($this->options['onehalf_width'])) { echo 'width:'.$this->options['onehalf_width'].$this->options['onehalf_width_type'].';'; }
     266                        if(isset($this->options['>onehalf_margin'])) { echo 'margin-right:'.$this->options['onehalf_margin'].$this->options['onehalf_margin_type'].';'; }
    302267                        echo '} ';
    303268                    }
    304                     if($this->threequarter_width != '' || $this->threequarter_margin != '')
    305                     {
    306                         echo '.wpcol-three-quarter {';
    307                         if($this->threequarter_width != '') { echo 'width:'.$this->threequarter_width.$this->threequarter_width_type.'; '; }
    308                         if($this->threequarter_margin != '') { echo 'margin-right:'.$this->threequarter_margin.$this->threequarter_margin_type.';'; }
     269                    if(isset($this->options['threequarter_width']) || isset($this->options['threequarter_margin']))
     270                    {
     271                        echo '.ezcol-three-quarter {';
     272                        if(isset($this->options['threequarter_width'])) { echo 'width:'.$this->options['threequarter_width'].$this->options['threequarter_width_type'].';'; }
     273                        if(isset($this->options['threequarter_margin'])) { echo 'margin-right:'.$this->options['threequarter_margin'].$this->options['threequarter_margin_type'].';'; }
    309274                        echo '} ';
    310275                    }
    311                     if($this->onethird_width != '' || $this->onethird_margin != '')
    312                     {
    313                         echo '.wpcol-one-third {';
    314                         if($this->onethird_width != '') { echo 'width:'.$this->onethird_width.$this->onethird_width_type.'; '; }
    315                         if($this->onethird_margin != '') { echo 'margin-right:'.$this->onethird_margin.$this->onethird_margin_type.';'; }
     276                    if(isset($this->options['onethird_width']) || isset($this->options['onethird_margin']))
     277                    {
     278                        echo '.ezcol-one-third {';
     279                        if(isset($this->options['onethird_width'])) { echo 'width:'.$this->options['onethird_width'].$this->options['onethird_width_type'].';'; }
     280                        if(isset($this->options['onethird_margin'])) { echo 'margin-right:'.$this->options['onethird_margin'].$this->options['onethird_margin_type'].';'; }
    316281                        echo '} ';
    317282                    }
    318                     if($this->twothird_width != '' || $this->twothird_margin != '')
    319                     {
    320                         echo '.wpcol-two-third {';
    321                         if($this->twothird_width != '') { echo 'width:'.$this->twothird_width.$this->twothird_width_type.'; '; }
    322                         if($this->twothird_margin != '') { echo 'margin-right:'.$this->twothird_margin.$this->twothird_margin_type.';'; }
     283                    if(isset($this->options['twothird_width']) || isset($this->options['twothird_margin']))
     284                    {
     285                        echo '.ezcol-two-third {';
     286                        if(isset($this->options['twothird_width'])) { echo 'width:'.$this->options['twothird_width'].$this->options['twothird_width_type'].';'; }
     287                        if(isset($this->options['twothird_margin'])) { echo 'margin-right:'.$this->options['twothird_margin'].$this->options['twothird_margin_type'].';'; }
    323288                        echo '}';
    324289                    }
    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.';'; }
     290                    if(isset($this->options['fifth_width']) || isset($this->options['fifth_margin']))
     291                    {
     292                        echo '.ezcol-one-fifth {';
     293                        if(isset($this->options['fifth_width'])) { echo 'width:'.$this->options['fifth_width'].$this->options['fifth_width_type'].';'; }
     294                        if(isset($this->options['fifth_margin'])) { echo 'margin-right:'.$this->options['fifth_margin'].$this->options['fifth_margin_type'].';'; }
    330295                        echo '}';
    331296                    }
    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.';'; }
     297                    if(isset($this->options['twofifth_width']) || isset($this->options['twofifth_margin']))
     298                    {
     299                        echo '.ezcol-two-fifth {';
     300                        if(isset($this->options['twofifth_width'])) { echo 'width:'.$this->options['twofifth_width'].$this->options['twofifth_width_type'].';'; }
     301                        if(isset($this->options['twofifth_margin'])) { echo 'margin-right:'.$this->options['twofifth_margin'].$this->options['twofifth_margin_type'].';'; }
    337302                        echo '}';
    338303                    }
    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.';'; }
     304                    if(isset($this->options['threefifth_width']) || isset($this->options['threefifth_margin']))
     305                    {
     306                        echo '.ezcol-three-fifth {';
     307                        if(isset($this->options['threefifth_width'])) { echo 'width:'.$this->options['threefifth_width'].$this->options['threefifth_width_type'].'; '; }
     308                        if(isset($this->options['threefifth_margin'])) { echo 'margin-right:'.$this->options['threefifth_margin'].$this->options['threefifth_margin_type'].';'; }
    344309                        echo '}';
    345310                    }
    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.';'; }
     311                    if(isset($this->options['fourfifth_width']) || isset($this->options['fourfifth_margin']))
     312                    {
     313                        echo '.ezcol-four-fifth {';
     314                        if(isset($this->options['fourfifth_width'])) { echo 'width:'.$this->options['fourfifth_width'].$this->options['fourfifth_width_type'].';'; }
     315                        if(isset($this->options['fourfifth_margin'])) { echo 'margin-right:'.$this->options['fourfifth_margin'].$this->options['fourfifth_margin_type'].';'; }
    351316                        echo '}';
    352317                    }
     318                    echo "\n";
    353319                    ?>
    354                     echo "\n";
    355320                    </style>
    356321                    <!-- End Easy Columns 1.2.1 Custom CSS -->
    … …  
    361326
    362327        // begin functions for adding plugin to tinyMCE
     328        function ajax_tinymce() {
     329            if ( !current_user_can('edit_pages') && !current_user_can('edit_posts') ){
     330                die(__("You are not allowed to be here"));
     331            }
     332            include_once(EZC_PLUGIN_URL.'/tinymce/window.php?');
     333        }
    363334        function add_tinymce() {
    364335            if(!current_user_can('edit_posts') && ! current_user_can('edit_pages')) {
    … …  
    371342        }
    372343        function add_tinymce_plugin($plugin_array) {
    373             $plugin_array['ezColumns'] = $this->plugin_url . '/tinymce/editor_plugin.js';
     344            $plugin_array['ezColumns'] = EZC_PLUGIN_URL . '/tinymce/editor_plugin.js';
    374345            return $plugin_array;
    375346        }
    … …  
    427398
    428399            // get saved options
    429             $saved = get_option($this->EasyColumns_DB_option);
     400            $saved = get_option($this->ez_columns_options_name);
    430401
    431402            // assign options
    … …  
    441412            if($saved != $options)
    442413            {
    443                 update_option($this->EasyColumns_DB_option,$options);
     414                update_option($this->ez_columns_options_name,$options);
    444415            }
    445416
    … …  
    453424        function handle_options()
    454425        {
    455             $options = $this->get_options();
     426            $this->options = $this->get_options();
    456427            if (isset($_POST['submitted'])) {
    457428
    458429                //check security
    459430                check_admin_referer('easycol-nonce');
    460 
    461431                $options = array();
    462                 if($_POST['use_custom'] != ''){
    463                     $options['use_custom'] = true;
    464                 } else {
    465                     $options['use_custom'] = false;
     432
     433                foreach($_POST as $key => $value){
     434                    $options[$key] = $value;
    466435                }
    467                 $options['quarter_width'] = trim($_POST['quarter_width']);
    468                 $options['quarter_width_type'] = $_POST['quarter_width_type'];
    469                 $options['quarter_margin'] = trim($_POST['quarter_margin']);
    470                 $options['quarter_margin_type'] = $_POST['quarter_margin_type'];
    471                 $options['onehalf_width'] = trim($_POST['onehalf_width']);
    472                 $options['onehalf_width_type'] = $_POST['onehalf_width_type'];
    473                 $options['onehalf_margin'] = trim($_POST['onehalf_margin']);
    474                 $options['onehalf_margin_type'] = $_POST['onehalf_margin_type'];
    475                 $options['threequarter_width'] = trim($_POST['threequarter_width']);
    476                 $options['threequarter_width_type'] = $_POST['threequarter_width_type'];
    477                 $options['threequarter_margin'] = trim($_POST['threequarter_margin']);
    478                 $options['threequarter_margin_type'] = $_POST['threequarter_margin_type'];
    479                 $options['onethird_width'] = trim($_POST['onethird_width']);
    480                 $options['onethird_width_type'] = $_POST['onethird_width_type'];
    481                 $options['onethird_margin'] = trim($_POST['onethird_margin']);
    482                 $options['onethird_margin_type'] = $_POST['onethird_margin_type'];
    483                 $options['twothird_width'] = trim($_POST['twothird_width']);
    484                 $options['twothird_width_type'] = $_POST['twothird_width_type'];
    485                 $options['twothird_margin'] = trim($_POST['twothird_margin']);
    486                 $options['twothird_margin_type'] = $_POST['twothird_margin_type'];
    487                 $options['onefifth_width'] = trim($_POST['onefifth_width']);
    488                 $options['onefifth_width_type'] = $_POST['onefifth_width_type'];
    489                 $options['onefifth_margin'] = trim($_POST['onefifth_margin']);
    490                 $options['onefifth_margin_type'] = $_POST['onefifth_margin_type'];
    491                 $options['twofifth_width'] = trim($_POST['twofifth_width']);
    492                 $options['twofifth_width_type'] = $_POST['twofifth_width_type'];
    493                 $options['twofifth_margin'] = trim($_POST['twofifth_margin']);
    494                 $options['twofifth_margin_type'] = $_POST['twofifth_margin_type'];
    495                 $options['threefifth_width'] = trim($_POST['threefifth_width']);
    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);
     436                $this->options = $options;
     437                $this->options['use_custom'] = (isset($_POST['use_custom']))? true : false;
     438                update_option($this->ez_columns_options_name, $this->options);
    504439
    505440                echo '<div class="updated fade"><p>Plugin settings saved.</p></div>';
    … …  
    508443            // URL for form submit, equals our current page
    509444            $action_url = $_SERVER['REQUEST_URI'];
    510 
    511             // assign variables for the options page
    512             $use_custom = $options['use_custom'];
    513             $quarter_width = $options['quarter_width'];
    514             $quarter_width_type = $options['quarter_width_type'];
    515             $quarter_margin = $options['quarter_margin'];
    516             $quarter_margin_type = $options['quarter_margin_type'];
    517             $onehalf_width = $options['onehalf_width'];
    518             $onehalf_width_type = $options['onehalf_width_type'];
    519             $onehalf_margin = $options['onehalf_margin'];
    520             $onehalf_margin_type = $options['onehalf_margin_type'];
    521             $threequarter_width = $options['threequarter_width'];
    522             $threequarter_width_type = $options['threequarter_width_type'];
    523             $threequarter_margin = $options['threequarter_margin'];
    524             $threequarter_margin_type = $options['threequarter_margin_type'];
    525             $onethird_width = $options['onethird_width'];
    526             $onethird_width_type = $options['onethird_width_type'];
    527             $onethird_margin = $options['onethird_margin'];
    528             $onethird_margin_type = $options['onethird_margin_type'];
    529             $twothird_width = $options['twothird_width'];
    530             $twothird_width_type = $options['twothird_width_type'];
    531             $twothird_margin = $options['twothird_margin'];
    532             $twothird_margin_type = $options['twothird_margin_type'];
    533             $onefifth_width = $options['onefifth_width'];
    534             $onefifth_width_type = $options['onefifth_width_type'];
    535             $onefifth_margin = $options['onefifth_margin'];
    536             $onefifth_margin_type = $options['onefifth_margin_type'];
    537             $twofifth_width = $options['twofifth_width'];
    538             $twofifth_width_type = $options['twofifth_width_type'];
    539             $twofifth_margin = $options['twofifth_margin'];
    540             $twofifth_margin_type = $options['twofifth_margin_type'];
    541             $threefifth_width = $options['threefifth_width'];
    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;
    551445
    552446            // include the options page
    … …  
    555449
    556450        /*
    557         add option page for Affiliate Cookie Jar
     451        add option page for Easy Columns
    558452        */
    559453        function admin_menu()
    … …  
    568462        {
    569463            // set default options
    570             $EasyColumns_options = $this->get_options();
     464            $this->options = $this->get_options();
    571465        } // end install
    572466
    … …  
    575469        */
    576470        function uninstall() {
    577             delete_option($this->EasyColumns_DB_option);
     471            delete_option($this->ez_columns_options_name);
    578472        } // end uninstall
    579473
    … …  
    585479// initialize the EasyColumns class
    586480if (class_exists("EasyColumns")) {
    587     $wp_wp_columns = new EasyColumns();
     481    $ez_columns = new EasyColumns();
    588482}
    589483
    590484// set up actions and filters
    591 if (isset($wp_wp_columns)) {
    592     add_action('wp_head', array(&$wp_wp_columns, 'wpcol_add_css'), 100);
     485if (isset($ez_columns)) {
     486    add_action('wp_head', array(&$ez_columns, 'wpcol_add_css'), 100);
    593487    if (function_exists('register_uninstall_hook'))
    594488    {
    595         register_uninstall_hook(__FILE__, array(&$wp_wp_columns, 'uninstall'));
     489        register_uninstall_hook(__FILE__, array(&$ez_columns, 'uninstall'));
    596490    }
    597491}

  • easy-columns/trunk/readme.txt

    r403470 r763400  
    11=== WP Easy Columns ===
    22Contributors: Pat Friedl
    3 Donate link: http://www.affiliatetechhelp.com/wordpress/easy-columns
    4 Tags: columns, column, grid layout, layout, magazine, page, posts, magazine columns, magazine layout, float div
     3Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=donations&business=T8V954QPLEW2J
     4Tags: columns, column, grid layout, box, boxes, feature box, layout, magazine, page, posts, magazine columns, magazine layout, float div
     5Requires at least: 2.7
     6Tested up to: 3.6
     7Stable tag: 2.1
    58
    6 Requires at least: 2.7
    7 Tested up to: 3.2
    8 Stable tag: 2.0
    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.
     9Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages (or even posts!) just the way you need them.
    1110
    1211== Description ==
    1312
    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.
     13Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages or posts on demand.
    1514
    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.
     15=Available Columns=
     16Using the shortcodes, you can get any combination of 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.
    1717
    18 Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface!
     18=Easy to Use=
     19Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface. BEst of all, Easy Columns works with ANY theme!
    1920
    20 For usage and more information, visit <a href="http://www.affiliatetechhelp.com" target="_blank">affiliatetechhelp.com</a>.
    21 
    22 <b>Example</b>
     21=Example=
    2322To create content with 3 columns, you would use the shortcodes like this:
    2423
    25 [wpcol_1third]this is column 1[/wpcol_1third]
     24[ezcol_1third]this is column 1[/ezcol_1third]
    2625
    27 [wpcol_1third]this is column 2[/wpcol_1third]
     26[ezcol_1third]this is column 2[/ezcol_1third]
    2827
    29 [wpcol_1third_end]this is column 3[/wpcol_1third_end]
     28[ezcol_1third_end]this is column 3[/ezcol_1third_end]
    3029
    3130== Installation ==
    3231
    33321. Upload `wp-ez-columns` directory to the `/wp-content/plugins/` directory
    34 2. Activate the plugin through the 'Plugins' menu in WordPress
    35 3. Use any of the following shortcodes in your posts or pages:
     332. Activate the plugin through the 'Plugins' menu in WordPress.
     343. You can customize your columns in the settings menu under Settings > Easy Columns
     354. Use any of the following shortcodes in your posts or pages:
    3636   Available Shortcodes:
    3737
    38    1/4 columns
    39    [wpcol_1quarter id="" class="" style=""][/wpcol_1quarter]
    40    [wpcol_1quarter_end id="" class="" style=""][/wpcol_1quarter_end]
     38   **1/4 columns**
     39   [ezcol_1quarter id="" class="" style=""][/ezcol_1quarter]
     40   [ezcol_1quarter_end id="" class="" style=""][/ezcol_1quarter_end]
    4141
    42    1/2 columns
    43    [wpcol_1half id="" class="" style=""][/wpcol_1half]
    44    [wpcol_1half_end id="" class="" style=""][/wpcol_1half_end]
     42   **1/2 columns**
     43   [ezcol_1half id="" class="" style=""][/ezcol_1half]
     44   [ezcol_1half_end id="" class="" style=""][/ezcol_1half_end]
    4545
    46    3/4 columns
    47    [wpcol_3quarter id="" class="" style=""][/wpcol_3quarter]
    48    [wpcol_3quarter_end id="" class="" style=""][/wpcol_3quarter_end]
     46   **3/4 columns**
     47   [ezcol_3quarter id="" class="" style=""][/ezcol_3quarter]
     48   [ezcol_3quarter_end id="" class="" style=""][/ezcol_3quarter_end]
    4949
    50    1/3 columns
    51    [wpcol_1third id="" class="" style=""][/wpcol_1third]
    52    [wpcol_1third_end id="" class="" style=""][/wpcol_1third_end]
     50   **1/3 columns**
     51   [ezcol_1third id="" class="" style=""][/ezcol_1third]
     52   [ezcol_1third_end id="" class="" style=""][/ezcol_1third_end]
    5353
    54    2/3 columns
    55    [wpcol_2third id="" class="" style=""][/wpcol_2third]
    56    [wpcol_2third_end id="" class="" style=""][/wpcol_2third_end]
     54   **2/3 columns**
     55   [ezcol_2third id="" class="" style=""][/ezcol_2third]
     56   [ezcol_2third_end id="" class="" style=""][/ezcol_2third_end]
    5757
    58    1/5 columns
    59    [wpcol_1fifth id="" class="" style=""][/wpcol_1fifth]
    60    [wpcol_1fifth_end id="" class="" style=""][/wpcol_1fifth_end]
     58   **1/5 columns**
     59   [ezcol_1fifth id="" class="" style=""][/ezcol_1fifth]
     60   [ezcol_1fifth_end id="" class="" style=""][/ezcol_1fifth_end]
    6161
    62    2/5 columns
    63    [wpcol_2fifth id="" class="" style=""][/wpcol_2fifth]
    64    [wpcol_2fifth_end id="" class="" style=""][/wpcol_2fifth_end]
     62   **2/5 columns**
     63   [ezcol_2fifth id="" class="" style=""][/ezcol_2fifth]
     64   [ezcol_2fifth_end id="" class="" style=""][/ezcol_2fifth_end]
    6565
    66    3/5 columns
    67    [wpcol_3fifth id="" class="" style=""][/wpcol_3fifth]
    68    [wpcol_3fifth_end id="" class="" style=""][/wpcol_3fifth_end]
     66   **3/5 columns**
     67   [ezcol_3fifth id="" class="" style=""][/ezcol_3fifth]
     68   [ezcol_3fifth_end id="" class="" style=""][/ezcol_3fifth_end]
    6969
    70    4/5 columns
    71    [wpcol_4fifth id="" class="" style=""][/wpcol_4fifth]
    72    [wpcol_4fifth_end id="" class="" style=""][/wpcol_4fifth_end]
     70   **4/5 columns**
     71   [ezcol_4fifth id="" class="" style=""][/ezcol_4fifth]
     72   [ezcol_4fifth_end id="" class="" style=""][/ezcol_4fifth_end]
    7373
    74    special columns
    75    [wpdiv id="" class="" style=""][/wpdiv]
     74   **Special columns**
     75   [ezdiv id="" class="" style=""][/ezdiv]
    7676   (easily create DIVs in your content without editing HTML)
    7777
    78    [wpcol_divider] (clears all floats and creates a 2px high, 100% width div)
    79    [wpcol_end_left] (clears left float)
    80    [wpcol_end_right] (clears right float)
    81    [wpcol_end_both] (clears both)
     78   **Additional shortcodes**
     79   [ezcol_divider] (clears all floats and creates a 2px high, 100% width div)
     80   [ezcol_end_left] (clears left float)
     81   [ezcol_end_right] (clears right float)
     82   [ezcol_end_both] (clears both)
    8283
    8384   ** Be sure to insert the "_end" column shortcode for your last column! **
    … …  
    9596
    9697= What good are columns? =
    97 Columns can be used in CMS layouts, magazine layouts and squeeze page layouts - it's only limited by your imagination.
     98Columns can be used in CMS layouts, as feature boxes, in magazine layouts and **squeeze page layouts** - it's only limited by your imagination.
     99
     100= Can You Create a Pro Version With Multiple Column Styles? =
     101Maybe! If you want that feature, send me an email. I get enough emails and I'll do it!
     102
     103== Screenshots ==
     104
     1051. The Easy Columns settings page.
     1062. The Easy Columns Visual Editor in Page/Post edit.
    98107
    99108== Upgrade Notice ==
    100 * Additional shortcodes and fixes - please update!
     109
     110Upgrade normally via your Wordpress admin -> Plugins panel.
     111
     112== Changelog ==
     113
     114= 2.1 =
     115* Upgraded visual editor window to WP 3.6 compliance
     116* Updated styles in the visual editor
     117* Streamlined/optimized code
     118* Updated CSS to auto-hyphenate long words to they conform to columns widths
     119* Migrated shortcodes from 'wpcol_' to 'ezcol_' (no worries, it's backwards compatible)
    101120
    102121= 2.0 =
    … …  
    113132* Additional shortcodes added. Please upgrade!
    114133
    115 == Changelog ==
    116134= 1.2 =
    117135* Added Support for 1/5, 2/5 and 3/5 columns.

  • easy-columns/trunk/tinymce/editor_plugin.js

    r403470 r763400  
    1818            ed.addCommand('mceEZColumns', function() {
    1919                ed.windowManager.open({
    20                     file : url + '/window.php',
    21                     width : 638 + ed.getLang('ezColumns.delta_width', 0),
    22                     height : 438 + ed.getLang('ezColumns.delta_height', 0),
     20                    file : url + '/window.php?',
     21                    width : 764 + ed.getLang('ezColumns.delta_width', 0),
     22                    height : 500 + ed.getLang('ezColumns.delta_height', 0),
    2323                    inline : 1
    2424                }, {
    … …  
    4848        getInfo : function() {
    4949            return {
    50                     longname  : 'WP EZ Columns',
    51                     author    : 'AffiliateTechHelp.com',
    52                     authorurl : 'http://affiliatetechhelp.com',
    53                     infourl   : 'http://affiliatetechhelp.com',
     50                    longname  : 'Easy Columns',
     51                    author    : 'PatFriedl.com',
     52                    authorurl : 'http://patfriedl.com',
     53                    infourl   : 'http://patfriedl.com',
    5454                    version   : "1.0"
    5555            };

  • easy-columns/trunk/tinymce/window.php

    r403470 r763400  
    11<?php
    2 /*
    3 wp ez columns tinymce
    4 */
    5 // look up for the path
    6 @ require('../../../../wp-config.php');
     2while(!is_file('wp-config.php')){
     3  if(is_dir('../')){ chdir('../'); }
     4  else die('Could not find WordPress.');
     5}
     6include('wp-config.php');
     7
     8wp_enqueue_script('jquery');
     9global $wp_scripts;
     10global $wpdb;
    711
    812// check for rights
    913if ( !is_user_logged_in() || !current_user_can('edit_posts') )
    1014    wp_die(__("You are not allowed to be here"));
    11 
    12 global $wpdb;
    13 
    14 // get the options
    15 //$options = get_option('wpezcol_options');
    16 //$options['ctr']
    1715?>
    18 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    19 <html xmlns="http://www.w3.org/1999/xhtml">
     16<!DOCTYPE html>
     17<html>
    2018<head>
    21 <title>WP Easy Columns</title>
     19<title>Easy Columns</title>
    2220<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    2321<style>
    2422.colPicker {
    2523    float: left;
    26     width: 150px;
     24    width: 180px;
     25    border-collapse: separate;
     26    border-spacing: 0.9em;
    2727}
    2828.colPicker tr {
    … …  
    3030}
    3131.colPicker td {
    32     background-color: #006599;
    33     color: #fff;
    34     text-align: center;
    35     font-family: arial,helvetica,sans-serif;
    36     font-size: 12px;
    37     font-weight: bold;
    38     padding: 4px;
    39     border-top: 1px solid #0097E2;
    40     border-left: 1px solid #0097E2;
    41     border-right: 1px solid #003E5E;
    42     border-bottom: 1px solid #003E5E;
    43     -moz-border-radius: 5px;
    44     border-radius: 5px;
    4532    cursor: hand;
     33    background-color: #C3C3C3;
     34    border-color: #333333;
     35    border-radius: 7px 7px 7px 7px;
     36    border-style: solid;
     37    border-width: 1px;
     38    box-shadow: 0 2px;
     39    color: #4E4E4E;
     40    font-family: arial,helvetica,sans-serif;
     41    font-size: 12px;
     42    font-weight: bold;
     43    padding: 4px;
     44    text-align: center;
    4645}
    4746</style>
    … …  
    6160        /* single columns */
    6261        case 'quarter':
    63             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
     62            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
    6463            break;
    6564        case 'half':
    66             colTxt += '[wpcol_1half id="" class="" style=""]Half Column[/wpcol_1half] ';
     65            colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
    6766            break;
    6867        case 'threequarter':
    69             colTxt += '[wpcol_3quarter id="" class="" style=""]Three Quarter Column[/wpcol_3quarter] ';
     68            colTxt += '[ezcol_3quarter id="" class="" style=""]Three Quarter Column[/ezcol_3quarter] ';
    7069            break;
    7170        case 'third':
    72             colTxt += '[wpcol_1third id="" class="" style=""]Third Column[/wpcol_1third] ';
     71            colTxt += '[ezcol_1third id="" class="" style=""]Third Column[/ezcol_1third] ';
    7372            break;
    7473        case 'twothirds':
    75             colTxt += '[wpcol_2third id="" class="" style=""]Two Thirds Column[/wpcol_2third] ';
     74            colTxt += '[ezcol_2third id="" class="" style=""]Two Thirds Column[/ezcol_2third] ';
    7675            break;
    7776        case 'onefifth':
    78             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
     77            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
    7978            break;
    8079        case 'twofifths':
    81             colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
     80            colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
    8281            break;
    8382        case 'threefifths':
    84             colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
     83            colTxt += '[ezcol_3fifth id="" class="" style=""]Three Fifths Column[/ezcol_3fifth] ';
    8584            break;
    8685        case 'fourfifths':
    87             colTxt += '[wpcol_4fifth id="" class="" style=""]Four Fifths Column[/wpcol_4fifth] ';
     86            colTxt += '[ezcol_4fifth id="" class="" style=""]Four Fifths Column[/ezcol_4fifth] ';
    8887            break;
    8988
    9089        /* 1/3, 2/3 */
    9190        case '3third':
    92             colTxt += '[wpcol_1third id="" class="" style=""]Third Column[/wpcol_1third] ';
    93             colTxt += '[wpcol_1third id="" class="" style=""]Third Column[/wpcol_1third] ';
    94             colTxt += '[wpcol_1third_end id="" class="" style=""]Third Column[/wpcol_1third_end] ';
     91            colTxt += '[ezcol_1third id="" class="" style=""]Third Column[/ezcol_1third] ';
     92            colTxt += '[ezcol_1third id="" class="" style=""]Third Column[/ezcol_1third] ';
     93            colTxt += '[ezcol_1third_end id="" class="" style=""]Third Column[/ezcol_1third_end] ';
    9594            break;
    9695        case '1third2third':
    97             colTxt += '[wpcol_1third id="" class="" style=""]Third Column[/wpcol_1third] ';
    98             colTxt += '[wpcol_2third_end id="" class="" style=""]Two Thirds Column[/wpcol_2third_end] ';
     96            colTxt += '[ezcol_1third id="" class="" style=""]Third Column[/ezcol_1third] ';
     97            colTxt += '[ezcol_2third_end id="" class="" style=""]Two Thirds Column[/ezcol_2third_end] ';
    9998            break;
    10099        case '2third1third':
    101             colTxt += '[wpcol_2third id="" class="" style=""]Two Thirds Column[/wpcol_2third] ';
    102             colTxt += '[wpcol_1third_end id="" class="" style=""]Third Column[/wpcol_1third_end] ';
     100            colTxt += '[ezcol_2third id="" class="" style=""]Two Thirds Column[/ezcol_2third] ';
     101            colTxt += '[ezcol_1third_end id="" class="" style=""]Third Column[/ezcol_1third_end] ';
    103102            break;
    104103
    105104        /* 1/4, 1/2, 3/4 */
    106105        case '4quarter':
    107             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    108             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    109             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    110             colTxt += '[wpcol_1quarter_end id="" class="" style=""]Quarter Column[/wpcol_1quarter_end] ';
     106            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     107            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     108            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     109            colTxt += '[ezcol_1quarter_end id="" class="" style=""]Quarter Column[/ezcol_1quarter_end] ';
    111110            break;
    112111        case '1half2quarter':
    113             colTxt += '[wpcol_1half id="" class="" style=""]Half Column[/wpcol_1half] ';
    114             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    115             colTxt += '[wpcol_1quarter_end id="" class="" style=""]Quarter Column[/wpcol_1quarter_end] ';
     112            colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
     113            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     114            colTxt += '[ezcol_1quarter_end id="" class="" style=""]Quarter Column[/ezcol_1quarter_end] ';
    116115            break;
    117116        case 'quarterhalfquarter':
    118             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    119             colTxt += '[wpcol_1half id="" class="" style=""]Half Column[/wpcol_1half] ';
    120             colTxt += '[wpcol_1quarter_end id="" class="" style=""]Quarter Column[/wpcol_1quarter_end] ';
     117            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     118            colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
     119            colTxt += '[ezcol_1quarter_end id="" class="" style=""]Quarter Column[/ezcol_1quarter_end] ';
    121120            break;
    122121        case '2quarter1half':
    123             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    124             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    125             colTxt += '[wpcol_1half_end id="" class="" style=""]Half Column[/wpcol_1half_end] ';
     122            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     123            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     124            colTxt += '[ezcol_1half_end id="" class="" style=""]Half Column[/ezcol_1half_end] ';
    126125            break;
    127126        case '2half':
    128             colTxt += '[wpcol_1half id="" class="" style=""]Half Column[/wpcol_1half] ';
    129             colTxt += '[wpcol_1half_end id="" class="" style=""]Half Column[/wpcol_1half_end] ';
     127            colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
     128            colTxt += '[ezcol_1half_end id="" class="" style=""]Half Column[/ezcol_1half_end] ';
    130129            break;
    131130        case '1quarter3quarter':
    132             colTxt += '[wpcol_1quarter id="" class="" style=""]Quarter Column[/wpcol_1quarter] ';
    133             colTxt += '[wpcol_3quarter_end id="" class="" style=""]Three Quarter Column[/wpcol_3quarter_end] ';
     131            colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     132            colTxt += '[ezcol_3quarter_end id="" class="" style=""]Three Quarter Column[/ezcol_3quarter_end] ';
    134133            break;
    135134        case '3quarter1quarter':
    136             colTxt += '[wpcol_3quarter id="" class="" style=""]Three Quarter Column[/wpcol_3quarter] ';
    137             colTxt += '[wpcol_1quarter_end id="" class="" style=""]Quarter Column[/wpcol_1quarter_end] ';
     135            colTxt += '[ezcol_3quarter id="" class="" style=""]Three Quarter Column[/ezcol_3quarter] ';
     136            colTxt += '[ezcol_1quarter_end id="" class="" style=""]Quarter Column[/ezcol_1quarter_end] ';
    138137            break;
    139138
    140139        /* 1/5, 2/5, 3/5, 4/5 */
    141140        case '5fifth':
    142             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    143             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    144             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    145             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    146             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     141            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     142            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     143            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     144            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     145            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    147146            break;
    148147        case '2fifth31fifth':
    149             colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
    150             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    151             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    152             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     148            colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
     149            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     150            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     151            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    153152            break;
    154153        case '1fifth2fifth21fifth':
    155             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    156             colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
    157             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    158             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     154            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     155            colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
     156            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     157            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    159158            break;
    160159        case '21fifth2fifth1fifth':
    161             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    162             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    163             colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
    164             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     160            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     161            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     162            colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
     163            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    165164            break;
    166165        case '31fifth2fifth':
    167             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    168             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    169             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    170             colTxt += '[wpcol_2fifth_end id="" class="" style=""]Two Fifths Column[/wpcol_2fifth_end] ';
     166            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     167            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     168            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     169            colTxt += '[ezcol_2fifth_end id="" class="" style=""]Two Fifths Column[/ezcol_2fifth_end] ';
    171170            break;
    172171        case '3fifth21fifth':
    173             colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
    174             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    175             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     172            colTxt += '[ezcol_3fifth id="" class="" style=""]Three Fifths Column[/ezcol_3fifth] ';
     173            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     174            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    176175            break;
    177176        case '1fifth3fifth1fifth':
    178             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    179             colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
    180             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     177            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     178            colTxt += '[ezcol_3fifth id="" class="" style=""]Three Fifths Column[/ezcol_3fifth] ';
     179            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    181180            break;
    182181        case '21fifth3fifth':
    183             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    184             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    185             colTxt += '[wpcol_3fifth_end id="" class="" style=""]Three Fifths Column[/wpcol_3fifth_end] ';
     182            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     183            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     184            colTxt += '[ezcol_3fifth_end id="" class="" style=""]Three Fifths Column[/ezcol_3fifth_end] ';
    186185            break;
    187186        case '2fifth3fifth':
    188             colTxt += '[wpcol_2fifth id="" class="" style=""]Two Fifths Column[/wpcol_2fifth] ';
    189             colTxt += '[wpcol_3fifth_end id="" class="" style=""]Three Fifths Column[/wpcol_3fifth_end] ';
     187            colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
     188            colTxt += '[ezcol_3fifth_end id="" class="" style=""]Three Fifths Column[/ezcol_3fifth_end] ';
    190189            break;
    191190        case '3fifth2fifth':
    192             colTxt += '[wpcol_3fifth id="" class="" style=""]Three Fifths Column[/wpcol_3fifth] ';
    193             colTxt += '[wpcol_2fifth_end id="" class="" style=""]Two Fifths Column[/wpcol_2fifth_end] ';
     191            colTxt += '[ezcol_3fifth id="" class="" style=""]Three Fifths Column[/ezcol_3fifth] ';
     192            colTxt += '[ezcol_2fifth_end id="" class="" style=""]Two Fifths Column[/ezcol_2fifth_end] ';
    194193            break;
    195194        case '1fifth4fifth':
    196             colTxt += '[wpcol_1fifth id="" class="" style=""]One Fifth Column[/wpcol_1fifth] ';
    197             colTxt += '[wpcol_4fifth_end id="" class="" style=""]Four Fifths Column[/wpcol_4fifth_end] ';
     195            colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     196            colTxt += '[ezcol_4fifth_end id="" class="" style=""]Four Fifths Column[/ezcol_4fifth_end] ';
    198197            break;
    199198        case '4fifth1fifth':
    200             colTxt += '[wpcol_4fifth id="" class="" style=""]Four Fifths Column[/wpcol_4fifth] ';
    201             colTxt += '[wpcol_1fifth_end id="" class="" style=""]One Fifth Column[/wpcol_1fifth_end] ';
     199            colTxt += '[ezcol_4fifth id="" class="" style=""]Four Fifths Column[/ezcol_4fifth] ';
     200            colTxt += '[ezcol_1fifth_end id="" class="" style=""]One Fifth Column[/ezcol_1fifth_end] ';
    202201            break;
    203202    }
    … …  
    216215    divClass = document.getElementById('txtClass').value;
    217216    divStyle = document.getElementById('txtStyle').value;
    218     colTxt += '[wpdiv id="';
     217    colTxt += '[ezdiv id="';
    219218    if(divID != ''){
    220219        colTxt += divID;
    … …  
    228227        colTxt += divStyle;
    229228    }
    230     colTxt += '"]Custom Div[/wpdiv] ';
     229    colTxt += '"]Custom Div[/ezdiv] ';
    231230    insertText();
    232231}
    … …  
    239238    {
    240239        case 'left':
    241             colTxt += '[wpcol_end_left]';
     240            colTxt += '[ezcol_end_left]';
    242241            break;
    243242        case 'right':
    244             colTxt += '[wpcol_end_right]';
     243            colTxt += '[ezcol_end_right]';
    245244            break;
    246245        case 'both':
    247             colTxt += '[wpcol_end_both]';
     246            colTxt += '[ezcol_end_both]';
    248247            break;
    249248        case 'divider':
    250             colTxt += '[wpcol_divider]';
     249            colTxt += '[ezcol_divider]';
    251250            break;
    252251    }
    … …  
    292291        <div class="panel">
    293292
    294             <table border="0" cellpadding="2" cellspacing="0" width="100%">
     293            <table border="0" cellpadding="3" cellspacing="0" width="100%">
    295294            <tr>
    296295                <td class="hdrRow" colspan="3">
    … …  
    299298            </tr>
    300299            </table>
    301            
     300
    302301            <!-- column combinations -->
    303302            <table cellspacing="0" cellpadding="0" border="0">
    … …  
    308307                        <table cellspacing="3" cellpadding="0" border="0" class="colPicker">
    309308                            <tr onclick="insertColumns('3third')">
    310                                 <td width="33%">1/3</td>
    311                                 <td width="33%">1/3</td>
    312                                 <td width="33%">1/3</td>
     309                                <td width="33.333%">1/3</td>
     310                                <td width="33.333%">1/3</td>
     311                                <td width="33.333%">1/3</td>
    313312                            </tr>
    314313                            <tr onclick="insertColumns('1third2third')">
    315                                 <td width="33%">1/3</td>
     314                                <td width="33.333%">1/3</td>
    316315                                <td colspan="2">2/3</td>
    317316                            </tr>
    318317                            <tr onclick="insertColumns('2third1third')">
    319                                 <td width="33%" colspan="2">2/3</td>
    320                                 <td width="33%">1/3</td>
     318                                <td width="33.333%" colspan="2">2/3</td>
     319                                <td width="33.333%">1/3</td>
    321320                            </tr>
    322321                        </table>
Note: See TracChangeset for help on using the changeset viewer.