Changeset 3321

Timestamp:

01/11/15 20:43:01 (9 years ago)

Author:

Moe

Message:

DL Manager 1.1.7 : Mise à jour par brol

Location:

plugins/dlManager/trunk

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (2 diffs)
• _widget.php (modified) (3 diffs)
• changelog (modified) (2 diffs)
• default-templates/currywurst (added)
• default-templates/currywurst/media.html (added)
• default-templates/currywurst/media_player.html (added)
• default-templates/mustek (added)
• default-templates/mustek/media.html (added)
• default-templates/mustek/media_player.html (added)
• images/facebox/close.png (added)
• js/facebox.js (modified) (2 diffs)
• js/facebox.pack.js (modified) (3 diffs)
• locales/fr/main.po (modified) (7 diffs)

plugins/dlManager/trunk/_define.php

@@ -28 +28 @@
      /* Description*/                "Download manager with a public page and a widget",
      /* Author */                    "Moe (http://gniark.net/), Osku and Tomtom (http://blog.zenstyle.fr)",
-     /* Version */                   '1.1.6',
+     /* Version */                   '1.1.7',
      /* Properties */
      array(
           'permissions' => 'admin',
           'type' => 'plugin',
-          'dc_min' => '2.6',
+          'dc_min' => '2.7.3',
           'support' => 'http://lab.dotclear.org/wiki/plugin/dlManager/fr',
           'details' => 'http://lab.dotclear.org/wiki/plugin/dlManager/fr'

plugins/dlManager/trunk/_public.php

@@ -206 +206 @@
           }
 
-          $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);
+        }
 
           self::serveDocument('media.html','text/html',true,false);
@@ -278 +282 @@
                # /get static record
                
-               $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);
+        }
                
                self::serveDocument('media_player.html','text/html',true,false);

plugins/dlManager/trunk/_widget.php

@@ -85 +85 @@
           $w->dlManager->setting('content_only',__('Content only'),0,'check');
           $w->dlManager->setting('class',__('CSS class:'),'');
+          $w->dlManager->setting('offline',__('Offline'),0,'check');
      }
      
@@ -95 +96 @@
      {
           global $core;
+
+          if ($w->offline)
+               return;
           
   if (($w->homeonly == 1 && $core->url->type != 'default') ||
@@ -214 +218 @@
 
           # output
-          $header = (strlen($w->title) > 0)
-               ? '<h2>'.html::escapeHTML($w->title).'</h2>' : null;
-
           $link = (strlen($w->link) > 0) ? '<p class="text"><a href="'.
                dlManager::pageURL().'">'.html::escapeHTML($w->link).'</a></p>' : null;
 
-          return
-      ($w->content_only ? '' : '<div class="dlmanager'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-        $header.$str.$link.
-               ($w->content_only ? '' : '</div>');
+          $res =
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
+          $str.$link;
+
+          return $w->renderDiv($w->content_only,'dlmanager '.$w->class,'',$res);
      }
 }

plugins/dlManager/trunk/changelog

@@ -1 @@
-v1.1.6 (28-06-2014) Pierre Van Glabeke :
+v1.1.6 (10-01-2015) Pierre Van Glabeke :
 Correction php 5.3
 Ajout combo page, content_only et css dans le widget
@@ -8 +8 @@
 Déplacement et renommage de facebox.css
 Suppression fin de ligne unix
+Compatibilité dc2.7 (widget + templates)
+Dotclear 2.7.3 requis

plugins/dlManager/trunk/js/facebox.js

@@ -81 +81 @@
       overlay      : true,
       loadingImage : '/facebox/loading.gif',
-      closeImage   : '/facebox/closelabel.gif',
+      closeImage   : '/facebox/close.png',
       imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
       faceboxHtml  : '\
@@ -98 +98 @@
                 <div class="footer"> \
                   <a href="#" class="close"> \
-                    <img src="/facebox/closelabel.gif" title="close" alt="close" class="close_image" /> \
+                    <img src="/facebox/close.png" class="close_image" /> \
                   </a> \
                 </div> \

plugins/dlManager/trunk/js/facebox.pack.js

@@ -1 @@
-
 (function($){$.facebox=function(data,klass){$.facebox.loading()
 if(data.ajax)fillFaceboxFromAjax(data.ajax)
@@ -6 +5 @@
 else if($.isFunction(data))data.call($)
 else $.facebox.reveal(data,klass)}
-$.extend($.facebox,{settings:{opacity:0,overlay:true,loadingImage:'/facebox/loading.gif',closeImage:'/facebox/closelabel.gif',imageTypes:['png','jpg','jpeg','gif'],faceboxHtml:'\
+$.extend($.facebox,{settings:{opacity:0,overlay:true,loadingImage:'/facebox/loading.gif',closeImage:'/facebox/close.png',imageTypes:['png','jpg','jpeg','gif'],faceboxHtml:'\
     <div id="facebox" style="display:none;"> \
       <div class="popup"> \
@@ -21 +20 @@
                 <div class="footer"> \
                   <a href="#" class="close"> \
-                    <img src="/facebox/closelabel.gif" title="close" alt="close" class="close_image" /> \
+                    <img src="/facebox/close.png" class="close_image" /> \
                   </a> \
                 </div> \

plugins/dlManager/trunk/locales/fr/main.po

@@ -17 +17 @@
 "X-Poedit-SearchPath-0: .\n"
 
-#: _public.php:74
-#: public_l10n.php:13
-msgid "Home"
-msgstr ""
-
 #: _public.php:146
 msgid "parent directory"
@@ -55 +50 @@
 msgid "Download Manager"
 msgstr "Gestionnaire de téléchargements"
-
-#: public_l10n.php:2
-msgid "Archives"
-msgstr ""
 
 #: public_l10n.php:3
@@ -100 +91 @@
 msgstr "Billets contenant ce média"
 
-#: public_l10n.php:9
-msgid "Extension"
-msgstr "Extension"
-
 #: public_l10n.php:10
 msgid "File"
@@ -148 +135 @@
 #: _widget.php:184
 msgid "Preview:"
-msgstr ""
+msgstr "Voir :"
 
 #: public_l10n.php:22
 #: _widget.php:186
 msgid "Preview"
-msgstr ""
+msgstr "Voir"
 
 #: public_l10n.php:23
@@ -235 +222 @@
 #: index.php:174
 msgid "Leave empty to cancel this feature."
-msgstr ""
+msgstr "Laisser vide pour annuler cette fonction."
 
 #: index.php:168
@@ -283 +270 @@
 msgstr "Titre :"
 
-#: _widget.php:48
-#: _widget.php:61
-#: _widget.php:67
-#: _widget.php:76
-msgid "optional"
-msgstr "optionnel"
-
 #: _widget.php:54
 msgid "root directory:"
@@ -322 +302 @@
 msgid "Add a link to %s in the widget:"
 msgstr "Ajouter un lien vers %s dans le widget :"
+
+msgid "close"
+msgstr "fermer"