Changeset 2398:c06651a81e7e for plugins/widgets/_default_widgets.php

Timestamp:

10/05/13 17:56:12 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

widgets

Parents:

2397:effa61ef2c4b (diff), 2278:e4c8da04bec4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Files:

• plugins/widgets/_default_widgets.php (modified) (3 diffs)
• plugins/widgets/_default_widgets.php (modified) (1 diff)

plugins/widgets/_default_widgets.php

@@ -19 +19 @@
 
 $__widgets->create('search',__('Search engine'),array('defaultWidgets','search'),null,'Search engine form');
-$__widgets->search->setting('title',__('Title:'),__('Search'));
+$__widgets->search->setting('title',__('Title (optional)').' :',__('Search'));
 $__widgets->search->setting('homeonly',__('Display on:'),0,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->search->setting('content_only',__('Content only'),0,'check');
-$__widgets->search->setting('class',__('CSS class:'),'');
+$__widgets->search->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->search->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('navigation',__('Navigation links'),array('defaultWidgets','navigation'),null,'List of navigation links');
-$__widgets->navigation->setting('title',__('Title:'),'');
+$__widgets->navigation->setting('title',__('Title (optional)').' :','');
 $__widgets->navigation->setting('homeonly',__('Display on:'),0,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->navigation->setting('content_only',__('Content only'),0,'check');
-$__widgets->navigation->setting('class',__('CSS class:'),'');
+$__widgets->navigation->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->navigation->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('bestof',__('Selected entries'),array('defaultWidgets','bestof'),null,'List of selected entries');
-$__widgets->bestof->setting('title',__('Title:'),__('Best of me'));
+$__widgets->bestof->setting('title',__('Title (optional)').' :',__('Best of me'));
 $__widgets->bestof->setting('orderby',__('Sort:'),'asc','combo',array(__('Ascending') => 'asc', __('Descending') => 'desc'));
 $__widgets->bestof->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->bestof->setting('content_only',__('Content only'),0,'check');
-$__widgets->bestof->setting('class',__('CSS class:'),'');
+$__widgets->bestof->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->bestof->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('langs',__('Blog languages'),array('defaultWidgets','langs'),null,'List of available languages');
-$__widgets->langs->setting('title',__('Title:'),__('Languages'));
+$__widgets->langs->setting('title',__('Title (optional)').' :',__('Languages'));
 $__widgets->langs->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->langs->setting('content_only',__('Content only'),0,'check');
-$__widgets->langs->setting('class',__('CSS class:'),'');
+$__widgets->langs->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->langs->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('categories',__('Categories'),array('defaultWidgets','categories'),null,'List of categories');
-$__widgets->categories->setting('title',__('Title:'),__('Categories'));
+$__widgets->categories->setting('title',__('Title (optional)').' :',__('Categories'));
 $__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
 $__widgets->categories->setting('subcatscount', __('Include sub cats in count'), false, 'check');
@@ -54 +54 @@
 $__widgets->categories->setting('homeonly',__('Display on:'),0,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->categories->setting('content_only',__('Content only'),0,'check');
-$__widgets->categories->setting('class',__('CSS class:'),'');
+$__widgets->categories->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->categories->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('subscribe',__('Subscribe links'),array('defaultWidgets','subscribe'),null,'RSS or Atom feed subscription links');
-$__widgets->subscribe->setting('title',__('Title:'),__('Subscribe'));
+$__widgets->subscribe->setting('title',__('Title (optional)').' :',__('Subscribe'));
 $__widgets->subscribe->setting('type',__('Feeds type:'),'atom','combo',array('Atom' => 'atom', 'RSS' => 'rss2'));
 $__widgets->subscribe->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->subscribe->setting('content_only',__('Content only'),0,'check');
-$__widgets->subscribe->setting('class',__('CSS class:'),'');
+$__widgets->subscribe->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->subscribe->advanced_setting('class',__('CSS class:'),'');
 
-$__widgets->create('feed',__('Feed reader'),array('defaultWidgets','feed'),null,'Last entries from feed');
-$__widgets->feed->setting('title',__('Title:'),__('Somewhere else'));
+$__widgets->create('feed',__('Feed reader'),array('defaultWidgets','feed'),null,'Last entries from feed ( RSS or Atom )');
+$__widgets->feed->setting('title',__('Title (optional)').' :',__('Somewhere else'));
 $__widgets->feed->setting('url',__('Feed URL:'),'');
 $__widgets->feed->setting('limit',__('Entries limit:'),10);
 $__widgets->feed->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->feed->setting('content_only',__('Content only'),0,'check');
-$__widgets->feed->setting('class',__('CSS class:'),'');
+$__widgets->feed->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->feed->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('text',__('Text'),array('defaultWidgets','text'),null,'Simple text');
-$__widgets->text->setting('title',__('Title:'),'');
+$__widgets->text->setting('title',__('Title (optional)').' :','');
 $__widgets->text->setting('text',__('Text:'),'','textarea');
 $__widgets->text->setting('homeonly',__('Display on:'),0,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->text->setting('content_only',__('Content only'),0,'check');
-$__widgets->text->setting('class',__('CSS class:'),'');
+$__widgets->text->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->text->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('lastposts',__('Last entries'),array('defaultWidgets','lastposts'),null,'List of last entries published');
-$__widgets->lastposts->setting('title',__('Title:'),__('Last entries'));
+$__widgets->lastposts->setting('title',__('Title (optional)').' :',__('Last entries'));
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
 $categories = array('' => '', __('Uncategorized') => 'null');
@@ -97 +97 @@
 $__widgets->lastposts->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->lastposts->setting('content_only',__('Content only'),0,'check');
-$__widgets->lastposts->setting('class',__('CSS class:'),'');
+$__widgets->lastposts->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->lastposts->advanced_setting('class',__('CSS class:'),'');
 
 $__widgets->create('lastcomments',__('Last comments'),array('defaultWidgets','lastcomments'),null,'List of last comments posted');
-$__widgets->lastcomments->setting('title',__('Title:'),__('Last comments'));
+$__widgets->lastcomments->setting('title',__('Title (optional)').' :',__('Last comments'));
 $__widgets->lastcomments->setting('limit',__('Comments limit:'),10);
 $__widgets->lastcomments->setting('homeonly',__('Display on:'),1,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));
-$__widgets->lastcomments->setting('content_only',__('Content only'),0,'check');
-$__widgets->lastcomments->setting('class',__('CSS class:'),'');
+$__widgets->lastcomments->advanced_setting('content_only','',0,'radio', array(array(__('Content only'), '1'), array(__('Enclosing div'), '0')));
+$__widgets->lastcomments->advanced_setting('class',__('CSS class:'),'');
 
 # --BEHAVIOR-- initWidgets

plugins/widgets/_default_widgets.php

@@ -50 +50 @@
 $__widgets->categories->setting('title',__('Title (optional)').' :',__('Categories'));
 $__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
+$__widgets->categories->setting('subcatscount', __('Include sub cats in count'), false, 'check');
 $__widgets->categories->setting('with_empty',__('Include empty categories'),0,'check');
 $__widgets->categories->setting('homeonly',__('Display on:'),0,'combo',