Changeset 17776 for extensions/edit_gmaps

Timestamp:

Sep 6, 2012, 1:11:45 PM (12 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps compatibility 2.4 add batch mode global

Location:

extensions/edit_gmaps

Files:

• admin/admin.php (modified) (1 diff)
• admin/admin_edit.php (modified) (14 diffs)
• admin/admin_edit.tpl (modified) (3 diffs)
• admin/header.tpl (modified) (1 diff)
• admin/js/JScript.js (modified) (2 diffs)
• admin/js/fieldset.js (deleted)
• edit_gmaps.inc.php (modified) (1 diff)

extensions/edit_gmaps/admin/admin.php

@@ -10 +10 @@
   $page['tab'] = $_GET['tab'];
 
+   $page['tab'] = 'edit';
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
 
-$tabsheet = new tabsheet();
-$tabsheet->add( 'edit', 'edit', add_url_params( $my_base_url, array('tab'=>'edit') ) );
-$tabsheet->select($page['tab']);
-$tabsheet->assign();
-$my_base_url = $tabsheet->sheets[ $page['tab'] ]['url'];
-$ntpl=dirname(__FILE__).'\\admin_'.$page['tab'].'.tpl' ;
-$template->set_filename( 'tab_data', $ntpl ); 
+$template->set_filenames(
+      array('batch_manager_global' => 'batch_manager_global.tpl',        
+            'tab_data'=> dirname(__FILE__).'\\admin_'.$page['tab'].'.tpl'
+            ));
+
+          
+
 include_once( dirname(__FILE__).'/admin_'.$page['tab'].'.php'); 
+$template->assign_var_from_handle( 'BATCH_MANAGER_GLOBAL', 'batch_manager_global');
 $template->assign_var_from_handle( 'TAB_DATA', 'tab_data');
+$current  =  $template->get_template_vars('BATCH_MANAGER_GLOBAL');  
+    $template->concat('TAB_DATA', $current);  
+
+
+
+
 $template->assign_var_from_handle( 'ADMIN_CONTENT', 'plugin_admin_content');
 ?>

extensions/edit_gmaps/admin/admin_edit.php

@@ -48 +48 @@
 if (!isset($page['title'])) $page['title']="";
 if(!isset($_POST['selectAction'])) $_POST['selectAction']="" ;
-
 //$info_message .= cl_edit_functions::Memo_Vars($_POST);
+//========== Mode GLOBAL ================================
 check_input_parameter('selection', $_POST, true, PATTERN_ID);
-
 include (PHPWG_ROOT_PATH.'admin/batch_manager.php'); 
+    $tabsheet = new tabsheet();
+    $tabsheet->assign(); 
+  
+
+
 
 if(isset($page['cat_elements_id'])) 
@@ -58 +62 @@
 
  
-    $tabsheet = new tabsheet();
-    $tabsheet->assign(); 
-     
- // $current  =  $template->get_template_vars('TAB_DATA'); 
-// prefilters,tags
-
-//  $erreur_message .= cl_edit_functions::Memo_Vars( $current);
+ if(isset($_POST)){
+//  $info_message .= cl_edit_functions::Memo_Vars($_POST);
 
 //===============================================================
@@ -104 +103 @@
  
 if (count($collection)>0 )
-//=============================================================
   if (isset($_POST['update']) && $_POST['update']==l10n('update_exif')){
-  /************* Mise à jour des meta données ***************/
+    /******************************* 
+    *  Mise à jour des meta données 
+    *******************************/
     // error_reporting ( 0 );
     // Hide any unknown EXIF tags   
@@ -138 +138 @@
             if (array_search($id_0,$image)) {   
               //=================================================================
-              // Donnée base de donnée
-              //=================================================================
-         //     $info_message .= "<div style='border:2px solid red'>$id_0 Image:" . cl_edit_functions::Memo_vars($image)."</div>" ;
-                
-              //=================================================================
               // Meta donnée
               //=================================================================
@@ -169 +164 @@
  
            if(  cl_edit_controler::add_meta_gps($new_ps_file_info_array,$image)){
-              
-                $exif = @read_exif_data( $image['path']);
-                 $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
-                $info_message .= $image['path'] . " : " . $image['file'] . " : ok<BR />";
+                  $exif = @read_exif_data( $image['path']);
+                  $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
+                  $info_message .=l10n('update_exif') . ": " .  $image['path'] . " : " . $image['file'] . " : ok<BR />";
                 }else{
 
@@ -186 +180 @@
 //======================================================================
 if ( isset($_POST['submit'])  ) {
-  /******** Mise à jour base de données *****/
    if (   $_POST['submit'] == l10n('update_database') ){
+  /**************************************************
+   * Uniquement Mise à jour de la base de données 
+   **************************************************/
     if ( count($collection)>0 ){
         $lat = trim($_POST['lat']);
@@ -195 +191 @@
        if($lat !="") cl_edit_controler::add_data_base($collection,$lat,$lon,$alt) ;
         $_POST['submit'] = l10n('selectAction') ;
-            foreach ($collection as $id_0){
+        foreach ($collection as $id_0){
           foreach ($images as $image) {  
             if (array_search($id_0,$image)) {  
@@ -207 +203 @@
     }
  }
-
 /****************************************/
 $query = '
@@ -245 +240 @@
     $infos_gps  = array();
     $infos_gps  =  cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
-    $v_exif=$infos_gps['is_exif']?"EXIF":"" ;   
+    $v_exif=$infos_gps['is_exif']?"EXIF":"NO" ;   
     $v_db=false  ; 
     $v_db=$image['lat']!=0 && $image['lon']!=0;
-    $v_db=$v_db?"BD":"";
-
+    $v_db=$v_db?"BD":"NO";
+    //==== GPS infos -> image infos ====
     if(  $infos_gps['lat'] !=0  || $infos_gps['lon'] !=0 ) {      
       $new= ( !isset($image['lat'])? true: $image['lat']!=$infos_gps['lat'] ) ;
@@ -256 +251 @@
       $image['alt']=$infos_gps['alt'];
       $sel_img= array($image['id']);
-      if ($new) cl_edit_controler::add_data_base( $sel_img,$image['lat'],$image['lon'],$image['alt']) ;             
+      if ($new){ 
+
+              cl_edit_controler::add_data_base( $sel_img,$image['lat'],$image['lon'],$image['alt']) ; 
+      }            
    }         
   //================================================= 
@@ -273 +271 @@
      }
   //================================================= 
-   $tpl_var =  array_merge(
-                   $current[$j],     array(
-                  'ID' =>$image['id'], 
+  
+ $TN_SRC= $current[$j]['TN_SRC'];
+ $TITLE=$current[$j]['TITLE'] ;
+ 
+   $tpl_var = array(
+                  'ID' =>$image['id'],
+                  'TN_SRC' => $TN_SRC,
+                  'FILE' => $current[$j]['FILE'],
+                   'TITLE' => $TITLE,
+                  'LEVEL' =>  $current[$j]['LEVEL'],
+                  'FILE_SRC' => $current[$j]['FILE_SRC'],
+                  'U_EDIT' => $current[$j]['U_EDIT'],
                   'lat'  =>    $image['lat']    ,
                   'lon' =>     $image['lon']    ,
-                  'alt' =>     $image['alt']    ,               
-                  'TN_SRC' => get_thumbnail_url($image),
-                  'TITLE' => get_thumbnail_title($image,$name,$desc),
-                  'U_EXIF' => $v_exif,
-                  'U_BD' =>  $v_db ,
-                  'U_MAP' => cl_make_map_picture_url(
-                                                array(
-                                                      'image_id'=>$image['id'],
-                                                      'image_file'=>$image['file'],
-                                                      )
-                                                    )
-                        )
-                  );
-           
+                  'alt' =>     $image['alt']    ,   
+                  'U_EXIF' => $v_exif ,
+                  'U_BD' =>  $v_db  
+                   );
+             
+     
       $thumbnails[]=$tpl_var;  
       $j++;
@@ -339 +338 @@
 
   if (isset($collection)) {
+  /*********************************
+  * Affichage de la selection
+  *********************************/
     $init_info =true;
     $first_image=""; 
@@ -454 +456 @@
 
   //=======================================================================
+
+$v1=0;
+
+
+}
+
+if ($info_message!="")
+$template->assign('infos',$info_message);
+if ($erreur_message!="")
+$template->assign('errors',$erreur_message);
+
 function cl_make_map_picture_url($params)
 {
@@ -462 +475 @@
     return add_url_params($map_url, array('map'=>null) );
 }
-$v1=0;
-
-
-
-
-if ($info_message!="")
-$template->assign('infos',$info_message);
-if ($erreur_message!="")
-$template->assign('errors',$erreur_message);
-
-
 ?>

extensions/edit_gmaps/admin/admin_edit.tpl

@@ -40 +40 @@
  border:outset;
 }
+.thumbLegend { color:grey;
+
+}
+.thumbLegend:hover { color:white ;
+
+}
 {/literal}
 </style>
 {/html_head} 
  {$file_name}  
- <fieldset  id="Elements"  class="fieldset" >
-{include file= $GLOBAL_TPL}
-</fieldset>
  <script type="text/javascript"> 
    {if empty($Selectthumbnails)  }    
@@ -54 +57 @@
    {/if} 
     </script>
-{footer_script}{literal}
+{footer_script}
+
+var  infos_img = infos_img || [];
+        {foreach from=$thumbnails item=thumbnail}
+  infos_img[{$thumbnail.ID}]={ldelim}EXIF:"{$thumbnail.U_EXIF}",
+                              BD:"{$thumbnail.U_BD}",
+                              lon:"{$thumbnail.lon}",
+                              lat:"{$thumbnail.lat}",
+                              alt:"{$thumbnail.alt}"
+                              };
+             
+      {/foreach}
+
+
+{literal}
  
-jQuery(document).ready(function() {
-   
-
-
+jQuery(document).ready(function() {  
     {/literal}
-    val0="{'reset'|@translate}";
-        jQuery('input[value='+val0+']').click(function (i) {ldelim}
-    jQuery("#selectNone").click();
-  });
-
    title="{'selection'|@translate}|{'hlp_line3'|@translate}.";   
    value="{'selection'|@translate}" ;
-
    message='<p><input class="cluetip submit" type="submit" name="submit"   title="'+ title +'" value="'+ value +'"  /> ';
 
@@ -76 +84 @@
 
 });
+
 {/footer_script}
-<form action="" method="post" id="Envoie" name="Envoie"   >
-
-<fieldset   id ="geoposition"  class="fieldset" >
+<form action="" method="post" id="Envoie" name="Envoie" >
+
+<fieldset   id ="geoposition"  class="fieldset" style="display:none"  >
 <legend>{'Selection'|@translate}</legend>  
     <fieldset>    

extensions/edit_gmaps/admin/header.tpl

@@ -2 +2 @@
 {combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
 {combine_script id="EDIT_RV_script" load="footer" path=$EDIT_CL_PATH|@cat:"admin/js/JScript.js" require="jquery"}
-{combine_script id="fieldset" load="footer" path=$EDIT_CL_PATH|@cat:"admin/js/fieldset.js" require="jquery"}

extensions/edit_gmaps/admin/js/JScript.js

@@ -1 @@
-
+if (typeof console=="undefined") {
+  console = function (i) {
+
+  }
+  console.log = function () {
+
+  }
+}
 if (!window.log) {
   window.log = function () {
@@ -18 +25 @@
 
 jQuery(document).ready(function () {
-  jQuery('input').click(function (i) {
-
-
-  });
-
-  jQuery("#selectNone").click(function (i) {
-    no_affiche = "false";
-    if (no_affiche != "true") {
-      ef_reduce("geoposition", { fast: true })
-     
+
+  jQuery("#geoposition").each(function (i) {
+    if (no_affiche == "false") {
+      jQuery(this).hide();
     } else {
-      ef_reduce("Elements", { fast: true })
-    }
-
-    jQuery("#selectNone").css("color", "blue");
-
-
-  });
-  jQuery("#selectNone1").click(function (i) {
-    no_affiche = "true";
-    jQuery("#selectNone").css("color", "red");
-    jQuery("#selectNone").click();
-
-  });
+      jQuery(this).show();
+    }
+  });
+
 
   jQuery(".thumbnails label").each(function (i) {
     var wrap2 = jQuery(this).children(".wrap2");
-    wrap2.append("<span class='thumbLegend'> </span>");
-  });
-  jQuery("filedset").each(function (i) {
-
-
-  });
-
-  jQuery(".thumbnails label").each(function (i) {
-    var wrap2 = jQuery(this).children(".wrap2");
-
-  });
+    win_id = jQuery(this).children("input").val();
+    if (win_id) {
+      winp = infos_img[win_id];
+      if (!winp) return;
+      message = "";
+      if (winp.EXIF && winp.EXIF != "NO") message = winp.EXIF.toString() + " ";
+      if (winp.BD && winp.BD != "NO") message += winp.BD.toString();
+
+      wrap2.append("<div><span class='thumbLegend'  id='" + win_id + "'>" + message + " </span></div>");
+    }
+  });
+
+  jQuery(".thumbLegend").mouseover(function (i) {
+    winp = infos_img[this.id];
+    if (!winp) return;
+    message = "";
+    if (winp.lat) message = winp.lat.toString() + " ";
+    if (winp.lon) message += winp.lon.toString();
+
+    jQuery(this).text(message);
+
+  });
+  jQuery(".thumbLegend").mouseout(function (i) {
+    winp = infos_img[this.id];
+    if (!winp) return;
+    message = "";
+    if (winp.EXIF && winp.EXIF != "NO") message = winp.EXIF.toString() + " ";
+    if (winp.BD && winp.BD != "NO") message += winp.BD.toString();
+
+    jQuery(this).text(message);
+
+  });
+
+
+
 });
 

extensions/edit_gmaps/edit_gmaps.inc.php

@@ -220 +220 @@
 return $datas[0] ;
 }
-//======================================================
-/*
- *
- */
+
+/************************************************
+ * add_data_base
+ ************************************************/
  static public function add_data_base($sel,$lat,$lon,$alt){
     global $page,$info_message,$erreur_message ;