Changeset 7147 for extensions

Timestamp:

Oct 10, 2010, 4:30:03 PM (14 years ago)

Author:

grum

Message:

change interface for icons&marker style selection

Location:

extensions/GMaps

Files:

• admin/gmaps_category_maps.tpl (modified) (9 diffs)
• gmaps.css (modified) (1 diff)
• gmaps_ajax.php (modified) (2 diffs)
• gmaps_version.inc.php (modified) (1 diff)
• templates/index.php (added)

extensions/GMaps/admin/gmaps_category_maps.tpl

@@ -2 +2 @@
 {known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js"}
 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
+{known_script id="gpc.ui.iconSelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.iconSelector.js"}
 {known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
 
@@ -28 +29 @@
             autoOpen:false,
             width:800,
-            height:465,
+            height:480,
             modal: true,
             dialogClass: 'gcBgTabSheet gcBorder',
@@ -48 +49 @@
         );
 
+      $('#iBDAssocIcon').iconSelector(
+        {
+          images:[
+          {/literal}
+            {foreach from=$datas.icons item=icon name=list}
+              "plugins/GMaps/img/{$icon.file}"
+              {if !$smarty.foreach.list.last},{/if}
+            {/foreach}
+          {literal}
+          ],
+          cellWidth:42,
+          cellHeight:28
+        }
+      );
+
+      $('#iBDAssocMarker').iconSelector(
+        {
+          images:[
+          {/literal}
+            {foreach from=$datas.markers item=marker name=list}
+              "plugins/GMaps/img/{$marker.file}"
+              {if !$smarty.foreach.list.last},{/if}
+            {/foreach}
+          {literal}
+          ],
+          cellWidth:32,
+          cellHeight:40,
+          numCols:13,
+          numRows:4
+        }
+      );
+
       $('#iBDAssocMapId').bind('change', changeMapDisplayType);
       $('[name=fBDAssocKmlFile]').bind('change', changeKmlFileSource);
-      $('#iBDAssocIcon').bind('change', changeIcon);
-      $('#iBDAssocMarker').bind('change', changeMarker);
 
       loadList();
     }
 
-    /**
-     * called when the icon is changed
-     */
-    var changeIcon = function ()
-    {
-      $('#iBDAssocIcon').attr('style', $('#iBDAssocIcon option:selected').attr('style')).blur();
-    }
-
-    /**
-     * called when the marker is changed
-     */
-    var changeMarker = function ()
-    {
-      $('#iBDAssocMarker').attr('style', $('#iBDAssocMarker option:selected').attr('style')).blur();
-    }
 
     /**
@@ -242 +258 @@
         $('#iBDAssocKmlFileId').val($('#iBDAssocKmlFileId option:first').val());
         $('#iBDAssocKmlFileUrl').val('');
-        $('#iBDAssocIcon').val($('#iBDAssocIcon option:first').val());
-        $('#iBDAssocMarker').val($('#iBDAssocMarker option:first').val());
+        $('#iBDAssocIcon, #iBDAssocMarker').iconSelector('value', ':first');
         $('#iBDAssocTitle').val('');
       }
@@ -267 +282 @@
         $('#iBDAssocKmlFileId').val(tmp.kmlFileId);
         $('#iBDAssocKmlFileUrl').val(tmp.kmlFileUrl);
-        $('#iBDAssocIcon').val(tmp.icon);
-        $('#iBDAssocMarker').val(tmp.marker);
+        $('#iBDAssocIcon').iconSelector('value', 'plugins/GMaps/img/'+tmp.icon);
+        $('#iBDAssocMarker').iconSelector('value', 'plugins/GMaps/img/'+tmp.marker);
         $('#iBDAssocTitle').val(tmp.title);
       }
@@ -274 +289 @@
       changeMapDisplayType();
       changeKmlFileSource();
-      changeIcon();
-      changeMarker();
     }
 
@@ -334 +347 @@
         kmlFileId:($('#iBDAssocKmlSelect').attr('checked'))?$('#iBDAssocKmlFileId').val():0,
         kmlFileUrl:($('#iBDAssocKmlSelect').attr('checked'))?'':$('#iBDAssocKmlFileUrl').val(),
-        icon:$('#iBDAssocIcon').val(),
-        marker:$('#iBDAssocMarker').val(),
+        icon:$('#iBDAssocIcon').iconSelector('value'),
+        marker:$('#iBDAssocMarker').iconSelector('value'),
         title:$('#iBDAssocTitle').val(),
       }
@@ -486 +499 @@
             <td>{'gmaps_map_icon'|@translate}</td>
             <td>
-              <select id='iBDAssocIcon'>
-                  {foreach from=$datas.icons item=icon}
-                    <option style='background-image:url(plugins/GMaps/img/{$icon.file});' value='{$icon.file}'>&nbsp;</option>
-                  {/foreach}
-              </select>
+              <div id='iBDAssocIcon' class="{$themeconf.name}"></div>
               <p id='iBDKmlIconWarning' class='helps' style="width:520px;padding-right:20px;">{'gmaps_icon_info'|@translate}</p>
             </td>
@@ -499 +508 @@
             <td>{'gmaps_map_marker'|@translate}</td>
             <td>
-              <select id='iBDAssocMarker'>
-                  {foreach from=$datas.markers item=marker}
-                    <option style='background-image:url(plugins/GMaps/img/{$marker.file});' value='{$marker.file}'>&nbsp;</option>
-                  {/foreach}
-              </select>
+              <div id='iBDAssocMarker' class="{$themeconf.name}"></div>
             </td>
           </tr>

extensions/GMaps/gmaps.css

@@ -73 +73 @@
   filter:alpha(opacity:55);
 }
-#iBDAssocIcon, #iBDAssocIcon option {
-  height:34px;
-  background-repeat:no-repeat;
-  background-position:2px 2px;
-}
-#iBDAssocIcon {
-  width:75px;
-  padding-left:50px;
-}
-#iBDAssocIcon option {
-  width:75px;
-}
 
-#iBDAssocMarker, #iBDAssocMarker option {
-  background-position:2px 2px;
-  background-repeat:no-repeat;
-  height:40px;
-}
-#iBDAssocMarker {
-  width:60px;
-  padding-left:40px;
-}
-#iBDAssocMarker option {
-  width:40px;
-}
 
 // fix IE8 compatibility bugs from GPC 3.2.0 (fixed in next release)

extensions/GMaps/gmaps_ajax.php

@@ -664 +664 @@
                 $properties['kmlFileId']."', '".
                 $properties['kmlFileUrl']."', '".
-                $properties['icon']."', '".
-                $properties['marker']."', '".
+                basename($properties['icon'])."', '".
+                basename($properties['marker'])."', '".
                 mysql_escape_string($properties['title'])."');";
         $result=pwg_query($sql);
@@ -679 +679 @@
                 $properties['kmlFileUrl']."', kmlFileId='".
                 $properties['kmlFileId']."', icon='".
-                $properties['icon']."', marker='".
-                $properties['marker']."', title='".
+                basename($properties['icon'])."', marker='".
+                basename($properties['marker'])."', title='".
                 mysql_escape_string($properties['title'])."'
               WHERE id='$id';";

extensions/GMaps/gmaps_version.inc.php

@@ -17 +17 @@
   define('GMAPS_VERSION',  '0.2.0');
   define('GMAPS_VERSION2', '00.02.00');
-  define('GMAPS_GPC_NEEDED', '3.2.0');
+  define('GMAPS_GPC_NEEDED', '3.3.0');
   define('GMAPS_AMD_NEEDED', '0.5.2'); //advanced metadata plugin is needed
 ?>