Skip to content

Commit

Permalink
Version 7.0.27
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Zagniotov committed Mar 29, 2012
1 parent 0473395 commit ee14bd2
Show file tree
Hide file tree
Showing 26 changed files with 833 additions and 112 deletions.
Binary file added assets/css/images/markers/beachflag_shadow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/css/images/markers/msmarker.shadow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion assets/html/html_global_error_messages_json.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ "badAddresses" : "LABEL_BAD_ADDRESSES",
{ "oldJquery" : "LABEL_OLD_JQUERY",
"badAddresses" : "LABEL_BAD_ADDRESSES",
"kml" : "LABEL_KML",
"kmlDocInvalid" : "LABEL_DOCINVALID_KML",
"kmlFetchError" : "LABEL_FETCHERROR_KML",
Expand Down
4 changes: 2 additions & 2 deletions assets/html/map_configuration_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<table class="cgmp-widget-table" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr>
<td valign="top" class="first-td"><a id="tooltip-marker-width" class="google-map-tooltip-marker" href="javascript:;" title="Width of map placeholder DIV">[Help?]</a>&nbsp;LABEL_WIDTH</td>
<td valign="top" class="first-td"><a id="tooltip-marker-width" class="google-map-tooltip-marker" href="javascript:;" title="Width of map placeholder DIV. Can be in pixel or percentage">[Help?]</a>&nbsp;LABEL_WIDTH</td>
<td valign="top" class="second-td">INPUT_WIDTH</td>
<td valign="top" class="third-td"><a id="tooltip-marker-height" class="google-map-tooltip-marker" href="javascript:void(0);" title="Height of map placeholder DIV">[Help?]</a>&nbsp;LABEL_HEIGHT</td>
<td valign="top" class="third-td"><a id="tooltip-marker-height" class="google-map-tooltip-marker" href="javascript:void(0);" title="Height of map placeholder DIV in pixels">[Help?]</a>&nbsp;LABEL_HEIGHT</td>
<td valign="top" class="fourth-td">INPUT_HEIGHT</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion assets/html/map_marker_directions_hint.tpl
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div style='padding: 3px 0 3px 0; width: MARKER_DIRECTIONS_HINT_WIDTH_TOKENpx; background-color: #efefef; border: 1px #cecece solid; font-size:12px;'><strong>LABEL_DIRECTIONS_HINT</strong></div>
<div class="cgmp-directions-hint" style='display: none; padding: 3px 0 3px 0; width: MARKER_DIRECTIONS_HINT_WIDTH_TOKEN; background-color: #efefef; border: 1px #cecece solid; font-size:12px;'><strong>LABEL_DIRECTIONS_HINT</strong></div>
6 changes: 3 additions & 3 deletions assets/html/map_placeholder_and_directions.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="MAP_ALIGN_TOKEN">MARKER_DIRECTIONS_HINT_TOKEN<div class="google-map-placeholder" id="MAP_PLACEHOLDER_ID_TOKEN" style="width: MAP_PLACEHOLDER_WIDTH_TOKENpx; height: MAP_PLACEHOLDER_HEIGHT_TOKENpx;"><div align="center" style="background:url('IMAGES_DIRECTORY_URI/loading.gif') no-repeat 0 0 transparent !important; height:100px; width:100px; position: relative; top: LOADING_INDICATOR_TOP_POS_TOKENpx !important;"></div></div>
<div align="MAP_ALIGN_TOKEN">MARKER_DIRECTIONS_HINT_TOKEN<div class="google-map-placeholder" id="MAP_PLACEHOLDER_ID_TOKEN" style="width: MAP_PLACEHOLDER_WIDTH_TOKEN; height: MAP_PLACEHOLDER_HEIGHT_TOKEN;"><div align="center" style="background:url('IMAGES_DIRECTORY_URI/loading.gif') no-repeat 0 0 transparent !important; height:100px; width:100px; position: relative; top: LOADING_INDICATOR_TOP_POS_TOKENpx !important;"></div></div>
MAP_POWEREDBY_NOTICE_TOKEN
<div class="direction-controls-placeholder" id="direction-controls-placeholder-MAP_PLACEHOLDER_ID_TOKEN" style="background: white; width: MAP_PLACEHOLDER_WIDTH_TOKENpx; margin-top: 5px; border: 1px solid #EBEBEB; display: none; padding: 18px 0 9px 0;">
<div class="direction-controls-placeholder" id="direction-controls-placeholder-MAP_PLACEHOLDER_ID_TOKEN" style="background: white; width: MAP_PLACEHOLDER_WIDTH_TOKEN; margin-top: 5px; border: 1px solid #EBEBEB; display: none; padding: 18px 0 9px 0;">
<div class="d_close-wrapper">
<a id="d_close" href="javascript:void(0)">
<img src="IMAGES_DIRECTORY_URI/transparent.png" class="close">
Expand Down Expand Up @@ -77,5 +77,5 @@
</div>
</div>
</div>
<div id="rendered-directions-placeholder-MAP_PLACEHOLDER_ID_TOKEN" style="display: none; border: 1px solid #ddd; width: DIRECTIONS_WIDTH_TOKENpx; margin-top: 10px; direction: ltr; overflow: auto; height: 180px; padding: 5px;" class="rendered-directions-placeholder"></div>
<div id="rendered-directions-placeholder-MAP_PLACEHOLDER_ID_TOKEN" style="display: none; border: 1px solid #ddd; width: DIRECTIONS_WIDTH_TOKEN; margin-top: 10px; direction: ltr; overflow: auto; height: 180px; padding: 5px;" class="rendered-directions-placeholder"></div>
</div>
13 changes: 10 additions & 3 deletions assets/js/cgmp.framework.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -833,13 +833,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
var defaultPins = ['4-default.png', '5-default.png', '6-default.png', '7-default.png'];

if ($.inArray(markerIcon, defaultMarkers) != -1) {
var url = "http://maps.google.com/mapfiles/ms/icons/msmarker.shadow.png";
var url = CGMPGlobal.customMarkersUri + "msmarker.shadow.png";
shadow = buildMarkerImage(url, 59, 32, 0, 0, 16, 33);
} else if ($.inArray(markerIcon, defaultPins) != -1) {
var url = "http://maps.google.com/mapfiles/ms/icons/msmarker.shadow.png";
var url = CGMPGlobal.customMarkersUri + "msmarker.shadow.png";
shadow = buildMarkerImage(url, 59, 32, 0, 0, 21, 34);
} else if (markerIcon.indexOf('3-default') != -1) {
var url = "http://code.google.com/apis/maps/documentation/javascript/examples/images/beachflag_shadow.png";
var url = CGMPGlobal.customMarkersUri + "beachflag_shadow.png";
shadow = buildMarkerImage(url, 37, 32, 0, 0, 10, 33);
} else {
shadow = buildMarkerImage(CGMPGlobal.customMarkersUri + "shadow.png", 68, 37, 0, 0, 32, 38);
Expand Down Expand Up @@ -1039,6 +1039,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
CGMPGlobal.translations = $("object#global-data-placeholder").find("param#translations").val();
CGMPGlobal.translations = parseJson(CGMPGlobal.translations);

var version = parseFloat($.fn.jquery);
if (version < 1.3) {
alert(CGMPGlobal.errors.oldJquery);
Logger.fatal("Client uses jQuery older than the version 1.3.0. Aborting map generation ..");
return false;
}

if (typeof google == "undefined" || !google) {
Errors.alertError(CGMPGlobal.errors.msgNoGoogle);
Logger.fatal("We do not have reference to Google API. Aborting map generation ..");
Expand Down
Loading

0 comments on commit ee14bd2

Please sign in to comment.