Changeset 3347

Timestamp:

02/03/15 12:50:58 (9 years ago)

Author:

brol

Message:

voir changelog

Location:

plugins/dayMode

Files:

• _admin.php (modified) (3 diffs)
• _define.php (modified) (2 diffs)
• _install.php (modified) (3 diffs)
• _prepend.php (modified) (3 diffs)
• _public.php (modified) (5 diffs)
• _widgets.php (modified) (5 diffs)
• changelog (added)
• default-templates/archive_day.html (deleted)
• default-templates/currywurst (added)
• default-templates/currywurst/archive_day.html (added)
• default-templates/mustek (added)
• default-templates/mustek/archive_day.html (added)
• icon.png (deleted)
• inc/class.dc.calendar.php (modified) (3 diffs)
• locales/fr/main.po (modified) (5 diffs)

plugins/dayMode/_admin.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) return;
 
 require_once dirname(__FILE__).'/_widgets.php';
@@ -16 +16 @@
 $core->addBehavior('adminBlogPreferencesForm',array('dayModeBehaviors','adminBlogPreferencesForm'));
 $core->addBehavior('adminBeforeBlogSettingsUpdate',array('dayModeBehaviors','adminBeforeBlogSettingsUpdate'));
-?>

plugins/dayMode/_define.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) return;
 
 $this->registerModule(
      /* Name */          "dayMode",
-     /* Description*/    "Provides daily archives and an associated calendar widget.",
+     /* Description*/    "Provides daily archives and an associated calendar widget",
      /* Author */        "Pep and contributors",
-     /* Version */       '1.0.1',
-     /* Permissions */   'admin'
+     /* Version */       '1.1-RC3',
+     /* Properties */
+     array(
+          'permissions' => 'admin',
+          'type' => 'plugin',
+          'dc_min' => '2.7',
+          'support' => 'http://lab.dotclear.org/wiki/plugin/dayMode',
+          'details' => 'http://plugins.dotaddict.org/dc2/details/dayMode'
+     )
 );
-?>

plugins/dayMode/_install.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_CONTEXT_ADMIN')) exit;
+if (!defined('DC_CONTEXT_ADMIN')) return;
 
 $package_version = $core->plugins->moduleInfo('dayMode','version');
@@ -18 +18 @@
 }
 
-$core->blog->settings->setNameSpace('daymode');
-$core->blog->settings->put('daymode_active',false,'boolean','plugin activation',false,true);
+$core->blog->settings->addNameSpace('daymode');
+$core->blog->settings->daymode->put('daymode_active',false,'boolean','plugin activation',false,true);
 $core->setVersion('dayMode',$package_version);
 return true;
-?>

plugins/dayMode/_prepend.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) return;
 
 $GLOBALS['__autoload']['dcCalendar'] = dirname(__FILE__).'/inc/class.dc.calendar.php';
@@ -49 +49 @@
      }
 
-     public static function addTplPath(&$core)
+     public static function addTplPath($core)
      {
-          $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');
+          $tplset = $core->themes->moduleInfo($core->blog->settings->system->theme,'tplset');
+        if (!empty($tplset) && is_dir(dirname(__FILE__).'/default-templates/'.$tplset)) {
+            $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates/'.$tplset);
+        } else {
+            $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates/'.DC_DEFAULT_TPLSET);
+        }
      }
 
      // Admin behaviors
-     public static function adminBlogPreferencesForm(&$core,&$settings)
+     public static function adminBlogPreferencesForm($core,$settings)
      {
           echo
-          '<fieldset><legend>'.__('Daily Archives').'</legend>'.
+          '<div class="fieldset"><h4>'.__('Daily Archives').'</h4>'.
           '<p><label class="classic">'.
-          form::checkbox('daymode_active','1',$settings->daymode_active).
+          form::checkbox('daymode_active','1',$settings->daymode->daymode_active).
           __('Enable daily archives and calendar').'</label></p>'.
-          '</fieldset>';
+          '</div>';
      }
      
-     public static function adminBeforeBlogSettingsUpdate(&$settings)
+     public static function adminBeforeBlogSettingsUpdate($settings)
      {
-          $settings->setNameSpace('daymode');
+          $settings->addNameSpace('daymode');
           try {
-               $settings->put('daymode_active',!empty($_POST['daymode_active']),'boolean');
+               $settings->daymode->put('daymode_active',!empty($_POST['daymode_active']),'boolean');
           }
           catch (Exception $e) {
-               $settings->drop('daymode_active');
-               $settings->put('daymode_active',!empty($_POST['daymode_active']),'boolean');
+               $settings->daymode->drop('daymode_active');
+               $settings->daymode->put('daymode_active',!empty($_POST['daymode_active']),'boolean');
           }
-          $settings->setNameSpace('system');
      }
 }
-?>

plugins/dayMode/_public.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) return;
 
 require_once dirname(__FILE__).'/_widgets.php';
 
-if (!$core->blog->settings->daymode_active) {
+if (!$core->blog->settings->daymode->daymode_active) {
      return;
 }
@@ -59 +59 @@
           if ($GLOBALS['_ctx']->exists("day")) {
                $trg = 'day';
-               $format = $GLOBALS['core']->blog->settings->date_format;
+               $format = $GLOBALS['core']->blog->settings->system->date_format;
           } else {
                $trg = 'archives';
@@ -168 +168 @@
                if ($_ctx->day->isEmpty()) {
                     self::p404();
-                    return;
                }
 
@@ -176 +175 @@
                parent::archive($args);
           }
-          return;
      }
 }
-?>

plugins/dayMode/_widgets.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) return;
 
 $core->addBehavior('initWidgets',array('widgetsDayMode','init'));
@@ -16 +16 @@
 class widgetsDayMode
 {
-     public static function calendar(&$w)
+     public static function calendar($w)
      {
           global $core;
 
-          if (!$core->blog->settings->daymode_active) return;
-          
-          if ($w->archiveonly && $core->url->type != 'archive') {
+          if (!$core->blog->settings->daymode->daymode_active) return;
+
+          if ($w->offline)
                return;
-          }
+
+          if (($w->homeonly == 1 && $core->url->type != 'default') ||
+               ($w->homeonly == 2 && $core->url->type == 'default') ||
+      ($w->homeonly == 3 && $core->url->type != 'archive'))
+               return;
 
           $calendar = new dcCalendar($GLOBALS['core'], $GLOBALS['_ctx']);
@@ -30 +34 @@
 
           $res =
-          '<div id="calendar">'.
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
-          $calendar->draw().
-          '</div>';
-          return $res;
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
+          $calendar->draw();
+
+          return $w->renderDiv($w->content_only,'calendar '.$w->class,'',$res);
      }
 
-     public static function init(&$w)
+     public static function init($w)
      {
-         $w->create('calendar',__('Calendar'),array('widgetsDayMode','calendar'));
+         $w->create('calendar',__('DayMode: calendar'),array('widgetsDayMode','calendar'),
+               null,
+               __('Tickets calendar'));
          $w->calendar->setting('title',__('Title:'),__('Calendar'));
          $w->calendar->setting(
           'weekstart',
-          __('Week start'),
+          __('First day:'),
           0,
           'combo',
@@ -56 +61 @@
           ))
          );
-         $w->calendar->setting('archiveonly',__('Archives only'),1,'check');
+          $w->calendar->setting('homeonly',__('Display on:'),3,'combo',
+               array(
+                    __('All pages') => 0,
+                    __('Home page only') => 1,
+                    __('Except on home page') => 2,
+                    __('Archives only') => 3
+                    )
+          );
+          $w->calendar->setting('content_only',__('Content only'),0,'check');
+          $w->calendar->setting('class',__('CSS class:'),'');
+          $w->calendar->setting('offline',__('Offline'),0,'check');
      }
 }
-?>

plugins/dayMode/inc/class.dc.calendar.php

@@ -4 +4 @@
 # This file is part of dayMode, a plugin for Dotclear 2.
 #
-# Copyright (c) 2006-2009 Pep and contributors
+# Copyright (c) 2006-2010 Pep and contributors
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK ------------------------------------
-
+if (!defined('DC_RC_PATH')) {return;}
 class dcCalendar
 {
@@ -224 +224 @@
      }
 }
-?>

plugins/dayMode/locales/fr/main.po

@@ -5 +5 @@
 "POT-Creation-Date: 2009-03-27 12:42+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Pep <pep@callmepep.org>\n"
+"Last-Translator: Pep <pep@dotclear.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -12 +12 @@
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
+
+msgid "Provides daily archives and an associated calendar widget"
+msgstr "Fournit des archives du jour et un widget calendrier associé"
 
 #: _prepend.php:60
@@ -20 +23 @@
 msgid "Enable daily archives and calendar"
 msgstr "Activer les archives journalières et le calendrier"
+
+msgid "DayMode: calendar"
+msgstr "DayMode : calendrier"
+
+msgid "Tickets calendar"
+msgstr "Calendrier des billets"
 
 #: _widgets.php:41
@@ -32 +41 @@
 
 #: _widgets.php:45
-msgid "Week start"
-msgstr "Début de semaine"
+msgid "First day:"
+msgstr "Premier jour de la semaine :"
 
 #: _widgets.php:49
 msgid "Sunday"
-msgstr "Dimanche"
+msgstr "dimanche"
 
 #: _widgets.php:50
 msgid "Monday"
-msgstr "Lundi"
+msgstr "lundi"
 
 #: _widgets.php:51
 msgid "Tuesday"
-msgstr "Mardi"
+msgstr "mardi"
 
 #: _widgets.php:52
 msgid "Wednesday"
-msgstr "Mercredi"
+msgstr "mercredi"
 
 #: _widgets.php:53
 msgid "Thursday"
-msgstr "Jeudi"
+msgstr "jeudi"
 
 #: _widgets.php:54
 msgid "Friday"
-msgstr "Vendredi"
+msgstr "vendredi"
 
 #: _widgets.php:55
 msgid "Saturday"
-msgstr "Samedi"
+msgstr "samedi"
 
 #: _widgets.php:58
@@ -72 +81 @@
 msgid "Next day"
 msgstr "Journée suivante"
-
-