Changeset 2874

Timestamp:

01/13/11 01:17:44 (13 years ago)

Author:

Tomtom33

Message:

Watch out #5

Location:

plugins/myGmaps/branches

Files:

• _prepend.php (modified) (1 diff)
• images/blue-0000FF.png (deleted)
• images/green-00FF00.png (deleted)
• images/grey-666666.png (deleted)
• images/purple-FF00FF.png (deleted)
• images/red-FF0000.png (deleted)
• images/target_icon.png (moved) (moved from plugins/myGmaps/branches/icons/target_icon.png)
• images/yellow-FFFF00.png (deleted)
• inc/lib.my.gmaps.ui.php (modified) (1 diff)
• js/_maps.js (modified) (2 diffs)
• js/myGmaps.js (modified) (1 diff)
• map.php (modified) (1 diff)
• maps.php (modified) (4 diffs)
• style.css (modified) (1 diff)

plugins/myGmaps/branches/_prepend.php

@@ -1 +1 @@
 <?php
 
+$__autoload['myGmapsUtils'] = dirname(__FILE__).'/inc/lib.my.gmaps.ui.php';
 $__autoload['adminMyGmapsList'] = dirname(__FILE__).'/inc/lib.my.gmaps.ui.php';
 

plugins/myGmaps/branches/inc/lib.my.gmaps.ui.php

@@ -1 +1 @@
 <?php
+
+class myGmapsUtils
+{
+     public static function getMapIcons()
+     {
+          $list = files::getDirList(path::real(dirname(__FILE__).'/../icons'));
+          return $list['files'];
+     }
+     
+     public static function getAdminIconURL($filename)
+     {
+          return sprintf('index.php?pf=myGmaps/icons/%s',$filename);
+     }
+     
+     public static function getMapIconsJS()
+     {
+          $root = path::real(dirname(__FILE__).'/../icons');
+          $icons = array();
+          
+          $mask = '#'.$root.'/(.*)#';
+          
+          foreach (self::getMapIcons() as $icon)
+          {
+               $icon = preg_replace('#'.$root.'/(.*)#',"'index.php?pf=myGmaps/icons/$1'",$icon); 
+               array_push($icons,$icon);
+          }
+          
+          return sprintf('myGmaps.icons = [%s];',implode(',',$icons));
+     }
+}
 
 class adminMyGmapsList extends adminGenericList

plugins/myGmaps/branches/js/_maps.js

@@ -27 +27 @@
      
      var icon = new google.maps.MarkerImage(
-          'index.php?pf=myGmaps/icons/target_icon.png',
+          'index.php?pf=myGmaps/images/target_icon.png',
           null,
           null,
@@ -61 +61 @@
           }
      });
+     
+     // Icons tab
+     $('#icons-form li').each(function() {
+          var css = {
+               'background-position': 'middle center',
+               'cursor': 'pointer',
+               'height': '50px'
+          };
+          $(this).css(css);
+          $(this).children('input').css('display','none');
+          $(this).click(function() {
+               if ($(this).children('input').is(':checked')) {
+                    $(this).children('input').removeAttr('checked');
+                    $(this).css('background-color','transparent');
+               }
+               else {
+                    $(this).children('input').attr('checked',true);
+                    $(this).css('background-color','#ccc');
+               }
+          });
+     });
+     $('#icons-form input[name=delete]').click(function() {
+          if ($('#icons-form li input:checked').size() == 0) {
+               alert(myGmaps.msg.no_icon_selected);
+               return false;
+          }
+     });
 });

plugins/myGmaps/branches/js/myGmaps.js

@@ -345 +345 @@
      
      updIcon: function(marker) {
-          var icon = myGmaps.icons[(myGmaps.iconIndex++) % myGmaps.icons.length];
+          var icon = myGmaps.icons[myGmaps.iconIndex++ % myGmaps.icons.length];
           for (i in myGmaps.markers) {
                myGmaps.markers[i].setIcon(icon);

plugins/myGmaps/branches/map.php

@@ -330 +330 @@
      dcPage::jsVar('myGmaps.msg.type',__('Type')).
      dcPage::jsVar('myGmaps.msg.coordinates',__('Coordinates')).
-     $jsVar.
+     myGmapsUtils::getMapIconsJS().
      '</script>'.
 '</head>'.

plugins/myGmaps/branches/maps.php

@@ -21 +21 @@
           $core->blog->settings->myGmaps->put('scrollwheel',$_POST['scrollwheel']);
           http::redirect($p_url.'&go=maps&tab=config&upd=0');
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+# Add icon
+if (!empty($_POST['send'])) {
+     try{
+          files::uploadStatus($_FILES['upfile']);
+          $fm = new filemanager(dirname(__FILE__).'/icons');
+          $fm->uploadFile($_FILES['upfile']['tmp_name'],$_FILES['upfile']['name']);
+          http::redirect($p_url.'&go=maps&tab=icons&add=1');
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+# Delete icons
+if (!empty($_POST['delete'])) {
+     try {
+          foreach ($_POST['ids'] as $filename) {
+               unlink(dirname(__FILE__).'/icons/'.$filename);
+          }
+          http::redirect($p_url.'&go=maps&tab=icons&del=1');
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -221 +243 @@
      dcPage::jsVar('myGmaps.msg.type',__('Type')).
      dcPage::jsVar('myGmaps.msg.coordinates',__('Coordinates')).
+     dcPage::jsVar('myGmaps.msg.no_icon_selected',__('Please, select at leat one icon')).
      '</script>'.
 '</head>'.
@@ -228 +251 @@
 if (isset($_GET['upd']) && $_GET['upd'] === '0') {
      echo '<p class="message">'.__('Configuration has been successfully saved').'</p>';
+}
+if (isset($_GET['add']) && $_GET['add'] === '1') {
+     echo '<p class="message">'.__('Icon has been successfully added').'</p>';
+}
+if (isset($_GET['del']) && $_GET['del'] === '1') {
+     echo '<p class="message">'.__('Selected icons have been successfully deleted').'</p>';
 }
 
@@ -335 +364 @@
      '</form>'.
      '</div>';
+     
+     echo
+     '<div class="multi-part" id="icons" title="'.__('Icons').'">'.
+     '<form method="post" action="'.$p_url.'&amp;tab=icons" id="icons-form" enctype="multipart/form-data">'.
+     '<fieldset><legend>'.__('Add icon').'</legend>'.
+     '<p><label>'.__('Choose a file:').
+     ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.
+     '<input type="file" name="upfile" size="20" />'.
+     '</label></p>'.
+     '<p><input type="submit" name="send" value="'.__('send').'" /></p>'.
+     '</fieldset>'.
+     '<fieldset><legend>'.__('Delete icons').'</legend>'.
+     '<p>'.__('Select icons to delete by clicking on them').'</p>'.
+     '<ul>';
+     foreach (myGmapsUtils::getMapIcons() as $icon) {
+          echo sprintf(
+               '<li style="background-image: url(%1$s); background-repeat: no-repeat; background-position: top center;">%2$s</li>',
+               myGmapsUtils::getAdminIconURL(basename($icon)),
+               form::checkbox(array('ids[]'),basename($icon),false)
+          );
+     }
+     echo
+     '</ul>'.
+     '<p>'.
+     $core->formNonce().
+     '<input type="submit" name="delete" value="'.__('Delete selected icons').'" />'.
+     '</p>'.
+     '</fieldset>'.
+     '</form>'.
+     '</div>';
 }
 

plugins/myGmaps/branches/style.css

@@ -52 +52 @@
      background: transparent url(http://google.com/mapfiles/ms/t/Bpd.png) no-repeat top left;
 }
+/* Icons management */
+#icons-form ul {
+     overflow: hidden;
+     padding: 0;
+     margin: 0;
+}
+#icons-form ul li {
+     float: left;
+     margin: 0.2em;
+     list-style: none;
+     width: 50px;
+     height: 70px;
+}
+#icons-form ul li input{
+     margin-top: 50px;
+     margin-left: 20px;
+}
+#icons-form ul li.jquery {
+     background-position: middle center;
+     cursor: pointer;
+     height: 50px;
+}