Changeset 3113

Timestamp:

04/08/12 16:40:04 (11 years ago)

Author:

philippe

Message:

new version

Location:

plugins/myGmaps/trunk

Files:

• _admin.php (modified) (8 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (2 diffs)
• addmap.php (modified) (3 diffs)
• icon-big.png (added)
• icon.png (modified) (previous)
• icons/camping.png (added)
• index.php (modified) (1 diff)
• js/_map.js (modified) (3 diffs)
• js/_map_new.js (added)
• map.php (modified) (1 diff)
• map_new.php (added)
• maps.php (modified) (3 diffs)
• maps_actions.php (modified) (1 diff)

plugins/myGmaps/trunk/_admin.php

@@ -19 +19 @@
      preg_match('/plugin.php\?p=myGmaps(&.*)?$/',$_SERVER['REQUEST_URI']),
      $core->auth->check('usage,contentadmin',$core->blog->id));
+     
+$core->addBehavior('adminDashboardFavs',array('myGmapsBehaviors','dashboardFavs'));
+
+class myGmapsBehaviors
+{
+    public static function dashboardFavs($core,$favs)
+    {
+        $favs['myGmaps'] = new ArrayObject(array(
+            'myGmaps',
+            __('Google Maps'),
+            'plugin.php?p=myGmaps&do=list',
+            'index.php?pf=myGmaps/icon.png',
+            'index.php?pf=myGmaps/icon-big.png',
+            'usage,contentadmin',
+            null,
+            null));
+    }
+}
 
 $p_url    = 'plugin.php?p='.basename(dirname(__FILE__));
@@ -33 +51 @@
      $meta->delPostMeta($post_id,'map');
      $meta->delPostMeta($post_id,'map_options');
-     if ($_GET['post_type'] == 'page') {
+     if (isset($_GET['post_type']) && $_GET['post_type'] == 'page') {
           http::redirect('plugin.php?p=pages&act=page&id='.$post_id);
      } else {
@@ -45 +63 @@
      try {
      $post_id = $_GET['id'];
+     
      $meta =& $GLOBALS['core']->meta;
      $meta->delPostMeta($post_id,'map',(integer) $_GET['remove']);
      
-     if ($_GET['post_type'] == 'page') {
+     if (isset($_GET['post_type']) && $_GET['post_type'] == 'page') {
           http::redirect('plugin.php?p=pages&act=page&id='.$post_id);
      } else {
@@ -66 +85 @@
           '<script type="text/javascript">'."\n".
           '$(document).ready(function() {'."\n".
+               '$(\'#gmap-area h3\').toggleWithLegend($(\'#post-gmap\'), {'."\n".
+                    'cookie: \'dcx_gmap_detail\''."\n".
+               '});'."\n".
                '$(\'a.map-remove\').click(function() {'."\n".
                'msg = \''.__('Are you sure you want to remove this map?').'\';'."\n".
@@ -94 +116 @@
      {
           global $core;
+          if (is_null($post)) {
+               return;
+          }
           $id = $post->post_id;
           $type = $post->post_type;
@@ -101 +126 @@
                if (!$meta_rs) {
                     echo 
-                         '<fieldset><legend>'.__('Google Map').'</legend>'.
+                         '<div class="area" id="gmap-area">'.
+                         '<h3>'.__('Google Map').'</h3>'.
+                         '<div id="post-gmap" >'.
+                         '<fieldset><legend>'.__('No map').'</legend>'.
                          '<p><a href="plugin.php?p=myGmaps&amp;post_id='.$id.'">'.__('Add a map to entry').'</a></p>'.
                          '</fieldset>';
@@ -110 +138 @@
                     $maps_options = explode(",",$meta->getMetaStr($post->post_meta,'map_options'));
                     
-                    echo '<fieldset><legend>'.__('Google Map').'</legend>'.
-                    '<h3>'.__('Map elements').'</h3>';
+                    echo 
+                         '<div class="area" id="gmap-area">'.
+                         '<h3>'.__('Google Map').'</h3>'.
+                         '<div id="post-gmap" >'.
+                         '<fieldset><legend>'.__('This map elements').'</legend>';
                     if ($meta->getMetaStr($post->post_meta,'map') != '') {
                          echo
-                              '<table class="clear"><tr>'.
-                              '<th>'.__('Title').'</th>'.
-                              '<th>'.__('Date').'</th>'.
-                              '<th>'.__('Category').'</th>'.
-                              '<th>'.__('Author').'</th>'.
-                              '<th class="nowrap">'.__('Type').'</th>'.
-                              '<th>&nbsp;</th>'.
-                              '</tr>';
+                         '<table class="clear"><tr>'.
+                         '<th>'.__('Title').'</th>'.
+                         '<th>'.__('Date').'</th>'.
+                         '<th>'.__('Category').'</th>'.
+                         '<th>'.__('Author').'</th>'.
+                         '<th class="nowrap">'.__('Type').'</th>'.
+                         '<th>&nbsp;</th>'.
+                         '</tr>';
                          
                          $params['post_type'] = 'map';
@@ -166 +197 @@
                     
                }
+               echo
+               '</div>'.
+               '</div>';
           }
      }

plugins/myGmaps/trunk/_define.php

@@ -15 +15 @@
      /* Description*/         "Create Google Maps objects to include in maps associated to your posts",
      /* Author */             "Philippe aka amalgame",
-     /* Version */            '0.7.2',
+     /* Version */            '0.7.7',
      /* Permissions */        'usage,contentadmin'
 );

plugins/myGmaps/trunk/_install.php

@@ -26 +26 @@
 $s =& $core->blog->settings->myGmaps;
 
+$s->put('myGmaps_enabled',false,'boolean','Enable myGmaps plugin',false,true);
 $s->put('myGmaps_center','43.0395797336425, 6.126280043989323','string','Default maps center',false,true);
 $s->put('myGmaps_zoom','12','integer','Default maps zoom level',false,true);

plugins/myGmaps/trunk/_public.php

@@ -41 +41 @@
      public static function publicHeadContent($core,$_ctx)
      {         
+               # Settings
+
+               $s =& $core->blog->settings->myGmaps;
+               
+               if (!$s->myGmaps_enabled) {
+                    return;
+               }
+               
                echo
                '<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>'."\n".
@@ -121 +129 @@
                                         '}'."\n".
                                         
+                                        'var myRegExp = "marker";'."\n".
+                                        'var string = "'.$marker[2].'";'."\n".
+                                        'var match = string.search(myRegExp);'."\n".
+                                        'if(match != -1) {'."\n".
+                                             'var myicon = "'.$marker[2].'";'."\n". 
+                                        '} else {'."\n".
+                                             'var myicon = new google.maps.MarkerImage("'.$marker[2].'", null, null, new google.maps.Point(16, 16));'."\n".
+                                        '}'."\n".
                                         'marker = new google.maps.Marker({'."\n".
-                                             'icon : "'.$marker[2].'",'."\n".
+                                             'icon : myicon,'."\n".
                                              'position: new google.maps.LatLng('.$marker[0].','.$marker[1].'),'."\n".
                                              'title: title_'.$maps->post_id.','."\n".

plugins/myGmaps/trunk/addmap.php

@@ -229 +229 @@
      public function display($page,$nb_per_page,$enclose_block='')
      {
+          
           global $core;
           $meta =& $GLOBALS['core']->meta;
@@ -240 +241 @@
           if ($my_post_maps !='') {
                $maps_array = explode(",",$my_post_maps);
+          } else {
+               $maps_array = array();
           }
           
@@ -423 +426 @@
 {
      
-     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Google Maps').' &rsaquo; '.$page_title.'</h2>';
+     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <a href="'.$p_url.'&amp;do=list" >'.__('Google Maps').'</a> &rsaquo; <span class="page-title">'.$page_title.'</span></h2>';
      //
      echo '<div class="multi-part" id="entries-list" title="'.__('Add elements').'">';

plugins/myGmaps/trunk/index.php

@@ -16 +16 @@
      $edit = 'map';
      
-} elseif (isset($_GET['add_map_filters'])) {
+} elseif (isset($_GET['add_map_filters']) && $_REQUEST['do'] != 'list') {
      require_once dirname(__FILE__).'/addmap.php';
      

plugins/myGmaps/trunk/js/_map.js

@@ -111 +111 @@
           var infowindowIcons = '<div id="infowindow_icons" style="cursor:pointer;">' +
           '<h3>' + icon_msg + '</h3>' +
-          '<img src="index.php?pf=myGmaps/icons/marker-blue.png" alt="" width="20" height="34" />&nbsp;' +
+          '<p><img src="index.php?pf=myGmaps/icons/marker-blue.png" alt="" width="20" height="34" />&nbsp;' +
           '<img src="index.php?pf=myGmaps/icons/marker-green.png" alt="" width="20" height="34" />&nbsp;' +
           '<img src="index.php?pf=myGmaps/icons/marker-grey.png" alt="" width="20" height="34" />&nbsp;' +
@@ -118 +118 @@
           '<img src="index.php?pf=myGmaps/icons/marker-white.png" alt="" width="20" height="34" />&nbsp;' +
           '<img src="index.php?pf=myGmaps/icons/marker-yellow.png" alt="" width="20" height="34" />&nbsp;' +
-          '<img src="index.php?pf=myGmaps/icons/marker.png" alt="" width="20" height="34" />' +
+          '<img src="index.php?pf=myGmaps/icons/marker.png" alt="" width="20" height="34" /></p>' +
+          '<p><img src="index.php?pf=myGmaps/icons/camping.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/bars.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/dining.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/port.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/restau.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/sailing.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/star.png" alt="" width="32" height="32" />&nbsp;' +
+          '<img src="index.php?pf=myGmaps/icons/sunny.png" alt="" width="32" height="32" /></p>' +
           '</div>';
 
@@ -272 +280 @@
 
           //Add markers
-
+          
           function addMarker(location) {
                var post_maps = $('#post_maps').val();

plugins/myGmaps/trunk/map.php

@@ -369 +369 @@
 }
 
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Google Maps').' &rsaquo; '.$page_title;
-
-echo '</h2>';
+echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <a href="'.$p_url.'&amp;do=list" >'.__('Google Maps').'</a> &rsaquo; <span class="page-title">'.$page_title.'</span></h2>';
+
+echo '</span></h2>';
 
 if ($post_id)

plugins/myGmaps/trunk/maps.php

@@ -299 +299 @@
 if (!empty($_POST['saveconfig'])) {
   try {
-    $s->put('myGmaps_center',$_POST['myGmaps_center']);
+    $s->put('myGmaps_enabled',$_POST['myGmaps_enabled']);
+     $s->put('myGmaps_center',$_POST['myGmaps_center']);
      $s->put('myGmaps_zoom',$_POST['myGmaps_zoom']);   
      $s->put('myGmaps_type',$_POST['myGmaps_type']);
@@ -352 +353 @@
 {
      
-     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Google Maps').'</h2>';
+     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Google Maps').'</span></h2>';
      
      //
      echo '<div class="multi-part" id="entries-list" title="'.__('Map elements').'">';
-     echo '<p><strong><a href="'.$p_url.'&amp;do=edit">'.__('New element').'</a></strong></p>';
+     echo '<p class="top-add"><strong><a class="button add" href="'.$p_url.'&amp;do=edit">'.__('New element').'</a></strong></p>';
      if (!$show_filters) {
           echo 
@@ -433 +434 @@
      echo '<div class="multi-part" id="settings" title="'.__('Settings').'">'.
      '<form method="post" action="'.$p_url.'" id="settings-form">'.
+     '<fieldset><legend>'.__('Activation').'</legend>'.
+          '<p><label class="classic" for="myGmaps_enabled">'.
+          form::checkbox('myGmaps_enabled','1',$s->myGmaps_enabled).
+          __('Enable extension for this blog').'</label></p>'.
+     '</fieldset>'.
      '<fieldset><legend>'.__('Default map options').'</legend>'.
      '<p>'.__('Choose map center, zoom level and map type.').'</p>'.

plugins/myGmaps/trunk/maps_actions.php

@@ -246 +246 @@
 elseif ($action == 'author' && $core->auth->check('admin',$core->blog->id))
 {
-     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Google Maps').' &rsaquo; '.__('Change author for map elements').'</h2>';
+     echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Google Maps').' &rsaquo; '.__('Change author for map elements').'</span></h2>';
      
      echo