WordPress.org
Get WordPress

Plugin Directory

Changeset 791582


Ignore:
Timestamp:
10/22/2013 02:56:28 AM (12 years ago)
Author:
kcfried
Message:

From the readme.txt:

  • Changed the tinyMCE window to load wp-load.php instead of wp-config.php
  • Added jQuery to tinyMCE window
  • Added class input to column selection - applies a CSS class name to all the columns you insert
  • Added better styling to the options page
  • Fixed the custom CSS not rendering issue - Easy Columns options will now render.
  • Added a Custom CSS option to the options page - style columns with custom classes or use the base classes!
  • Changed ezcol-divider class to be height: 0 margin: 0
  • Should have any uninstall hook erros fixed
Location:
easy-columns/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • easy-columns/trunk/css/easy-columns.css

    r767230 r791582  
    8686    clear: both !important;
    8787    display: block !important;
    88     margin-bottom: 5px !important;
    89     padding-top: 5px !important;
     88    margin-bottom: 0px !important;
     89    padding-top: 0px !important;
    9090    width: 100% !important;
    9191    background: none !important;

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

    r763435 r791582  
    11<?php
    22function write_sel($n,$v){
    3     echo '<select id="'.$n.'" name="'.$n.'">' . "\r\n";
     3    echo '<select id="'.$n.'" name="'.$n.'" class="ezcol-input">' . "\r\n";
    44    if($v == 'px'){
    55        echo '<option value="px" selected="selected">px</option>' . "\r\n";
    … …  
    1212}
    1313?>
     14<style>
     15.ezcol-input {
     16    border-radius: 3px !important;
     17    border: 1px solid #888 !important;
     18}
     19</style>
    1420<div class="wrap" style="max-width:950px !important;">
    1521
    … …  
    7379                    <td valign="middle">
    7480                        <?php if($this->options['use_custom']){ ?>
    75                         <input type="checkbox" id="use_custom" name="use_custom" value="true" checked="checked">
     81                        <input type="checkbox" id="use_custom" name="use_custom" value="true" checked="checked" class="ezcol-input">
    7682                        <?php } else { ?>
    77                         <input type="checkbox" id="use_custom" name="use_custom" value="true">
     83                        <input type="checkbox" id="use_custom" name="use_custom" value="true" class="ezcol-input">
    7884                        <?php } ?>
    7985                    </td>
    … …  
    104110                    </td>
    105111                    <td valign="middle">
    106                         <input type="text" id="quarter_width" name="quarter_width" value="<?php echo $this->options['quarter_width']; ?>" size="6">
     112                        <input type="text" id="quarter_width" name="quarter_width" value="<?php echo $this->options['quarter_width']; ?>" size="6" class="ezcol-input">
    107113                        &nbsp;
    108114                        <?php write_sel('quarter_width_type',$this->options['quarter_width_type']); ?>
    … …  
    112118                    </td>
    113119                    <td valign="middle">
    114                         <input type="text" id="onehalf_width" name="onehalf_width" value="<?php echo $this->options['onehalf_width']; ?>" size="6">
     120                        <input type="text" id="onehalf_width" name="onehalf_width" value="<?php echo $this->options['onehalf_width']; ?>" size="6" class="ezcol-input">
    115121                        &nbsp;
    116122                        <?php write_sel('onehalf_width_type',$this->options['onehalf_width_type']); ?>
    … …  
    120126                    </td>
    121127                    <td valign="middle">
    122                         <input type="text" id="threequarter_width" name="threequarter_width" value="<?php echo $this->options['threequarter_width']; ?>" size="6">
     128                        <input type="text" id="threequarter_width" name="threequarter_width" value="<?php echo $this->options['threequarter_width']; ?>" size="6" class="ezcol-input">
    123129                        &nbsp;
    124130                        <?php write_sel('threequarter_width_type',$this->options['threequarter_width_type']); ?>
    … …  
    131137                    </td>
    132138                    <td valign="middle">
    133                         <input type="text" id="quarter_margin" name="quarter_margin" value="<?php echo $this->options['quarter_margin']; ?>" size="6">
     139                        <input type="text" id="quarter_margin" name="quarter_margin" value="<?php echo $this->options['quarter_margin']; ?>" size="6" class="ezcol-input">
    134140                        &nbsp;
    135141                        <?php write_sel('quarter_margin_type',$this->options['quarter_margin_type']); ?>
    … …  
    139145                    </td>
    140146                    <td valign="middle">
    141                         <input type="text" id="onehalf_margin" name="onehalf_margin" value="<?php echo $this->options['onehalf_margin']; ?>" size="6">
     147                        <input type="text" id="onehalf_margin" name="onehalf_margin" value="<?php echo $this->options['onehalf_margin']; ?>" size="6" class="ezcol-input">
    142148                        &nbsp;
    143149                        <?php write_sel('onehalf_margin_type',$this->options['onehalf_margin_type']); ?>
    … …  
    147153                    </td>
    148154                    <td valign="middle">
    149                         <input type="text" id="threequarter_margin" name="threequarter_margin" value="<?php echo $this->options['threequarter_margin']; ?>" size="6">
     155                        <input type="text" id="threequarter_margin" name="threequarter_margin" value="<?php echo $this->options['threequarter_margin']; ?>" size="6" class="ezcol-input">
    150156                        &nbsp;
    151157                        <?php write_sel('threequarter_margin_type',$this->options['threequarter_margin_type']); ?>
    … …  
    174180                    </td>
    175181                    <td valign="middle">
    176                         <input type="text" id="onethird_width" name="onethird_width" value="<?php echo $this->options['onethird_width']; ?>" size="6">
     182                        <input type="text" id="onethird_width" name="onethird_width" value="<?php echo $this->options['onethird_width']; ?>" size="6" class="ezcol-input">
    177183                        &nbsp;
    178184                        <?php write_sel('onethird_width_type',$this->options['onethird_width_type']); ?>
    … …  
    182188                    </td>
    183189                    <td valign="middle">
    184                         <input type="text" id="twothird_width" name="twothird_width" value="<?php echo $this->options['twothird_width']; ?>" size="6">
     190                        <input type="text" id="twothird_width" name="twothird_width" value="<?php echo $this->options['twothird_width']; ?>" size="6" class="ezcol-input">
    185191                        &nbsp;
    186192                        <?php write_sel('twothird_width_type',$this->options['twothird_width_type']); ?>
    … …  
    195201                    </td>
    196202                    <td valign="middle">
    197                         <input type="text" id="onethird_margin" name="onethird_margin" value="<?php echo $this->options['onethird_margin']; ?>" size="6">
     203                        <input type="text" id="onethird_margin" name="onethird_margin" value="<?php echo $this->options['onethird_margin']; ?>" size="6" class="ezcol-input">
    198204                        &nbsp;
    199205                        <?php write_sel('onethird_margin_type',$this->options['onethird_margin_type']); ?>
    … …  
    203209                    </td>
    204210                    <td valign="middle">
    205                         <input type="text" id="twothird_margin" name="twothird_margin" value="<?php echo $this->options['twothird_margin']; ?>" size="6">
     211                        <input type="text" id="twothird_margin" name="twothird_margin" value="<?php echo $this->options['twothird_margin']; ?>" size="6" class="ezcol-input">
    206212                        &nbsp;
    207213                        <?php write_sel('twothird_margin_type',$this->options['twothird_margin_type']); ?>
    … …  
    233239                    </td>
    234240                    <td valign="middle">
    235                         <input type="text" id="onefifth_width" name="onefifth_width" value="<?php echo $this->options['onefifth_width']; ?>" size="6">
     241                        <input type="text" id="onefifth_width" name="onefifth_width" value="<?php echo $this->options['onefifth_width']; ?>" size="6" class="ezcol-input">
    236242                        &nbsp;
    237243                        <?php write_sel('onefifth_width_type',$this->options['onefifth_width_type']); ?>
    … …  
    241247                    </td>
    242248                    <td valign="middle">
    243                         <input type="text" id="twofifth_width" name="twofifth_width" value="<?php echo $this->options['twofifth_width']; ?>" size="6">
     249                        <input type="text" id="twofifth_width" name="twofifth_width" value="<?php echo $this->options['twofifth_width']; ?>" size="6" class="ezcol-input">
    244250                        &nbsp;
    245251                        <?php write_sel('twofifth_width_type',$this->options['twofifth_width_type']); ?>
    … …  
    249255                    </td>
    250256                    <td valign="middle">
    251                         <input type="text" id="threefifth_width" name="threefifth_width" value="<?php echo $this->options['threefifth_width']; ?>" size="6">
     257                        <input type="text" id="threefifth_width" name="threefifth_width" value="<?php echo $this->options['threefifth_width']; ?>" size="6" class="ezcol-input">
    252258                        &nbsp;
    253259                        <?php write_sel('threefifth_width_type',$this->options['threefifth_width_type']); ?>
    … …  
    259265                    </td>
    260266                    <td valign="middle">
    261                         <input type="text" id="onefifth_margin" name="onefifth_margin" value="<?php echo $this->options['onefifth_margin']; ?>" size="6">
     267                        <input type="text" id="onefifth_margin" name="onefifth_margin" value="<?php echo $this->options['onefifth_margin']; ?>" size="6" class="ezcol-input">
    262268                        &nbsp;
    263269                        <?php write_sel('onefifth_margin_type',$this->options['onefifth_margin_type']); ?>
    … …  
    267273                    </td>
    268274                    <td valign="middle">
    269                         <input type="text" id="twofifth_margin" name="twofifth_margin" value="<?php echo $this->options['twofifth_margin']; ?>" size="6">
     275                        <input type="text" id="twofifth_margin" name="twofifth_margin" value="<?php echo $this->options['twofifth_margin']; ?>" size="6" class="ezcol-input">
    270276                        &nbsp;
    271277                        <?php write_sel('twofifth_margin_type',$this->options['twofifth_margin_type']); ?>
    … …  
    275281                    </td>
    276282                    <td valign="middle">
    277                         <input type="text" id="threefifth_margin" name="threefifth_margin" value="<?php echo $this->options['threefifth_margin']; ?>" size="6">
     283                        <input type="text" id="threefifth_margin" name="threefifth_margin" value="<?php echo $this->options['threefifth_margin']; ?>" size="6" class="ezcol-input">
    278284                        &nbsp;
    279285                        <?php write_sel('threefifth_margin_type',$this->options['threefifth_margin_type']); ?>
    … …  
    292298                    </td>
    293299                    <td valign="middle" colspan="5">
    294                         <input type="text" id="fourfifth_width" name="fourfifth_width" value="<?php echo $this->options['fourfifth_width']; ?>" size="6">
     300                        <input type="text" id="fourfifth_width" name="fourfifth_width" value="<?php echo $this->options['fourfifth_width']; ?>" size="6" class="ezcol-input">
    295301                        &nbsp;
    296302                        <?php write_sel('fourfifth_width_type',$this->options['fourfifth_width_type']); ?>
    … …  
    302308                    </td>
    303309                    <td valign="middle" colspan="5">
    304                         <input type="text" id="fourfifth_margin" name="fourfifth_margin" value="<?php echo $this->options['fourfifth_margin']; ?>" size="6">
     310                        <input type="text" id="fourfifth_margin" name="fourfifth_margin" value="<?php echo $this->options['fourfifth_margin']; ?>" size="6" class="ezcol-input">
    305311                        &nbsp;
    306312                        <?php write_sel('fourfifth_margin_type',$this->options['fourfifth_margin_type']); ?>
    307313                    </td>
    308314                </tr>
    309 
     315                <tr>
     316                    <td colspan="6">
     317                        <hr>
     318                    </td>
     319                </tr>
    310320            </table>
    311321
     322            <table border="0" cellpadding="2" cellspacing="4">
     323                <tr>
     324                    <td valign="middle" colspan="6">
     325                        <strong>Custom CSS</strong>
     326                    </td>
     327                </tr>
     328                <tr>
     329                    <td valign="middle">
     330                        <textarea id="custom_css" name="custom_css" cols="80" rows="10" class="ezcol-input"><?php echo $this->options['custom_css']; ?></textarea>
     331                    </td>
     332                </tr>
     333            </table>
     334
    312335            <p>
    313                 <input type="submit" name="Submit" value="Update" />
     336                <input type="submit" value="Update" name="submit" class="button button-primary button-large">
    314337            </p>
    315338

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

    r767230 r791582  
    33Plugin Name: Easy Columns
    44Plugin URI: http://www.patrickfriedl.com/
    5 Version: v2.1.1
     5Version: v2.1.2
    66Author: <a href="http://www.patrickfriedl.com">Pat Friedl</a>
    77Description: 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>.
    … …  
    209209            $att_str .= (!empty($col_type))? ' '.$col_type : '';
    210210            $att_str .= (!empty($col_type) && !empty($class))? ' ' : '';
    211             $att_str .= (!empty($class))? $class : '';
     211            $att_str .= (!empty($class))? ' '.$class : '';
    212212            $att_str .= '"';
    213213            $att_str .= (!empty($id))? ' id="'.$id.'"' : '';
    … …  
    226226            <!-- Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> by Pat Friedl http://www.patrickfriedl.com -->
    227227            <link rel="stylesheet" href="<?php echo EZC_PLUGIN_URL; ?>/css/easy-columns.css" type="text/css" media="screen, projection" />
     228            <?php if($this->use_custom || !empty($this->options['custom_css'])){ ?>
     229            <!-- Begin Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
     230            <style type="text/css">
     231            <?php if(
     232                    !empty($this->options['quarter_width']) || !empty($this->options['quarter_margin']) ||
     233                    !empty($this->options['onehalf_width']) || !empty($this->options['onehalf_margin']) ||
     234                    !empty($this->options['threequarter_width']) || !empty($this->options['threequarter_margin']) ||
     235                    !empty($this->options['onethird_width']) || !empty($this->options['onethird_margin']) ||
     236                    !empty($this->options['twothird_width']) || !empty($this->options['twothird_margin']) ||
     237                    !empty($this->options['twothird_width']) || !empty($this->options['twothird_margin']) ||
     238                    !empty($this->options['fifth_width']) || !empty($this->options['fifth_margin']) ||
     239                    !empty($this->options['twofifth_width']) || !empty($this->options['twofifth_margin']) ||
     240                    !empty($this->options['threefifth_width']) || !empty($this->options['threefifth_margin']) ||
     241                    !empty($this->options['fourfifth_width']) || !empty($this->options['fourfifth_margin'])
     242                    ){
     243                    if(!empty($this->options['quarter_width']) || !empty($this->options['quarter_margin']))
     244                    {
     245                        echo '.ezcol-one-quarter {';
     246                        if(!empty($this->options['quarter_width'])) { echo 'width:'.$this->options['quarter_width'].$this->options['quarter_width_type'].';'; }
     247                        if(!empty($this->options['quarter_margin'])) { echo 'margin-right:'.$this->options['quarter_margin'].$this->options['quarter_margin_type'].';'; }
     248                        echo '}' . "\n";
     249                    }
     250                    if(!empty($this->options['onehalf_width']) || !empty($this->options['onehalf_margin']))
     251                    {
     252                        echo '.ezcol-one-half {';
     253                        if(!empty($this->options['onehalf_width'])) { echo 'width:'.$this->options['onehalf_width'].$this->options['onehalf_width_type'].';'; }
     254                        if(!empty($this->options['>onehalf_margin'])) { echo 'margin-right:'.$this->options['onehalf_margin'].$this->options['onehalf_margin_type'].';'; }
     255                        echo '}' . "\n";
     256                    }
     257                    if(!empty($this->options['threequarter_width']) || !empty($this->options['threequarter_margin']))
     258                    {
     259                        echo '.ezcol-three-quarter {';
     260                        if(!empty($this->options['threequarter_width'])) { echo 'width:'.$this->options['threequarter_width'].$this->options['threequarter_width_type'].';'; }
     261                        if(!empty($this->options['threequarter_margin'])) { echo 'margin-right:'.$this->options['threequarter_margin'].$this->options['threequarter_margin_type'].';'; }
     262                        echo '}' . "\n";
     263                    }
     264                    if(!empty($this->options['onethird_width']) || !empty($this->options['onethird_margin']))
     265                    {
     266                        echo '.ezcol-one-third {';
     267                        if(!empty($this->options['onethird_width'])) { echo 'width:'.$this->options['onethird_width'].$this->options['onethird_width_type'].';'; }
     268                        if(!empty($this->options['onethird_margin'])) { echo 'margin-right:'.$this->options['onethird_margin'].$this->options['onethird_margin_type'].';'; }
     269                        echo '}' . "\n";
     270                    }
     271                    if(!empty($this->options['twothird_width']) || !empty($this->options['twothird_margin']))
     272                    {
     273                        echo '.ezcol-two-third {';
     274                        if(!empty($this->options['twothird_width'])) { echo 'width:'.$this->options['twothird_width'].$this->options['twothird_width_type'].';'; }
     275                        if(!empty($this->options['twothird_margin'])) { echo 'margin-right:'.$this->options['twothird_margin'].$this->options['twothird_margin_type'].';'; }
     276                        echo '}' . "\n";
     277                    }
     278                    if(!empty($this->options['fifth_width']) || !empty($this->options['fifth_margin']))
     279                    {
     280                        echo '.ezcol-one-fifth {';
     281                        if(!empty($this->options['fifth_width'])) { echo 'width:'.$this->options['fifth_width'].$this->options['fifth_width_type'].';'; }
     282                        if(!empty($this->options['fifth_margin'])) { echo 'margin-right:'.$this->options['fifth_margin'].$this->options['fifth_margin_type'].';'; }
     283                        echo '}' . "\n";
     284                    }
     285                    if(!empty($this->options['twofifth_width']) || !empty($this->options['twofifth_margin']))
     286                    {
     287                        echo '.ezcol-two-fifth {';
     288                        if(!empty($this->options['twofifth_width'])) { echo 'width:'.$this->options['twofifth_width'].$this->options['twofifth_width_type'].';'; }
     289                        if(!empty($this->options['twofifth_margin'])) { echo 'margin-right:'.$this->options['twofifth_margin'].$this->options['twofifth_margin_type'].';'; }
     290                        echo '}' . "\n";
     291                    }
     292                    if(!empty($this->options['threefifth_width']) || !empty($this->options['threefifth_margin']))
     293                    {
     294                        echo '.ezcol-three-fifth {';
     295                        if(!empty($this->options['threefifth_width'])) { echo 'width:'.$this->options['threefifth_width'].$this->options['threefifth_width_type'].'; '; }
     296                        if(!empty($this->options['threefifth_margin'])) { echo 'margin-right:'.$this->options['threefifth_margin'].$this->options['threefifth_margin_type'].';'; }
     297                        echo '}' . "\n";
     298                    }
     299                    if(!empty($this->options['fourfifth_width']) || !empty($this->options['fourfifth_margin']))
     300                    {
     301                        echo '.ezcol-four-fifth {';
     302                        if(!empty($this->options['fourfifth_width'])) { echo 'width:'.$this->options['fourfifth_width'].$this->options['fourfifth_width_type'].';'; }
     303                        if(!empty($this->options['fourfifth_margin'])) { echo 'margin-right:'.$this->options['fourfifth_margin'].$this->options['fourfifth_margin_type'].';'; }
     304                        echo '}' . "\n";
     305                    }
     306                }
     307                if(!empty($this->options['custom_css'])){ echo $this->options['custom_css'] . "\n"; } ?>
     308            </style>
     309            <!-- End Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
    228310            <?php
    229             if($this->use_custom)
    230             {
    231                 if(
    232                     isset($this->options['quarter_width']) || isset($this->options['quarter_margin']) ||
    233                     isset($this->options['onehalf_width']) || isset($this->options['onehalf_margin']) ||
    234                     isset($this->options['threequarter_width']) || isset($this->options['threequarter_margin']) ||
    235                     isset($this->options['onethird_width']) || isset($this->options['onethird_margin']) ||
    236                     isset($this->options['twothird_width']) || isset($this->options['twothird_margin']) ||
    237                     isset($this->options['twothird_width']) || isset($this->options['twothird_margin']) ||
    238                     isset($this->options['fifth_width']) || isset($this->options['fifth_margin']) ||
    239                     isset($this->options['twofifth_width']) || isset($this->options['twofifth_margin']) ||
    240                     isset($this->options['threefifth_width']) || isset($this->options['threefifth_margin']) ||
    241                     isset($this->options['fourfifth_width']) || isset($this->options['fourfifth_margin'])
    242                     ){
    243                     ?>
    244                     <!-- Begin Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
    245                     <style type="text/css" media="screen, projection">
    246                     <?php
    247                     if(isset($this->options['quarter_width']) || isset($this->options['quarter_margin']))
    248                     {
    249                         echo '.ezcol-one-quarter {';
    250                         if(isset($this->options['quarter_width'])) { echo 'width:'.$this->options['quarter_width'].$this->options['quarter_width_type'].';'; }
    251                         if(isset($this->options['quarter_margin'])) { echo 'margin-right:'.$this->options['quarter_margin'].$this->options['quarter_margin_type'].';'; }
    252                         echo '} ';
    253                     }
    254                     if(isset($this->options['onehalf_width']) || isset($this->options['onehalf_margin']))
    255                     {
    256                         echo '.ezcol-one-half {';
    257                         if(isset($this->options['onehalf_width'])) { echo 'width:'.$this->options['onehalf_width'].$this->options['onehalf_width_type'].';'; }
    258                         if(isset($this->options['>onehalf_margin'])) { echo 'margin-right:'.$this->options['onehalf_margin'].$this->options['onehalf_margin_type'].';'; }
    259                         echo '} ';
    260                     }
    261                     if(isset($this->options['threequarter_width']) || isset($this->options['threequarter_margin']))
    262                     {
    263                         echo '.ezcol-three-quarter {';
    264                         if(isset($this->options['threequarter_width'])) { echo 'width:'.$this->options['threequarter_width'].$this->options['threequarter_width_type'].';'; }
    265                         if(isset($this->options['threequarter_margin'])) { echo 'margin-right:'.$this->options['threequarter_margin'].$this->options['threequarter_margin_type'].';'; }
    266                         echo '} ';
    267                     }
    268                     if(isset($this->options['onethird_width']) || isset($this->options['onethird_margin']))
    269                     {
    270                         echo '.ezcol-one-third {';
    271                         if(isset($this->options['onethird_width'])) { echo 'width:'.$this->options['onethird_width'].$this->options['onethird_width_type'].';'; }
    272                         if(isset($this->options['onethird_margin'])) { echo 'margin-right:'.$this->options['onethird_margin'].$this->options['onethird_margin_type'].';'; }
    273                         echo '} ';
    274                     }
    275                     if(isset($this->options['twothird_width']) || isset($this->options['twothird_margin']))
    276                     {
    277                         echo '.ezcol-two-third {';
    278                         if(isset($this->options['twothird_width'])) { echo 'width:'.$this->options['twothird_width'].$this->options['twothird_width_type'].';'; }
    279                         if(isset($this->options['twothird_margin'])) { echo 'margin-right:'.$this->options['twothird_margin'].$this->options['twothird_margin_type'].';'; }
    280                         echo '}';
    281                     }
    282                     if(isset($this->options['fifth_width']) || isset($this->options['fifth_margin']))
    283                     {
    284                         echo '.ezcol-one-fifth {';
    285                         if(isset($this->options['fifth_width'])) { echo 'width:'.$this->options['fifth_width'].$this->options['fifth_width_type'].';'; }
    286                         if(isset($this->options['fifth_margin'])) { echo 'margin-right:'.$this->options['fifth_margin'].$this->options['fifth_margin_type'].';'; }
    287                         echo '}';
    288                     }
    289                     if(isset($this->options['twofifth_width']) || isset($this->options['twofifth_margin']))
    290                     {
    291                         echo '.ezcol-two-fifth {';
    292                         if(isset($this->options['twofifth_width'])) { echo 'width:'.$this->options['twofifth_width'].$this->options['twofifth_width_type'].';'; }
    293                         if(isset($this->options['twofifth_margin'])) { echo 'margin-right:'.$this->options['twofifth_margin'].$this->options['twofifth_margin_type'].';'; }
    294                         echo '}';
    295                     }
    296                     if(isset($this->options['threefifth_width']) || isset($this->options['threefifth_margin']))
    297                     {
    298                         echo '.ezcol-three-fifth {';
    299                         if(isset($this->options['threefifth_width'])) { echo 'width:'.$this->options['threefifth_width'].$this->options['threefifth_width_type'].'; '; }
    300                         if(isset($this->options['threefifth_margin'])) { echo 'margin-right:'.$this->options['threefifth_margin'].$this->options['threefifth_margin_type'].';'; }
    301                         echo '}';
    302                     }
    303                     if(isset($this->options['fourfifth_width']) || isset($this->options['fourfifth_margin']))
    304                     {
    305                         echo '.ezcol-four-fifth {';
    306                         if(isset($this->options['fourfifth_width'])) { echo 'width:'.$this->options['fourfifth_width'].$this->options['fourfifth_width_type'].';'; }
    307                         if(isset($this->options['fourfifth_margin'])) { echo 'margin-right:'.$this->options['fourfifth_margin'].$this->options['fourfifth_margin_type'].';'; }
    308                         echo '}';
    309                     }
    310                     echo "\n";
    311                     ?>
    312                     </style>
    313                     <!-- End Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
    314                     <?php
    315                 }
    316311            } // end if($this->use_custom)
    317312        }// end add_css
    … …  
    386381                'fourfifth_width_type' => '%',
    387382                'fourfifth_margin' => '',
    388                 'fourfifth_margin_type' => '%'
     383                'fourfifth_margin_type' => '%',
     384                'custom_css' => ''
    389385            );
    390386
    … …  
    427423                }
    428424                $this->options = $options;
    429                 $this->options['use_custom'] = (isset($_POST['use_custom']))? true : false;
     425                $this->options['use_custom'] = (!empty($_POST['use_custom']))? true : false;
    430426                update_option($this->ez_columns_options_name, $this->options);
    431427
    … …  
    478474    if (function_exists('register_uninstall_hook'))
    479475    {
    480         register_uninstall_hook(__FILE__, array(&$ez_columns, 'uninstall'));
     476        register_uninstall_hook(__FILE__, array('EasyColumns', 'uninstall'));
    481477    }
    482478}

  • easy-columns/trunk/readme.txt

    r767230 r791582  
    44Tags: columns, column, grid layout, box, boxes, feature box, layout, magazine, page, posts, magazine columns, magazine layout, float div
    55Requires at least: 2.7
    6 Tested up to: 3.6
    7 Stable tag: 2.1.1
     6Tested up to: 3.6.1
     7Stable tag: 2.1.2
    88
    99Easy 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.
    … …  
    113113== Changelog ==
    114114
     115= 2.1.2 =
     116* Changed the tinyMCE window to load wp-load.php instead of wp-config.php
     117* Added jQuery to tinyMCE window
     118* Added class input to column selection - applies a CSS class name to all the columns you insert
     119* Added better styling to the options page
     120* Fixed the custom CSS not rendering issue - Easy Columns options will now render.
     121* Added a Custom CSS option to the options page - style columns with custom classes or use the base classes!
     122* Changed ezcol-divider class to be height: 0 margin: 0
     123* Should have any uninstall hook erros fixed
     124
    115125= 2.1.1 =
    116126* Added parent class to keep content max-wisth at 100% to prevent overflow

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

    r763400 r791582  
    2020                    file : url + '/window.php?',
    2121                    width : 764 + ed.getLang('ezColumns.delta_width', 0),
    22                     height : 500 + ed.getLang('ezColumns.delta_height', 0),
     22                    height : 520 + ed.getLang('ezColumns.delta_height', 0),
    2323                    inline : 1
    2424                }, {

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

    r763400 r791582  
    11<?php
    2 while(!is_file('wp-config.php')){
     2while(!is_file('wp-load.php')){
    33  if(is_dir('../')){ chdir('../'); }
    4   else die('Could not find WordPress.');
    5 }
    6 include('wp-config.php');
    7 
    8 wp_enqueue_script('jquery');
    9 global $wp_scripts;
    10 global $wpdb;
    11 
     4  else die('Could not find wp-load.php.');
     5}
     6require_once('wp-load.php');
    127// check for rights
    138if ( !is_user_logged_in() || !current_user_can('edit_posts') )
    149    wp_die(__("You are not allowed to be here"));
     10global $wp_scripts;
     11global $wpdb;
    1512?>
    1613<!DOCTYPE html>
    … …  
    4542}
    4643</style>
    47 <script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
    48 <script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
    49 <script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
    50 <script language="javascript" type="text/javascript">
     44<script src="//code.jquery.com/jquery-1.10.1.min.js"></script>
     45<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
     46<script src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
     47<script src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
     48<script src="<?php echo get_option('siteurl') ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
     49<script>
    5150var colTxt = ' ';
    5251function init() {
    … …  
    5554
    5655function insertColumns(col) {
    57     colTxt = ' ';
     56    colTxt = '';
     57    colClass = jQuery('#txtColClass').val().trim();
     58    colClass = (colClass != '')? ' class="'+colClass+'"' : '' ;
    5859    switch(col)
    5960    {
    6061        /* single columns */
    6162        case 'quarter':
    62             colTxt += '[ezcol_1quarter id="" class="" style=""]Quarter Column[/ezcol_1quarter] ';
     63            colTxt += '[ezcol_1quarter]Quarter Column[/ezcol_1quarter]';
    6364            break;
    6465        case 'half':
    65             colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
     66            colTxt += '[ezcol_1half]Half Column[/ezcol_1half]';
    6667            break;
    6768        case 'threequarter':
    68             colTxt += '[ezcol_3quarter id="" class="" style=""]Three Quarter Column[/ezcol_3quarter] ';
     69            colTxt += '[ezcol_3quarter]Three Quarter Column[/ezcol_3quarter]';
    6970            break;
    7071        case 'third':
    71             colTxt += '[ezcol_1third id="" class="" style=""]Third Column[/ezcol_1third] ';
     72            colTxt += '[ezcol_1third]Third Column[/ezcol_1third]';
    7273            break;
    7374        case 'twothirds':
    74             colTxt += '[ezcol_2third id="" class="" style=""]Two Thirds Column[/ezcol_2third] ';
     75            colTxt += '[ezcol_2third]Two Thirds Column[/ezcol_2third]';
    7576            break;
    7677        case 'onefifth':
    77             colTxt += '[ezcol_1fifth id="" class="" style=""]One Fifth Column[/ezcol_1fifth] ';
     78            colTxt += '[ezcol_1fifth]One Fifth Column[/ezcol_1fifth]';
    7879            break;
    7980        case 'twofifths':
    80             colTxt += '[ezcol_2fifth id="" class="" style=""]Two Fifths Column[/ezcol_2fifth] ';
     81            colTxt += '[ezcol_2fifth]Two Fifths Column[/ezcol_2fifth]';
    8182            break;
    8283        case 'threefifths':
    83             colTxt += '[ezcol_3fifth id="" class="" style=""]Three Fifths Column[/ezcol_3fifth] ';
     84            colTxt += '[ezcol_3fifth]Three Fifths Column[/ezcol_3fifth]';
    8485            break;
    8586        case 'fourfifths':
    86             colTxt += '[ezcol_4fifth id="" class="" style=""]Four Fifths Column[/ezcol_4fifth] ';
     87            colTxt += '[ezcol_4fifth]Four Fifths Column[/ezcol_4fifth]';
    8788            break;
    8889
    8990        /* 1/3, 2/3 */
    9091        case '3third':
    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] ';
     92            colTxt += '[ezcol_1third'+colClass+']Third Column[/ezcol_1third] ';
     93            colTxt += '[ezcol_1third'+colClass+']Third Column[/ezcol_1third] ';
     94            colTxt += '[ezcol_1third_end'+colClass+']Third Column[/ezcol_1third_end]';
    9495            break;
    9596        case '1third2third':
    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] ';
     97            colTxt += '[ezcol_1third'+colClass+']Third Column[/ezcol_1third] ';
     98            colTxt += '[ezcol_2third_end'+colClass+']Two Thirds Column[/ezcol_2third_end]';
    9899            break;
    99100        case '2third1third':
    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] ';
     101            colTxt += '[ezcol_2third'+colClass+']Two Thirds Column[/ezcol_2third] ';
     102            colTxt += '[ezcol_1third_end'+colClass+']Third Column[/ezcol_1third_end]';
    102103            break;
    103104
    104105        /* 1/4, 1/2, 3/4 */
    105106        case '4quarter':
    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] ';
     107            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     108            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     109            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     110            colTxt += '[ezcol_1quarter_end'+colClass+']Quarter Column[/ezcol_1quarter_end]';
    110111            break;
    111112        case '1half2quarter':
    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] ';
     113            colTxt += '[ezcol_1half'+colClass+']Half Column[/ezcol_1half] ';
     114            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     115            colTxt += '[ezcol_1quarter_end'+colClass+']Quarter Column[/ezcol_1quarter_end]';
    115116            break;
    116117        case 'quarterhalfquarter':
    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] ';
     118            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     119            colTxt += '[ezcol_1half'+colClass+']Half Column[/ezcol_1half] ';
     120            colTxt += '[ezcol_1quarter_end'+colClass+']Quarter Column[/ezcol_1quarter_end]';
    120121            break;
    121122        case '2quarter1half':
    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] ';
     123            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     124            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     125            colTxt += '[ezcol_1half_end'+colClass+']Half Column[/ezcol_1half_end]';
    125126            break;
    126127        case '2half':
    127             colTxt += '[ezcol_1half id="" class="" style=""]Half Column[/ezcol_1half] ';
    128             colTxt += '[ezcol_1half_end id="" class="" style=""]Half Column[/ezcol_1half_end] ';
     128            colTxt += '[ezcol_1half'+colClass+']Half Column[/ezcol_1half] ';
     129            colTxt += '[ezcol_1half_end'+colClass+']Half Column[/ezcol_1half_end]';
    129130            break;
    130131        case '1quarter3quarter':
    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] ';
     132            colTxt += '[ezcol_1quarter'+colClass+']Quarter Column[/ezcol_1quarter] ';
     133            colTxt += '[ezcol_3quarter_end'+colClass+']Three Quarter Column[/ezcol_3quarter_end]';
    133134            break;
    134135        case '3quarter1quarter':
    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] ';
     136            colTxt += '[ezcol_3quarter'+colClass+']Three Quarter Column[/ezcol_3quarter] ';
     137            colTxt += '[ezcol_1quarter_end'+colClass+']Quarter Column[/ezcol_1quarter_end]';
    137138            break;
    138139
    139140        /* 1/5, 2/5, 3/5, 4/5 */
    140141        case '5fifth':
    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] ';
     142            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     143            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     144            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     145            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     146            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    146147            break;
    147148        case '2fifth31fifth':
    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] ';
     149            colTxt += '[ezcol_2fifth'+colClass+']Two Fifths Column[/ezcol_2fifth] ';
     150            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     151            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     152            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    152153            break;
    153154        case '1fifth2fifth21fifth':
    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] ';
     155            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     156            colTxt += '[ezcol_2fifth'+colClass+']Two Fifths Column[/ezcol_2fifth] ';
     157            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     158            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    158159            break;
    159160        case '21fifth2fifth1fifth':
    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] ';
     161            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     162            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     163            colTxt += '[ezcol_2fifth'+colClass+''+colClass+']Two Fifths Column[/ezcol_2fifth] ';
     164            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    164165            break;
    165166        case '31fifth2fifth':
    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] ';
     167            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     168            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     169            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     170            colTxt += '[ezcol_2fifth_end'+colClass+']Two Fifths Column[/ezcol_2fifth_end]';
    170171            break;
    171172        case '3fifth21fifth':
    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] ';
     173            colTxt += '[ezcol_3fifth'+colClass+']Three Fifths Column[/ezcol_3fifth] ';
     174            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     175            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    175176            break;
    176177        case '1fifth3fifth1fifth':
    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] ';
     178            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     179            colTxt += '[ezcol_3fifth'+colClass+']Three Fifths Column[/ezcol_3fifth] ';
     180            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    180181            break;
    181182        case '21fifth3fifth':
    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] ';
     183            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     184            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     185            colTxt += '[ezcol_3fifth_end'+colClass+']Three Fifths Column[/ezcol_3fifth_end]';
    185186            break;
    186187        case '2fifth3fifth':
    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] ';
     188            colTxt += '[ezcol_2fifth'+colClass+']Two Fifths Column[/ezcol_2fifth] ';
     189            colTxt += '[ezcol_3fifth_end'+colClass+']Three Fifths Column[/ezcol_3fifth_end]';
    189190            break;
    190191        case '3fifth2fifth':
    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] ';
     192            colTxt += '[ezcol_3fifth'+colClass+']Three Fifths Column[/ezcol_3fifth] ';
     193            colTxt += '[ezcol_2fifth_end'+colClass+']Two Fifths Column[/ezcol_2fifth_end]';
    193194            break;
    194195        case '1fifth4fifth':
    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] ';
     196            colTxt += '[ezcol_1fifth'+colClass+']One Fifth Column[/ezcol_1fifth] ';
     197            colTxt += '[ezcol_4fifth_end'+colClass+']Four Fifths Column[/ezcol_4fifth_end]';
    197198            break;
    198199        case '4fifth1fifth':
    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] ';
     200            colTxt += '[ezcol_4fifth'+colClass+']Four Fifths Column[/ezcol_4fifth] ';
     201            colTxt += '[ezcol_1fifth_end'+colClass+']One Fifth Column[/ezcol_1fifth_end]';
    201202            break;
    202203    }
    … …  
    436437            </table>
    437438
     439            <table border="0" cellpadding="2" cellspacing="0">
     440                <tr>
     441                    <td class="hdrRow">
     442                        <h3><label for="txtColClass">Add Class to Columns:</label></h3>
     443                    </td>
     444                    <td>
     445                        <input type="text" id="txtColClass" size="10">
     446                    </td>
     447                </tr>
     448            </table>
     449
    438450            <hr>
    439451
Note: See TracChangeset for help on using the changeset viewer.