Dotclear

Changeset 2412:9aa048292cca for plugins


Ignore:
Timestamp:
10/16/13 23:23:09 (12 years ago)
Author:
Lepeltier kévin <kevin@…>
Branch:
widgets
Children:
2413:6af4dde5a9c0, 2414:850136421c06
Message:

widgets : On enlève advanced settings

Location:
plugins
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • plugins/blogroll/_widgets.php

    r2397 r2412  
    4141                    ) 
    4242          ); 
    43           $w->links->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    44           $w->links->advanced_setting('class',__('CSS class:'),''); 
     43          $w->links->setting('content_only',__('Content only'),0,'check'); 
     44          $w->links->setting('class',__('CSS class:'),''); 
    4545     } 
    4646      

  • plugins/pages/_widgets.php

    r2397 r2412  
    3838               array(__('Ascending') => 'asc', __('Descending') => 'desc') 
    3939          ); 
    40           $w->pages->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    41           $w->pages->advanced_setting('class',__('CSS class:'),''); 
     40          $w->pages->setting('content_only',__('Content only'),0,'check'); 
     41          $w->pages->setting('class',__('CSS class:'),''); 
    4242     } 
    4343      

  • plugins/simpleMenu/_widgets.php

    r2397 r2412  
    2727                    ) 
    2828          ); 
    29           $w->simplemenu->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    30           $w->simplemenu->advanced_setting('class',__('CSS class:'),''); 
     29          $w->simplemenu->setting('content_only',__('Content only'),0,'check'); 
     30          $w->simplemenu->setting('class',__('CSS class:'),''); 
    3131     } 
    3232} 

  • plugins/tags/_widgets.php

    r2397 r2412  
    3636                    ) 
    3737          ); 
    38           $w->tags->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    39           $w->tags->advanced_setting('class',__('CSS class:'),''); 
     38          $w->tags->setting('content_only',__('Content only'),0,'check'); 
     39          $w->tags->setting('class',__('CSS class:'),''); 
    4040     } 
    4141      

  • plugins/widgets/_default_widgets.php

    r2409 r2412  
    2222$__widgets->search->setting('homeonly',__('Display on:'),0,'combo', 
    2323     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    24 $__widgets->search->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    25 $__widgets->search->advanced_setting('class',__('CSS class:'),''); 
     24$__widgets->search->setting('content_only',__('Content only'),0,'check'); 
     25$__widgets->search->setting('class',__('CSS class:'),''); 
    2626 
    2727$__widgets->create('navigation',__('Navigation links'),array('defaultWidgets','navigation'),null,'List of navigation links'); 
    … …  
    2929$__widgets->navigation->setting('homeonly',__('Display on:'),0,'combo', 
    3030     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    31 $__widgets->navigation->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    32 $__widgets->navigation->advanced_setting('class',__('CSS class:'),''); 
     31$__widgets->navigation->setting('content_only',__('Content only'),0,'check'); 
     32$__widgets->navigation->setting('class',__('CSS class:'),''); 
    3333 
    3434$__widgets->create('bestof',__('Selected entries'),array('defaultWidgets','bestof'),null,'List of selected entries'); 
    … …  
    3737$__widgets->bestof->setting('homeonly',__('Display on:'),1,'combo', 
    3838     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    39 $__widgets->bestof->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    40 $__widgets->bestof->advanced_setting('class',__('CSS class:'),''); 
     39$__widgets->bestof->setting('content_only',__('Content only'),0,'check'); 
     40$__widgets->bestof->setting('class',__('CSS class:'),''); 
    4141 
    4242$__widgets->create('langs',__('Blog languages'),array('defaultWidgets','langs'),null,'List of available languages'); 
    … …  
    4444$__widgets->langs->setting('homeonly',__('Display on:'),1,'combo', 
    4545     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    46 $__widgets->langs->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    47 $__widgets->langs->advanced_setting('class',__('CSS class:'),''); 
     46$__widgets->langs->setting('content_only',__('Content only'),0,'check'); 
     47$__widgets->langs->setting('class',__('CSS class:'),''); 
    4848 
    4949$__widgets->create('categories',__('List of categories'),array('defaultWidgets','categories'),null,'List of categories'); 
    … …  
    5454$__widgets->categories->setting('homeonly',__('Display on:'),0,'combo', 
    5555     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    56 $__widgets->categories->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    57 $__widgets->categories->advanced_setting('class',__('CSS class:'),''); 
     56$__widgets->categories->setting('content_only',__('Content only'),0,'check'); 
     57$__widgets->categories->setting('class',__('CSS class:'),''); 
    5858 
    5959$__widgets->create('subscribe',__('Subscribe links'),array('defaultWidgets','subscribe'),null,'Feed subscription links (RSS or Atom)'); 
    … …  
    6262$__widgets->subscribe->setting('homeonly',__('Display on:'),1,'combo', 
    6363     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    64 $__widgets->subscribe->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    65 $__widgets->subscribe->advanced_setting('class',__('CSS class:'),''); 
     64$__widgets->subscribe->setting('content_only',__('Content only'),0,'check'); 
     65$__widgets->subscribe->setting('class',__('CSS class:'),''); 
    6666 
    6767$__widgets->create('feed',__('Feed reader'),array('defaultWidgets','feed'),null,'List of last entries from feed (RSS or Atom)'); 
    … …  
    7171$__widgets->feed->setting('homeonly',__('Display on:'),1,'combo', 
    7272     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    73 $__widgets->feed->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    74 $__widgets->feed->advanced_setting('class',__('CSS class:'),''); 
     73$__widgets->feed->setting('content_only',__('Content only'),0,'check'); 
     74$__widgets->feed->setting('class',__('CSS class:'),''); 
    7575 
    7676$__widgets->create('text',__('Text'),array('defaultWidgets','text'),null,'Simple text'); 
    … …  
    7979$__widgets->text->setting('homeonly',__('Display on:'),0,'combo', 
    8080     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    81 $__widgets->text->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    82 $__widgets->text->advanced_setting('class',__('CSS class:'),''); 
     81$__widgets->text->setting('content_only',__('Content only'),0,'check'); 
     82$__widgets->text->setting('class',__('CSS class:'),''); 
    8383 
    8484$__widgets->create('lastposts',__('Last entries'),array('defaultWidgets','lastposts'),null,'List of last entries published'); 
    … …  
    9797$__widgets->lastposts->setting('homeonly',__('Display on:'),1,'combo', 
    9898     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    99 $__widgets->lastposts->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    100 $__widgets->lastposts->advanced_setting('class',__('CSS class:'),''); 
     99$__widgets->lastposts->setting('content_only',__('Content only'),0,'check'); 
     100$__widgets->lastposts->setting('class',__('CSS class:'),''); 
    101101 
    102102$__widgets->create('lastcomments',__('Last comments'),array('defaultWidgets','lastcomments'),null,'List of last comments published'); 
    … …  
    105105$__widgets->lastcomments->setting('homeonly',__('Display on:'),1,'combo', 
    106106     array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2)); 
    107 $__widgets->lastcomments->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0'))); 
    108 $__widgets->lastcomments->advanced_setting('class',__('CSS class:'),''); 
     107$__widgets->lastcomments->setting('content_only',__('Content only'),0,'check'); 
     108$__widgets->lastcomments->setting('class',__('CSS class:'),''); 
    109109 
    110110# --BEHAVIOR-- initWidgets 

  • plugins/widgets/class.widgets.php

    r2395 r2412  
    139139     public $append_callback = null; 
    140140     private $settings = array(); 
    141      private $advance_id; 
    142      private $advanced_settings = array(); 
    143141      
    144142     public function serialize($order) { 
    … …  
    146144          foreach ($this->settings as $k=>$v) 
    147145               $values[$k]=$v['value']; 
    148           foreach ($this->advanced_settings as $k=>$v) 
    149                $values[$k]=$v['value']; 
    150146          $values['id']=$this->id; 
    151147          $values['order']=$order; 
    … …  
    193189     public function __get($n) 
    194190     { 
    195           $setting = null; 
    196191          if (isset($this->settings[$n])) { 
    197                $setting = $this->settings[$n]['value']; 
    198           } else if (isset($this->advanced_settings[$n])) { 
    199                $setting = $this->advanced_settings[$n]['value']; 
    200           } 
    201           return $setting; 
     192               return $this->settings[$n]['value']; 
     193          } 
     194          return null; 
    202195     } 
    203196      
    … …  
    206199          if (isset($this->settings[$n])) { 
    207200               $this->settings[$n]['value'] = $v; 
    208           } else if (isset($this->advanced_settings[$n])) { 
    209                $this->advanced_settings[$n]['value'] = $v; 
    210201          } 
    211202     } 
    … …  
    231222     } 
    232223      
    233      public function advanced_setting($name,$title,$value,$type='text') 
    234      { 
    235           if ($type == 'combo' || $type == 'radio') { 
    236                $options = @func_get_arg(4); 
    237                if (!is_array($options)) { 
    238                     return false; 
    239                } 
    240           } 
    241            
    242           $this->advanced_settings[$name] = array( 
    243                'title' => $title, 
    244                'type' => $type, 
    245                'value' => $value 
    246           ); 
    247            
    248           if (isset($options)) { 
    249                $this->advanced_settings[$name]['options'] = $options; 
    250           } 
    251      } 
    252       
    253      public function advance_settings() 
    254      { 
    255           return $this->advanced_settings; 
    256      } 
    257       
    258224     public function settings() 
    259225     { 
    … …  
    268234               $res .= $this->formSetting($id,$s,$pr,$i=0); 
    269235               $i++; 
    270           } 
    271            
    272           if ( count($this->advanced_settings) > 0 ) 
    273           { 
    274                $res .= '<div class="widgetAdvancedSettings">'; 
    275                $res .= '<h5>'.__('Réglages avancés').'</h5>'; 
    276            
    277                foreach ($this->advanced_settings as $id => $s) 
    278                { 
    279                     $res .= $this->formSetting($id,$s,$pr,$i); 
    280                     $i++; 
    281                } 
    282                 
    283                $res .= '</div>'; 
    284236          } 
    285237           

  • plugins/widgets/index.php

    r2408 r2412  
    9090                    } 
    9191               } 
    92                 
    9392          } 
    9493           
    … …  
    155154     try 
    156155     { 
    157            
    158156          # Removing mark as _rem widgets 
    159157          foreach ($_POST['w'] as $nsid => $nsw) { 
Note: See TracChangeset for help on using the changeset viewer.

Sites map