Changeset 3382

Timestamp:

04/09/15 20:31:04 (9 years ago)

Author:

brol

Message:

0.2 voir changelog

Location:

plugins/widgetExternalSearch

Files:

• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• _widgets.php (modified) (6 diffs)
• changelog (added)
• locales/fr/main.po (modified) (1 diff)

plugins/widgetExternalSearch/_define.php

@@ -26 +26 @@
      /* Description*/         'External search in a widget',
      /* Author */                  'Moe (http://gniark.net/)',
-     /* Version */                 '0.1.1',
-     /* Permissions */        'usage,contentadmin'
+     /* Version */                 '0.2',
+     /* Properties */
+     array(
+          'permissions' => 'usage,contentadmin',
+          'type' => 'plugin',
+          'dc_min' => '2.7',
+          'support' => 'http://lab.dotclear.org/wiki/plugin/widgetExternalSearch',
+          'details' => 'http://plugins.dotaddict.org/dc2/details/widgetExternalSearch'
+          )
 );
-?>

plugins/widgetExternalSearch/_prepend.php

@@ -22 +22 @@
 if (!defined('DC_RC_PATH')) {return;}
 
-# inspired by contactMe/_public.php
 $core->url->register('externalSearch','externalSearch',
      '^externalSearch$',array('externalSearchDocument','page'));
 
 require_once(dirname(__FILE__).'/_widgets.php');
-
-?>

plugins/widgetExternalSearch/_public.php

@@ -53 +53 @@
      }
 }
-?>

plugins/widgetExternalSearch/_widgets.php

@@ -38 +38 @@
      {
           $w->create('externalSearchWidget',__('External search engine'),
-               array('externalSearchWidget','show'));
+               array('externalSearchWidget','show'),
+               null,
+               __('External search engine form'));
           
-          $w->externalSearchWidget->setting('title',
-               __('Title:').' ('.__('optional').')',
-               __('Search'),'text');
+          $w->externalSearchWidget->setting('title',__('Title (optional)').' :',__('Search'));
           
           $w->externalSearchWidget->setting('engine',__('Search engine:'),
@@ -51 +51 @@
                     )
                );
-          
-          $w->externalSearchWidget->setting('homeonly',__('Home page only'),
-               false,'check');
+          $w->externalSearchWidget->setting('homeonly',__('Display on:'),0,'combo',
+               array(
+                    __('All pages') => 0,
+                    __('Home page only') => 1,
+                    __('Except on home page') => 2
+                    )
+          );
+    $w->externalSearchWidget->setting('content_only',__('Content only'),0,'check');
+    $w->externalSearchWidget->setting('class',__('CSS class:'),'');
+          $w->externalSearchWidget->setting('offline',__('Offline'),0,'check');
      }
      
@@ -65 +72 @@
           global $core;
 
-          if ($w->homeonly && $core->url->type != 'default') {
+          if ($w->offline)
+               return;
+
+          if (($w->homeonly == 1 && $core->url->type != 'default') ||
+               ($w->homeonly == 2 && $core->url->type == 'default')) {
                return;
           }
@@ -71 +82 @@
           $url = preg_replace('/^(http([s]*)\:\/\/)/i','',
                $core->blog->url);
-                              
-          # output
-          $header = (strlen($w->title) > 0)
-               ? '<h2>'.html::escapeHTML($w->title).'</h2>' : null;
           
           switch($w->engine)
@@ -90 +97 @@
                case 'google' :
                     $form =
-                         '<form method="get" action="http://www.google.com/search">'.
+                         '<form method="get" action="https://www.google.com/search">'.
                          '<p><input type="text" size="10" maxlength="255" '.
                          'name="q" />'.
@@ -112 +119 @@
                     break;
           }
-          
-          return '<div class="externalSearch">'.$header.$form.'</div>';
+
+          $res =
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
+          $form;
+
+          return $w->renderDiv($w->content_only,'externalSearch '.$w->class,'',$res);
      }
 }
-?>

plugins/widgetExternalSearch/locales/fr/main.po

@@ -26 +26 @@
 msgstr "Moteur de recherche externe"
 
-#: _widgets.php:46
-msgid "Title:"
-msgstr ""
+msgid "External search engine form"
+msgstr "Formulaire de recherche externe"
 
 #: _widgets.php:46
-msgid "optional"
-msgstr "facultatif"
-
-#: _widgets.php:47
-msgid "Search"
-msgstr ""
+msgid "External search in a widget"
+msgstr "Recherche externe dans un widget"
 
 #: _widgets.php:49
 msgid "Search engine:"
 msgstr "Moteur de recherche :"
-
-#: _widgets.php:57
-msgid "Home page only"
-msgstr ""
-