Changeset 2898

Timestamp:

01/19/11 14:22:26 (12 years ago)

Author:

Tomtom33

Message:

myLocation 0.1.4:

• added mask configuration for location display, closes #637

Location:

plugins/myLocation/trunk

Files:

• _admin.php (modified) (1 diff)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• inc/class.rs.ext.comment.location.php (modified) (1 diff)
• index.php (modified) (2 diffs)

plugins/myLocation/trunk/_admin.php

@@ -17 +17 @@
      $core->auth->check('admin',$core->blog->id));
 
+$core->addBehavior('adminPostHeaders',array('myLocationBehaviors','adminHeaders'));
+$core->addBehavior('adminPageHeaders',array('myLocationBehaviors','adminHeaders'));
+
+class myLocationBehaviors
+{
+     public static function adminHeaders()
+     {
+          global $core;
+          
+          return
+          dcPage::jsLoad('index.php?pf=myLocation/js/post.js').
+          '<script type="text/javascript">'."\n".
+          '//<![CDATA['."\n".
+          'var post_location_checkbox = "'.__('Add my location').'";'."\n".
+          'var post_location_search = "'.__('Searching...').'";'."\n".
+          '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";
+     }
+}
+
 ?>

plugins/myLocation/trunk/_define.php

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

plugins/myLocation/trunk/_install.php

@@ -25 +25 @@
 $core->blog->settings->myLocation->put('accuracy','city','string','Geolocalisation accuracy',false,true);
 $core->blog->settings->myLocation->put('css','','string','Custom CSS',false,true);
+$core->blog->settings->myLocation->put('mask','<a href="%1$s">%2$s</a>','string','Display mask',false,true);
 
 # --INSTALL AND UPDATE PROCEDURES--

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'],'');
      
-          return sprintf('<a href="%s">%s</a>',$url,$address);
+          return sprintf($rs->core->blog->settings->myLocation->mask,$url,$address);
      }
 }

plugins/myLocation/trunk/index.php

@@ -23 +23 @@
           $core->blog->settings->myLocation->put('css',$_POST['css']);
           $core->blog->settings->myLocation->put('accuracy',$_POST['accuracy']);
-          http::redirect($p_url.'&upd');
+          $core->blog->settings->myLocation->put('mask',$_POST['mask']);
+          http::redirect($p_url.'&upd=1');
      }
      catch (Exception $e) {
@@ -61 +62 @@
 '<form method="post" action="'.$p_url.'">'.
 '<fieldset><legend>'.__('General options').'</legend>'.
-'<p><label class="classic">'.
+'<p><label class="classic" for="enable">'.
      form::checkbox('enable','1',$core->blog->settings->myLocation->enable).
      __('Enable geolocation').'</label></p>'.
-'<p><label class="field">'.
+'<p><label class="field" for="position">'.
      __('Position of location display').'&nbsp;'.
      form::combo('position',$combo_positions,$core->blog->settings->myLocation->position).
 '</label></p>'.
-'<p><label class="field">'.
+'<p><label class="field" for="css">'.
      __('Custom CSS').
      form::field('css',100,255,$core->blog->settings->myLocation->css).
 '</label></p>'.
 '<p class="form-note">'.__('Leave blank to use the default plugin CSS').'</p>'.
-'<p><label class="field">'.
+'<p><label class="field" for="accuracy">'.
      __('Geolocalisation accuracy').'&nbsp;'.
      form::combo('accuracy',$combo_accuracy,$core->blog->settings->myLocation->accuracy).
 '</label></p>'.
+'<p><label class="field" for="mask">'.
+     __('Display mask').'&nbsp;'.
+     form::field('mask',100,255,html::escapeHTML($core->blog->settings->myLocation->mask)).
+'</label></p>'.
+'<p class="form-note">'.__('%1$s = Google Maps URL, %2$s = location text').'</p>'.
 '</fieldset>'.
 '<p>'.$core->formNonce().'<input type="submit" name="save" value="'.__('Save').'" /></p>'.