Changeset 2843

Timestamp:

01/10/11 13:19:18 (13 years ago)

Author:

Tomtom33

Message:

myLocation 0.1.2:

• Improvements of CSS/JS load
• Moved plugin configuration in a specific page

Location:

plugins/myLocation/trunk

Files:

• _admin.php (modified) (1 diff)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (3 diffs)
• icon.png (added)
• inc/class.rs.ext.comment.location.php (modified) (1 diff)
• index.php (added)
• js/post.js (modified) (1 diff)
• locales/fr/main.po (modified) (3 diffs)

plugins/myLocation/trunk/_admin.php

@@ -13 +13 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$core->addBehavior('adminBlogPreferencesForm',array('myLocationBehaviors','adminBlogPreferencesForm'));
-$core->addBehavior('adminBeforeBlogSettingsUpdate',array('myLocationBehaviors','adminBeforeBlogSettingsUpdate'));
-
-class myLocationBehaviors
-{
-     public static function adminBlogPreferencesForm($core,$settings)
-     {
-          echo
-          '<fieldset><legend>'.__('Geolocation').'</legend>'.
-          '<p><label class="classic">'.
-          form::checkbox('mylocation_enable','1',$settings->myLocation->enable).
-          __('Enable geolocation').'</label></p>'.
-          '</fieldset>';
-     }
-
-     public static function adminBeforeBlogSettingsUpdate($settings)
-     {
-          $settings->myLocation->put('enable',!empty($_POST['mylocation_enable']));
-     }
-}
+$_menu['Plugins']->addItem(__('myLocation'),'plugin.php?p=myLocation','index.php?pf=myLocation/icon.png',
+     preg_match('/plugin.php\?p=myLocation(&.*)?$/',$_SERVER['REQUEST_URI']),
+     $core->auth->check('admin',$core->blog->id));
 
 ?>

plugins/myLocation/trunk/_define.php

@@ -15 +15 @@
           /* Description*/         "Display your current location",
           /* Author */             "Tomtom (http://blog.zenstyle.fr)",
-          /* Version */            '0.1.1',
+          /* Version */            '0.1.2',
           /* Permissions */        'usage,contentadmin'
 );

plugins/myLocation/trunk/_install.php

@@ -22 +22 @@
 $core->blog->settings->addNamespace('myLocation');
 $core->blog->settings->myLocation->put('enable',false,'boolean','Enable myLocation',false,true);
+$core->blog->settings->myLocation->put('position','afterContent','string','Position of location display',false,true);
+$core->blog->settings->myLocation->put('accuracy','city','string','Geolocalisation accuracy',false,true);
+$core->blog->settings->myLocation->put('css','','string','Custom CSS',false,true);
 
 # --INSTALL AND UPDATE PROCEDURES--

plugins/myLocation/trunk/_public.php

@@ -13 +13 @@
 if (!defined('DC_RC_PATH')) { return; }
 
-$core->addBehavior('publicHeadContent',array('myLocationBehaviors','publicHeadContent'));
+$core->addBehavior('publicFooterContent',array('myLocationBehaviors','publicFooterContent'));
 $core->addBehavior('templateBeforeBlock',array('myLocationBehaviors','templateBeforeBlock'));
-$core->addBehavior('publicCommentAfterContent',array('myLocationBehaviors','publicCommentAfterContent'));
 $core->addBehavior('coreBeforeCommentCreate',array('myLocationBehaviors','coreBeforeCommentCreate'));
 $core->addBehavior('coreBlogGetComments',array('myLocationBehaviors','coreBlogGetComments'));
 
+if ($core->blog->settings->myLocation->position === 'afterContent') {
+     $core->addBehavior('publicCommentAfterContent',array('myLocationBehaviors','publicCommentAfterContent'));
+}
+else {
+     $core->addBehavior('templateAfterValue',array('myLocationBehaviors','templateAfterValue'));
+}
+
 class myLocationBehaviors
 {
-     public static function publicHeadContent($core,$_ctx)
+     public static function publicFooterContent($core,$_ctx)
      {
           $js = $core->blog->getQMarkURL().'pf='.basename(dirname(__FILE__)).'/js/post.js';
@@ -34 +40 @@
           'var post_location_error_denied = "'.__('Permission denied by your browser').'";'."\n".
           'var post_location_error_unavailable = "'.__('You location is currently unavailable. Please, try later').'";'."\n".
+          'var post_location_error_accuracy = "'.__('You location is currently unavailable for the choosen accuracy').'";'."\n".
           'var post_location_longitude = "'.(isset($_POST['c_location_longitude']) ? $_POST['c_location_longitude'] : '').'";'."\n".
           'var post_location_latitude = "'.(isset($_POST['c_location_latitude']) ? $_POST['c_location_latitude'] : '').'";'."\n".
           'var post_location_address = "'.(isset($_POST['c_location_address']) ? $_POST['c_location_address'] : '').'";'."\n".
+          'var post_location_accuracy = "'.$core->blog->settings->myLocation->accuracy.'";'."\n".
           '//]]>'."\n".
           '</script>'."\n".
@@ -57 +65 @@
      }
      
+     public static function templateAfterValue($core,$tag,$attr)
+     {
+          $fit_tag = $core->blog->settings->myLocation->position;
+          
+          if ($tag === $fit_tag) {
+               return
+               "<?php\n".
+               'if ($_ctx->comments->hasLocation()) {'."\n".
+                    'echo \'&nbsp;<span class="comment-location">\'.$_ctx->comments->getLocation().\'</span>\';'."\n".
+               '}'."\n".
+               "?>";
+          }
+     }
+     
      public static function coreBeforeCommentCreate($blog,$cur)
      {

plugins/myLocation/trunk/inc/class.rs.ext.comment.location.php

@@ -36 +36 @@
           sprintf('http://maps.google.com/maps?q=%s,+%s+%s',$location['latitude'],$location['longitude'],'');
      
-          echo sprintf('<a href="%s">%s</a>',$url,$address);
+          return sprintf('<a href="%s">%s</a>',$url,$address);
      }
 }

plugins/myLocation/trunk/js/post.js

@@ -64 +64 @@
           function succesCallback(position) {
                $('input[type="submit"]').removeAttr('disabled');
-               var address;
+               var address = '';
                var geocoder = new google.maps.Geocoder();
                var latlng = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
                geocoder.geocode({'latLng': latlng}, function(results, status) {
                     if (status == google.maps.GeocoderStatus.OK) {
-                         for (var i = 2; i < results.length; i++) {
-                              if (results[i]) {
-                                   address = results[i].formatted_address;
-                                   break;
+                         for (var i = 0; i < results.length; i++) {
+                              for (var j = 0; j < results[i].types.length; j++) {
+                                   if (results[i].types[j] == post_location_accuracy) {
+                                        address = results[i].formatted_address;
+                                        break;
+                                   }
                               }
                          }
+                         $('#c_location_longitude').val(position.coords.longitude);
+                         $('#c_location_latitude').val(position.coords.latitude);
+                         $('#c_location_address').val(address);
+                         if (address.length > 0) {
+                              updLocationLabel(address,'success');
+                         }
+                         else {
+                              updLocationLabel(post_location_error_accuracy,'unavailable');
+                         }
                     }
-                    $('#c_location_longitude').val(position.coords.longitude);
-                    $('#c_location_latitude').val(position.coords.latitude);
-                    if (address.length > 0) {
+                    else {
+                         $('#c_location_longitude').val(position.coords.longitude);
+                         $('#c_location_latitude').val(position.coords.latitude);
                          $('#c_location_address').val(address);
-                         updLocationLabel(address,'success');
+                         updLocationLabel(post_location_error_unavailable,'unavailable');
                     }
                });

plugins/myLocation/trunk/locales/fr/main.po

@@ -1 +1 @@
 # Language: Français
-# Module: myLocation - 0.1
-# Date: 2010-10-01 17:32:35
+# Module: myLocation - 0.1.2
+# Date: 2011-01-10 12:17:41
 # Translated with translater 1.5
 
@@ -7 +7 @@
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: myLocation 0.1\n"
+"Project-Id-Version: myLocation 0.1.2\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-10-01T17:32:35+00:00\n"
-"Last-Translator: Thomas Bouron\n"
+"PO-Revision-Date: 2011-01-10T12:17:41+00:00\n"
+"Last-Translator: Tomtom\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _admin.php:23
-msgid "Geolocation"
-msgstr "Géo localisation"
+#: _admin.php:15
+#: index.php:50
+#: index.php:60
+msgid "myLocation"
+msgstr "myLocation"
 
-#: _admin.php:26
-msgid "Enable geolocation"
-msgstr "Activer la géo localisation"
-
-#: _public.php:32
+#: _public.php:38
 msgid "Add my location"
 msgstr "Ajouter ma localisation"
 
-#: _public.php:33
+#: _public.php:39
 msgid "Searching..."
 msgstr "Recherche..."
 
-#: _public.php:34
+#: _public.php:40
 msgid "Permission denied by your browser"
 msgstr "Permission refusé par votre navigateur"
 
-#: _public.php:35
+#: _public.php:41
 msgid "You location is currently unavailable. Please, try later"
 msgstr "Votre localisation actuelle est indisponible. Merci de réessayer plus tard"
+
+#: _public.php:42
+msgid "You location is currently unavailable for the choosen accuracy"
+msgstr "Votre localisation actuelle est indisponible pour le niveau de précision demandé"
 
 #: inc/class.rs.ext.comment.location.php:32
@@ -43 +45 @@
 msgstr "Voir sur la carte"
 
+#: index.php:33
+msgid "After content"
+msgstr "Après le contenu"
+
+#: index.php:34
+msgid "After author name"
+msgstr "Après l'auteur"
+
+#: index.php:37
+msgid "Street address"
+msgstr "Adresse"
+
+#: index.php:38
+msgid "Postal code"
+msgstr "Code postal"
+
+#: index.php:39
+msgid "Administrative area"
+msgstr "Zone administrative"
+
+#: index.php:40
+msgid "Neighborhood"
+msgstr "Environ"
+
+#: index.php:41
+msgid "State"
+msgstr "Région"
+
+#: index.php:42
+msgid "Country"
+msgstr "Pays"
+
+#: index.php:56
+msgid "Configuration has been successfully updated"
+msgstr "La configuration a été mise à jour avec succès"
+
+#: index.php:62
+msgid "General options"
+msgstr "Options générales"
+
+#: index.php:65
+msgid "Enable geolocation"
+msgstr "Activer la géo localisation"
+
+#: index.php:67
+msgid "Position of location display"
+msgstr "Position de l'affichage de la localisation"
+
+#: index.php:71
+msgid "Custom CSS"
+msgstr "CSS personnalisée"
+
+#: index.php:74
+msgid "Leave blank to use the default plugin CSS"
+msgstr "Laissez vide pour utiliser la CSS par défaut du plugin"
+
+#: index.php:76
+msgid "Geolocalisation accuracy"
+msgstr "Précision de la géo localisation"
+
+msgid "Geolocation"
+msgstr "Géo localisation"
+