Changeset 7309 for extensions

Timestamp:

Oct 20, 2010, 10:50:27 PM (14 years ago)

Author:

grum

Message:

some files forgotten on the previous commit

Location:

extensions/GMaps

Files:

• admin/gmaps_category_maps.tpl (modified) (1 diff)
• admin/gmaps_config.tpl (added)
• admin/gmaps_maps.tpl (modified) (9 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/GMaps/admin/gmaps_category_maps.tpl

@@ -219 +219 @@
     {
       $('#iDialogDelete')
-        .html('<br>{/literal}{"gmaps_pleaseConfirmAssoc"|@translate}{literal}')
+        .html("<br>{/literal}{'gmaps_pleaseConfirmDeletingAssoc'|@translate}{literal}")
         .dialog(
           {

extensions/GMaps/admin/gmaps_maps.tpl

@@ -56 +56 @@
         );
 
-      $('#iBDDisplayTypeIC, #iBDDisplayTypeIP, #iBDDisplayTypeMP').bind('change',
-        function ()
-        {
-          switch($(this).val())
-          {
-            case 'IC':
-              $('#iBDZoomLevelRow').hide();
-              $('[name=fBDSizeMode]').attr('disabled', false);
-              break;
-            case 'IP':
-              $('#iBDZoomLevelRow').show();
-              $('[name=fBDSizeMode]').attr('disabled', false);
-              break;
-            case 'MP':
-              $('#iBDZoomLevelRow').show();
-              $('#iBDSizeModeF').attr('checked', true).change();
-              $('[name=fBDSizeMode]').attr('disabled', true);
-              break;
-          }
-        }
-      );
+      $('[name=fBDDisplayType]').bind('change', changeDisplayType);
 
       $('#iBDSizeModeA, #iBDSizeModeF').bind('change',
@@ -129 +109 @@
 
       loadList();
+    }
+
+    /**
+     *
+     */
+    var changeDisplayType = function ()
+    {
+      switch($('[name=fBDDisplayType]:checked').val())
+      {
+        case 'IC':
+          $('#iBDZoomLevelTxt').hide();
+          $('#iBDZoomLevelMaxTxt').show();
+          $('[name=fBDSizeMode]').attr('disabled', false);
+          break;
+        case 'IP':
+          $('#iBDZoomLevelTxt').show();
+          $('#iBDZoomLevelMaxTxt').hide();
+          $('[name=fBDSizeMode]').attr('disabled', false);
+          break;
+        case 'MP':
+          $('#iBDZoomLevelTxt').show();
+          $('#iBDZoomLevelMaxTxt').hide();
+          $('#iBDSizeModeF').attr('checked', true).change();
+          $('[name=fBDSizeMode]').attr('disabled', true);
+          break;
+      }
     }
 
@@ -502 +508 @@
         tmp={
           sizeMode:'A',
-          displayTYpe:'IC'
+          displayTYpe:'IC',
+          nbAssoc:0,
         }
         $('#iBDName').val('');
@@ -511 +518 @@
         $('#iBDMapWidthSlider').slider('option', 'value', 470);
         $('#iBDMapHeightSlider').slider('option', 'value', 210);
+        $('#iBDMapZoomLevelMaxActivated').attr('checked', false);
         $('#iBDMapZoomLevelSliderValue').val(4);
         $('#iBDMapZoomLevelSlider').slider('option', 'value', 4);
@@ -541 +549 @@
         $('#iBDMapWidthSlider').slider('option', 'value', tmp.width);
         $('#iBDMapHeightSlider').slider('option', 'value', tmp.height);
+        $('#iBDMapZoomLevelMaxActivated').attr('checked', tmp.zoomLevelMaxActivated=='y');
         $('#iBDMapZoomLevelSliderValue').val(tmp.zoomLevel);
         $('#iBDMapZoomLevelSlider').slider('option', 'value', tmp.zoomLevel);
@@ -558 +567 @@
 
       $('#iBDDisplayType'+tmp.displayType+', #iBDSizeMode'+tmp.sizeMode).change();
+      changeDisplayType();
       changeSize($('#iBDMapWidthSliderValue').val(), 'iBDMapWidthSlider');
       changeSize($('#iBDMapHeightSliderValue').val(), 'iBDMapHeightSlider');
       changeZoom($('#iBDMapZoomLevelSliderValue').val(), '');
       changeStreetViewControl($('#iBDMapStreetViewControl').val());
+
+      if(tmp.nbAssoc>0)
+      {
+        $('[name=fBDDisplayType]').attr('disabled', true);
+        $('#iBDDisplayTypeRow').show();
+      }
+      else
+      {
+        $('[name=fBDDisplayType]').attr('disabled', false);
+        $('#iBDDisplayTypeRow').hide();
+      }
+
     }
 
@@ -628 +650 @@
         width:$('#iBDMapWidthSliderValue').val(),
         height:$('#iBDMapHeightSliderValue').val(),
+        zoomLevelMaxActivated:$('#iBDMapZoomLevelMaxActivated').attr('checked')?'y':'n',
         zoomLevel:$('#iBDMapZoomLevelSliderValue').val(),
         mapType:$('#iBDMapMapType').val(),
@@ -742 +765 @@
             <td>{'gmaps_displayType'|@translate}</td>
             <td>
-              <label><input type='radio' id='iBDDisplayTypeIC' name='fBDDisplayType' value='IC'>&nbsp;{'gmaps_displayTypeIC'|@translate}</label><br>
-              <label><input type='radio' id='iBDDisplayTypeIP' name='fBDDisplayType' value='IP'>&nbsp;{'gmaps_displayTypeIP'|@translate}</label><br>
-              <label><input type='radio' id='iBDDisplayTypeMP' name='fBDDisplayType' value='MP'>&nbsp;{'gmaps_displayTypeMP'|@translate}</label>
-            </td>
-          </tr>
+              <div style='display:inline-block;'>
+                <label><input type='radio' id='iBDDisplayTypeIC' name='fBDDisplayType' value='IC'>&nbsp;{'gmaps_displayTypeIC'|@translate}</label><br>
+                <label><input type='radio' id='iBDDisplayTypeIP' name='fBDDisplayType' value='IP'>&nbsp;{'gmaps_displayTypeIP'|@translate}</label><br>
+                <label><input type='radio' id='iBDDisplayTypeMP' name='fBDDisplayType' value='MP'>&nbsp;{'gmaps_displayTypeMP'|@translate}</label>
+              </div>
+              <div id='iBDDisplayTypeRow' class='helps' style='float:right;display:inline-block;margin-top:0px;'>{'gmaps_display_type_cannot_be_changed'|@translate}</div>
+            </td>
+          </tr>
+
 
         </table>
@@ -847 +874 @@
       <div id='iTabZoomLevel' style='display:none;'>
         <table class='formtable'>
-          <tr id='iBDZoomLevelRow'>
-            <td>{'gmaps_zoomLevel'|@translate}</td>
+
+          <tr id='iBDZoomLevelMaxTxt'>
+            <td>{'gmaps_zoomLevel_max'|@translate}</td>
+            <td>
+              <label><input type='checkbox' id='iBDMapZoomLevelMaxActivated'>&nbsp;{'gmaps_apply_zoomLevel_max'|@translate}</label>
+            </td>
+          </tr>
+
+          <tr>
+            <td><span id='iBDZoomLevelTxt'>{'gmaps_zoomLevel'|@translate}</span></td>
             <td>
               <table class="formclass">

extensions/GMaps/language/en_UK/plugin.lang.php

@@ -152 +152 @@
 
 
+// GMaps 1.1.0
+$lang['gmaps_pleaseConfirmDeletingAssoc']="Please confirm deleting the association";
+$lang['gmaps_of_window_size']="of the browser window size"; // x% of the browser window size
+$lang['gmaps_config']="Configuration";
+$lang['gmaps_popup_automatic_size']="Automatic size maps";
+$lang['gmaps_apply']="Apply";
+$lang['gmaps_config_saved']="Settings are saved";
+$lang['gmaps_zoomLevel_max']="Maximum zoom level";
+$lang['gmaps_apply_zoomLevel_max']="Apply a maximum zoom level";
+$lang['gmaps_display_type_cannot_be_changed']="This map is currently associated, the display type can't be modified";
+
+
 ?>

extensions/GMaps/language/fr_FR/plugin.lang.php

@@ -163 +163 @@
 $lang['gmaps_googleMapStreetViewControl']="Afficher le contrôle Street View";
 
+// GMaps 1.1.0
+$lang['gmaps_pleaseConfirmDeletingAssoc']="Merci de confirmer la suppression de l'association";
+$lang['gmaps_of_window_size']="de la taille de la fenêtre";
+$lang['gmaps_config']="Configuration";
+$lang['gmaps_popup_automatic_size']="Cartes à dimensions automatiques";
+$lang['gmaps_apply']="Appliquer";
+$lang['gmaps_config_saved']="La configuration est enregistrée";
+$lang['gmaps_zoomLevel_max']="Niveau de zoom maximum";
+$lang['gmaps_apply_zoomLevel_max']="Appliquer un niveau de zoom maximum";
+$lang['gmaps_display_type_cannot_be_changed']="Cette carte faisant l'objet d'associations, la méthode d'affichage ne peut être modifiée";
+
 ?>