Changeset 7229

Timestamp:

Oct 16, 2010, 5:36:55 PM (14 years ago)

Author:

cljosse

Message:

[Autosize][beta]fix bugs with rv_gmaps, option show icon.

Location:

extensions/Autosize

Files:

• admin/template/admin.tpl (modified) (2 diffs)
• autosize.inc.php (modified) (3 diffs)
• include/affiche.php (modified) (1 diff)
• js/conflit.js (modified) (2 diffs)
• language/en_UK/lang.php (modified) (1 diff)
• language/fr_FR/lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/Autosize/admin/template/admin.tpl

@@ -106 +106 @@
 
   </fieldset>
+
   </table>
 
@@ -145 +146 @@
 
   </fieldset>
-  </table>
+ </table>
+ <table>
+  <tr><td style="visibility:visible">{'cl_autosize_icon_view'|@translate}
+         <input type="checkbox" name="check_icon_v" value="on"  {$check_icon_v}  />
+  </td><td></td><td></td></tr>
+</table>
+ 
   <table>
   <td><input name="submit" type="submit" value="{'cl_autosize_save'|@translate}" /></td>

extensions/Autosize/autosize.inc.php

@@ -41 +41 @@
                                 $autosize_parametres = cl_autosize_Get_Options();
                                 include (AUTOSIZE_PATH."include/affiche.php");   
-
+                                if($autosize_parametres->check_icon_v == 'on'){
                                 $template->assign('cl_autosize_button', 
                                  array(
@@ -54 +54 @@
                                 $template->set_filenames(array('cl_bp' => $my_path. 'template/picture.tpl'));
                                 $template->concat('PLUGIN_PICTURE_ACTIONS', $template->parse('cl_bp', true));
-
+                                }
                                 $template->set_filenames(
                                                 array('autosize_content'=> $my_path.'template/autosize.tpl')
@@ -235 +235 @@
    $autosize_parametres->check_auto_w = isset($_POST['check_auto_w']) ? $_POST['check_auto_w'] : ( ( isset($autosize_parametres->check_auto_w) ) ? $autosize_parametres->check_auto_w :   'off') ; ;
    }
-
+if ( isset($_POST['submit'] ) && $_POST['submit'] == l10n('cl_autosize_save') )  { 
+   $autosize_parametres->check_icon_v = isset($_POST['check_icon_v']) ? $_POST['check_icon_v'] : "off" ;
+         }else{
+   $autosize_parametres->check_icon_v = isset($_POST['check_icon_v']) ? $_POST['check_icon_v'] : ( ( isset($autosize_parametres->check_icon_v) ) ? $autosize_parametres->check_icon_v :   'off') ; ;
+   }
 return $autosize_parametres;
 }

extensions/Autosize/include/affiche.php

@@ -25 +25 @@
                     'ECHELLE_MAX' => $autosize_parametres->echelle_max,
                     'check_auto_w' => ($autosize_parametres->check_auto_w == 'on') ? 'checked="checked"'  : '' ,
-                    'webmaster_width' => $autosize_parametres->webmaster_width,
+                    'check_icon_v' => ($autosize_parametres->check_icon_v == 'on') ? 'checked="checked"'  : '' ,
+                                        'webmaster_width' => $autosize_parametres->webmaster_width,
                     'webmaster_height' => $autosize_parametres->webmaster_height,
                     'admin_width' => $autosize_parametres->admin_width,

extensions/Autosize/js/conflit.js

@@ -160 +160 @@
      //==================================================
      tpe = typeof (element);
-    
+      if (Prototype_Version != '0') {
+          if (tpe == "string") {   
+           //=== rvmaps === //
+              if (element.match(/[a-z]_[a-z]/)) {
+                  
+                  return jQuery().$Protype(element);
+              }
+          id = "window_" + new Date().getTime();
+              var reg1 = new RegExp("^window_", "g");
+              if (element.match(reg1, "g")) {
+                  
+                  if (element.match(/_[a-z]/)) {
+                      return jQuery().$Protype(element);
+                  }
+                  return null;
+              }
+          }
+     }
     //========== test jQuery ? ==============
 
@@ -245 +262 @@
         if (MooTools_version == "Luciano")  return ret_Luciano;
         //=== theme gally ? ====
+        
             return new_element;
         }

extensions/Autosize/language/en_UK/lang.php

@@ -1 +1 @@
 <?php
 global $lang;
+$lang['cl_autosize_icon_view'] = "Show an icon in the toolbar";
 $lang['cl_autosize_info_2'] = "No resizing Display.";
 $lang['cl_autosize_info'] = 'Allows automatic resizing of the display with respect to explorer window.';

extensions/Autosize/language/fr_FR/lang.php

@@ -1 +1 @@
 <?php
 global $lang;
+$lang['cl_autosize_icon_view'] = "Affiche une icône dans la barre d'outils";
 $lang['cl_autosize_info'] = "Permet d'ajuster automatiquement l'affichage en fonction de la fenêtre de l'explorateur.";
 $lang['cl_autosize_info_2'] = "Affichage fixe.";

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 1.1.0
+Version: 1.2.1
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448