Index: /extensions/rv_gmaps/trunk/main.inc.php
===================================================================
--- /extensions/rv_gmaps/trunk/main.inc.php (revision 14180)
+++ /extensions/rv_gmaps/trunk/main.inc.php (revision 14181)
@@ -104,5 +104,5 @@
{
global $template;
- $template->append('head_elements', '' );
+ $template->append('head_elements', '' );
include_once( dirname(__FILE__) .'/include/functions.php');
rvm_load_language();
Index: /extensions/rv_gmaps/trunk/map.php
===================================================================
--- /extensions/rv_gmaps/trunk/map.php (revision 14180)
+++ /extensions/rv_gmaps/trunk/map.php (revision 14181)
@@ -15,18 +15,22 @@
$section = '';
if ( $conf['question_mark_in_urls']==false and
- isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
+ isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
{
- $section = $_SERVER["PATH_INFO"];
- $section = str_replace('//', '/', $section);
- $path_count = count( explode('/', $section) );
- $page['root_path'] = PHPWG_ROOT_PATH.str_repeat('../', $path_count-1);
+ $section = $_SERVER["PATH_INFO"];
+ $section = str_replace('//', '/', $section);
+ $path_count = count( explode('/', $section) );
+ $page['root_path'] = PHPWG_ROOT_PATH.str_repeat('../', $path_count-1);
+ if ( strncmp($page['root_path'], './', 2) == 0 )
+ {
+ $page['root_path'] = substr($page['root_path'], 2);
+ }
}
else
{
- foreach ($_GET as $key=>$value)
- {
- if (!strlen($value)) $section=$key;
- break;
- }
+ foreach ($_GET as $key=>$value)
+ {
+ if (!strlen($value)) $section=$key;
+ break;
+ }
}
Index: /extensions/rv_gmaps/trunk/map_data.php
===================================================================
--- /extensions/rv_gmaps/trunk/map_data.php (revision 14180)
+++ /extensions/rv_gmaps/trunk/map_data.php (revision 14181)
@@ -91,20 +91,20 @@
rvo( '{' );
-rvo( "\ntitle: ".jsgm_str( strip_tags(trigger_event('render_element_description', $page['title']) ) ) );
+rvo( "\ntitle:".jsgm_str( strip_tags(trigger_event('render_element_description', $page['title']) ) ) );
rvo( ",\n" );
-rvo( "page_url: ".jsgm_str( duplicate_index_url( array('start'=>0) ) ) );
+rvo( "page_url:".jsgm_str( duplicate_index_url( array('start'=>0) ) ) );
rvo( ",\n" );
-rvo( "blowup_url: ".jsgm_str( rvm_duplicate_blowup_url( array('start'=>0) ) ) );
+rvo( "blowup_url:".jsgm_str( rvm_duplicate_blowup_url( array('start'=>0) ) ) );
rvo( ",\n" );
-rvo( "kml_url: ".jsgm_str( rvm_duplicate_kml_index_url( array('start'=>0, 'flat'=>1) ) ) );
+rvo( "kml_url:".jsgm_str( rvm_duplicate_kml_index_url( array('start'=>0, 'flat'=>1) ) ) );
rvo( ",\n" );
-rvo( "nb_items: ".count($page['items']) );
+rvo( "nb_items:".count($page['items']) );
rvo( ",\n" );
-rvo( "bounds: " );
+rvo( "bounds:" );
if ( isset($cm) )
rvo( jsgm_bounds( $cm->bounds ) );
@@ -114,8 +114,8 @@
-rvo( "\nnb_clusters: ".count($clusters) );
+rvo( "\nnb_clusters:".count($clusters) );
rvo( "," );
-rvo( "\nimage_clusters: [\n" );
+rvo( "\nimage_clusters:[\n" );
$i=0;
foreach( $clusters as $c )
@@ -123,12 +123,12 @@
if ($i) rvo( ",\n\n" );
rvo( "{" );
- rvo( 'position: '. jsgm_position( bounds_center($c->bounds) ) );
+ rvo( 'position:'. jsgm_position( bounds_center($c->bounds) ) );
rvo( ",\n" );
- rvo( 'bounds: '. jsgm_bounds( $c->bounds ) );
+ rvo( 'bounds:'. jsgm_bounds( $c->bounds ) );
rvo( ",\n" );
- rvo( 'nb_items: '.count($c->items) );
+ rvo( 'nb_items:'.count($c->items) );
rvo( ",\n" );
- rvo( 'blowup_url: "'.rvm_duplicate_blowup_url(array('box'=>$c->bounds), array('start') ). '"' );
+ rvo( 'blowup_url:"'.rvm_duplicate_blowup_url(array('box'=>$c->bounds), array('start') ). '"' );
rvo( ",\n" );
@@ -138,5 +138,5 @@
$c->items = array_slice($c->items, 0, $max_per_cluster);
}
- rvo( 'items: [' );
+ rvo( 'items:[' );
for ($j=0; $jitems); $j++)
{
@@ -157,8 +157,8 @@
if ($j) rvo( "," );
rvo( "{" );
- rvo( "tn: ".jsgm_str( get_thumbnail_url( $img ) ) );
- rvo( ",name: ".jsgm_str( trigger_event('render_element_description', $title) ) );
- rvo( ",comment: ".jsgm_str( trigger_event('render_element_description', $img['comment']) ) );
- rvo( ",page_url: ".jsgm_str( $page_url ) );
+ rvo( "tn:".jsgm_str( get_thumbnail_url( $img ) ) );
+ rvo( ",name:".jsgm_str( trigger_event('render_element_description', $title) ) );
+ rvo( ",comment:".jsgm_str( trigger_event('render_element_description', $img['comment']) ) );
+ rvo( ",page_url:".jsgm_str( $page_url ) );
rvo( "}" );
}
Index: /extensions/rv_gmaps/trunk/mapl.php
===================================================================
--- /extensions/rv_gmaps/trunk/mapl.php (revision 14180)
+++ /extensions/rv_gmaps/trunk/mapl.php (revision 14181)
@@ -128,5 +128,5 @@
$template->assign(
array(
- 'PLUGIN_ROOT_URL' => get_absolute_root_url().'plugins/'.$rvm_dir,
+ 'PLUGIN_ROOT_URL' => get_absolute_root_url(false).'plugins/'.$rvm_dir,
'TITLE' => $title,
'U_HOME' => make_index_url(),
Index: /extensions/rv_gmaps/trunk/template/map.tpl
===================================================================
--- /extensions/rv_gmaps/trunk/template/map.tpl (revision 14180)
+++ /extensions/rv_gmaps/trunk/template/map.tpl (revision 14181)
@@ -1,4 +1,4 @@
-
+
@@ -8,10 +8,8 @@
-
-{combine_script id='jquery' load='header' path='http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js'}
+{combine_script id='jquery' load='header' path='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'}
{combine_script id='jquery.nyroModal' load='async' path="`$PLUGIN_LOCATION`/template/nyroModal/jquery.nyroModal-1.6.2.js" version='1.6.2'}
{combine_css path="`$PLUGIN_LOCATION`/template/style.css" version=$RVM_PLUGIN_VERSION}
{combine_css path="`$PLUGIN_LOCATION`/template/nyroModal/nyroModal.css" version=$RVM_PLUGIN_VERSION}
-
{combine_script id='rvm.dl' load='header' path="`$PLUGIN_LOCATION`/template/data_loader.js" version=$RVM_PLUGIN_VERSION}
{combine_script id='rvm.dh' load='header' path="`$PLUGIN_LOCATION`/template/data_handler.js" version=$RVM_PLUGIN_VERSION}
@@ -19,15 +17,6 @@
{combine_script id='rvm.st' load='header' path="`$PLUGIN_LOCATION`/template/styler.js" version=$RVM_PLUGIN_VERSION}
{combine_script id='core.scripts' load='header' path='themes/default/js/scripts.js'}
-
{get_combined_css}
{get_combined_scripts load='header'}
-
-
-
-