Changeset 6445

Timestamp:

Jun 2, 2010, 8:57:34 AM (14 years ago)

Author:

cljosse

Message:

[Edit_gmaps] update for version piwigo 2.1

Location:

extensions/edit_gmaps

Files:

• admin/admin_edit.php (modified) (2 diffs)
• language/en_UK/description.txt (added)
• language/fr_FR/description.txt (added)
• main.inc.php (modified) (4 diffs)
• template/cl_conflit.tpl (modified) (2 diffs)

extensions/edit_gmaps/admin/admin_edit.php

@@ -4 +4 @@
 load_language('lang', dirname(__FILE__).'/../');
 $admin_url = PHPWG_ROOT_PATH.'admin.php';
-
+if (file_exists ( 'themes/default/js/jquery.packed.js')) 
+{
+//version 2.1
+ 
+   $icon_path = 'themes/default/icon/help.png';
+   $path_js=  'themes/default/js/' ; 
+
+ }
+ else
+ {
+// version < 1.9
+  $path_js=  "template-common/lib/";  
+  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
+}
 $sql="SELECT * 
 FROM `".$prefixeTable."plugins` 
@@ -173 +186 @@
 //===================================================================================
 $template->assign(
-    array(
-      'U_DISPLAY'=> $admin_url.get_query_string_diff(array('display')),
-           'VERSION'=> $version,
+    array(      'path_js' => $path_js,
+            'U_DISPLAY'=> $admin_url.get_query_string_diff(array('display')),
+                'VERSION'=> $version,
               ) 
   );

extensions/edit_gmaps/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: Edit Maps&Earth
-Version: 1.0.3
+Version: 2.1.0
 Description:  Editor for rv gmaps 
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=330
@@ -8 +8 @@
 */
 
-define( 'ed_rvm_PLUGIN_VERSION', '2.0.0');
+define( 'ed_rvm_PLUGIN_VERSION', '2.1.0');
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 add_event_handler('get_admin_plugin_menu_links', 'ed_rvm_plugin_admin_menu' );
@@ -14 +14 @@
 global $ed_rvm_dir;
 $ed_rvm_dir = basename( dirname(__FILE__) );
+
 
 
@@ -35 +36 @@
   global $template,$page;
  
+ if (file_exists ( 'themes/default/js/jquery.packed.js')) 
+{
+//version 2.1
  
+   $icon_path = 'themes/default/icon/help.png';
+   $path_js=  'themes/default/js/' ; 
+
+ }
+ else
+ {
+// version < 1.9
+  $path_js=  "template-common/lib/";  
+  $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
+}
  if (   isset($_GET['map'])   )
 {
+//===================================================================================
+$template->assign(
+    array(      'path_js' => $path_js,
 
+              ) 
+  );
  $template->set_filenames(array('cl_conflit' => dirname(__FILE__).'/template/cl_conflit.tpl'));
  $template->parse('cl_conflit');

extensions/edit_gmaps/template/cl_conflit.tpl

@@ -1 +1 @@
 <!--- My Conflit $ROOT_URL  --->
+{known_script id="jquery" src=$path_js|@cat:"jquery.packed.js"}
 
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {html_head}
 {literal}
@@ -7 +7 @@
   jQuery.noConflict();
 </script>{/literal}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:$path_j@cat"ui/ui.core.packed.js"}
 {known_script id="gally" src=$PLUGIN_ROOT_URL|@cat:"/template/script.js"}
 {/html_head}