Changeset 2533

Timestamp:

08/09/10 14:36:19 (13 years ago)

Author:

philippe

Message:

ColorBox? plugin version 1.4:
*Dotclear 2.2 only
*added credits in help files
*code cleaning

Location:

plugins/colorbox

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• index.php (modified) (7 diffs)
• locales/en/help/advanced_help.html (modified) (1 diff)
• locales/fr/help/advanced_help.html (modified) (1 diff)
• locales/fr/main.po (modified) (2 diffs)

plugins/colorbox/_define.php

@@ -15 +15 @@
      /* Description*/         "ColorBox like effect on images using jquery ColorBox plugin",
      /* Author */             "Philippe aka amalgame and Tomtom",
-     /* Version */            '1.3.9',
+     /* Version */            '1.4',
      /* Permissions */        'admin'
 );

plugins/colorbox/_install.php

@@ -21 +21 @@
 }
 
-# Settings compatibility test
-if (!version_compare(DC_VERSION,'2.1.7','<=')) {
-     $core->blog->settings->addNamespace('colorbox');
-     $s =& $core->blog->settings->colorbox;
-} else {
-     $core->blog->settings->setNamespace('colorbox');
-     $s =& $core->blog->settings;
-}
+# Settings
+$core->blog->settings->addNamespace('colorbox');
+$s =& $core->blog->settings->colorbox;
 
 $opts = array(

plugins/colorbox/_public.php

@@ -17 +17 @@
      public static function publicHeadContent($core)
      {
-          # Settings compatibility test
-          if (!version_compare(DC_VERSION,'2.1.7','<=')) {
-               $s =& $core->blog->settings->colorbox;
-          } else {
-               $core->blog->settings->setNamespace('colorbox');
-               $s =& $core->blog->settings;
-          }
+          # Settings
+          
+          $s =& $core->blog->settings->colorbox;
           
           if (!$s->colorbox_enabled) {

plugins/colorbox/index.php

@@ -15 +15 @@
 if (!$core->auth->check('admin',$core->blog->id)) { return; }
 
-# Settings compatibility test
-if (!version_compare(DC_VERSION,'2.1.7','<=')) {
-     $s =& $core->blog->settings->colorbox;
-} else {
-     $core->blog->settings->setNamespace('colorbox');
-     $s =& $core->blog->settings;
+#Lightbox enabled test
+
+if ($core->plugins->moduleExists('lightbox')) {
+     if ($core->blog->settings->lightbox->lightbox_enabled) {
+          $core->error->add(__('Lightbox plugin is enabled. Please disable it before using ColorBox.'));
+          return;
+     }
 }
+
+#Settings
+$s =& $core->blog->settings->colorbox;
 
 # Init var
@@ -121 +125 @@
                }
           });
-
      });
      </script>
@@ -136 +139 @@
 
 # Display messages
+
 if (isset($_GET['upd']))
 {
@@ -190 +194 @@
 
 # Zoom tab
-if ($s->colorbox_position == true) {
-     $left = true;
-     $right = false;
-} else {
-     $left = false;
-     $right = true;
-}
 
 echo
@@ -206 +203 @@
                __('Enable zoom icon on thumbnails').'</label></p>'.
                     '<p style="margin-left:1em;"><label class="classic">'.
-                    form::radio(array('colorbox_position'),true,$left).
+                    form::radio(array('colorbox_position'),true,$s->colorbox_position).
                     __('on the left').'</label></p>'.
                     '<p style="margin-left:1em;"><label class="classic">'.
-                    form::radio(array('colorbox_position'),false,$right).
+                    form::radio(array('colorbox_position'),false,!$s->colorbox_position).
                     __('on the right').'</label></p>'.
                     '<p><label class="classic">'.
@@ -221 +218 @@
 
 # Advanced tab
-
-if ($s->colorbox_user_files == true) {
-     $left = true;
-     $right = false;
-} else {
-     $left = false;
-     $right = true;
-}
 
 $effects = array(
@@ -242 +231 @@
                '<p>'.__('Store personnal CSS and image files in:').'</p>'.
                '<p><label class="classic">'.
-               form::radio(array('colorbox_user_files'),true,$left).
+               form::radio(array('colorbox_user_files'),true,$s->colorbox_user_files).
                __('public folder').'</label></p>'.
                '<p><label class="classic">'.
-               form::radio(array('colorbox_user_files'),false,$right).
+               form::radio(array('colorbox_user_files'),false,!$s->colorbox_user_files).
                __('theme folder').'</label></p>'.
                

plugins/colorbox/locales/en/help/advanced_help.html

@@ -5 +5 @@
   </head>
   <body>
+     <p>Based on <a href="http://colorpowered.com/colorbox/">ColorBox</a>, a light-weight customizable lightbox plugin for jQuery.</p>
     <h2>Advanced parameters help</h2>
     <h3>Personnal files</h3>

plugins/colorbox/locales/fr/help/advanced_help.html

@@ -5 +5 @@
   </head>
   <body>
+    <p>Basé sur <a href="http://colorpowered.com/colorbox/">ColorBox</a>, une lightbox légère et personnalisable pour jQuery.</p>
     <h2>Paramètres avancés</h2>
     <h3>Fichiers personnels</h3>

plugins/colorbox/locales/fr/main.po

@@ +1 @@
+msgid "Lightbox plugin is enabled. Please disable it before using ColorBox."
+msgstr "Le plugin Lightbox est activé. Désactivez-le pour utiliser ColorBox."
+
 msgid "Modal window configuration successfully saved"
 msgstr "Configuration de la fenêtre modale effectuée avec succès"
@@ -180 +183 @@
 
 msgid "Personnal files"
+
 msgstr "Fichiers personnels"