Skip to content

Commit

Permalink
Merge pull request #371 from nobuhiko/issue#216
Browse files Browse the repository at this point in the history 
ref #216 地図機能の削除
  • Loading branch information
@okazy
okazy committed Feb 7, 2020
2 parents 0146ef1 + 8733bfd commit 745c0e0
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 172 deletions.
104 changes: 0 additions & 104 deletions data/Smarty/templates/admin/basis/index.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,85 +23,6 @@
*}-->

<script type="text/javascript">//<![CDATA[
var map;
var marker;
$(function() {
var geocoder = new google.maps.Geocoder();
$("#codeAddress").click(function() {
var result = true;
var address = $("#addr01").val() + $("#addr02").val();
if (geocoder && address) {
geocoder.geocode({'address': address}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) {
latlng = results[0].geometry.location;
$("#latitude").val(latlng.lat());
$("#longitude").val(latlng.lng());
} else {
alert('所在地の場所が見つかりません');
}
});
} else {
alert('所在地の場所が見つかりません');
}
});
$("a#mapAddress").colorbox({
inline: true,
width: 360,
onComplete: function() {
var lat = $("#latitude").val();
var lng = $("#longitude").val();
var latlng;
if (lat && lng) {
latlng = new google.maps.LatLng(lat, lng);
} else {
var address = $("#addr01").val() + $("#addr02").val();
if (geocoder) {
geocoder.geocode({address: address}, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
latlng = results[0].geometry.location;
}
});
}
}
if (!latlng || lat < -85 || 85 < lat) {
// 座標が取得できない,またはマップ外の座標が指定された場合は北緯35度東経135度から取得
latlng = new google.maps.LatLng(35, 135);
}
var mapOptions = {
zoom: 15,
center: latlng,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
if (!map) {
map = new google.maps.Map(document.getElementById("maps"), mapOptions);
} else {
map.panTo(latlng);
}
if (!marker) {
marker = new google.maps.Marker({map: map, position: latlng});
marker.setDraggable(true);
} else {
marker.setPosition(latlng);
}
// TODO Maker のダブルクリックにも対応したい
$("#inputPoint").click(function() {
latlng = marker.getPosition();
$("#latitude").val(latlng.lat());
$("#longitude").val(latlng.lng());
$.colorbox.close();
});
},
});
});
//]]></script>
<form name="form1" id="form1" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
Expand Down Expand Up @@ -290,36 +211,11 @@ $(function() {
</tr>
</table>

<h2>地図設定</h2>
<table>
<tr>
<th>緯度/経度情報</th>
<td>
<span class="attention"><!--{$arrErr.latitude}--></span>
<span class="attention"><!--{$arrErr.longitude}--></span>
緯度: <input type="text" name="latitude" value="<!--{$arrForm.latitude|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.latitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="latitude" />
経度: <input type="text" name="longitude" value="<!--{$arrForm.longitude|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.longitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="longitude" />
<a class="btn-normal" href="javascript:;" name="codeAddress" id="codeAddress" onclick="">所在地より自動取得</a>
<a href="#maparea" id="mapAddress">地図で設定</a>
</td>
</tr>
</table>

<div class="btn-area">
<ul>
<li><a class="btn-action" href="javascript:;" onclick="eccube.submitForm(); return false;"><span class="btn-next">確認ページへ</span></a></li>
</ul>
</div>
</div>
<div style="display: none">
<div id="maparea">
<div id="maps" style="width: 300px;height: 300px;"></div>
<div class="btn-area">
<ul>
<li><a class="btn-normal" href="javascript:;" id="inputPoint">この位置を入力</a></li>
</ul>
</div>
</div>
</div>
<!--{* ▲登録テーブルここまで *}-->
</form>
8 changes: 1 addition & 7 deletions data/Smarty/templates/admin/main_frame.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_file_manager.css" type="text/css" media="all" />
<!--{if $tpl_mainno eq "basis" && $tpl_subno eq "index"}-->
<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
<script type="text/javascript" src="https://maps-api-ssl.google.com/maps/api/js?sensor=false"></script>
<!--{else}-->
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<!--{/if}-->
<!--{/if}-->

<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>

<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>
Expand Down
28 changes: 0 additions & 28 deletions data/Smarty/templates/default/abouts/index.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,6 @@
*/
*}-->

<!--{if $arrSiteInfo.latitude && $arrSiteInfo.longitude}-->
<script type="text/javascript">//<![CDATA[
$(function() {
$("#maps").css({
'margin-top': '15px',
'margin-left': 'auto',
'margin-right': 'auto',
'width': '98%',
'height': '300px'
});
var lat = <!--{$arrSiteInfo.latitude}-->
var lng = <!--{$arrSiteInfo.longitude}-->
if (lat && lng) {
var latlng = new google.maps.LatLng(lat, lng);
var mapOptions = {
zoom: 15,
center: latlng,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
var map = new google.maps.Map($("#maps").get(0), mapOptions);
var marker = new google.maps.Marker({map: map, position: latlng});
} else {
$("#maps").remove();
}
});
//]]></script>
<!--{/if}-->
<div id="undercolumn">

<div id="undercolumn_aboutus">
Expand Down Expand Up @@ -122,6 +95,5 @@

</table>

<div id="maps"></div>
</div>
</div>
8 changes: 0 additions & 8 deletions data/Smarty/templates/default/site_frame.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@

<script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>

<!--{if $tpl_page_class_name === "LC_Page_Abouts"}-->
<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
<script type="text/javascript" src="https://maps-api-ssl.google.com/maps/api/js?sensor=false"></script>
<!--{else}-->
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<!--{/if}-->
<!--{/if}-->

<script type="text/javascript">//<![CDATA[
<!--{$tpl_javascript}-->
$(function(){
Expand Down
25 changes: 0 additions & 25 deletions data/Smarty/templates/sphone/abouts/index.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,31 +74,6 @@
<!--{/if}-->
</dl>

<!--{if strlen($arrSiteInfo.latitude) >= 1 && strlen($arrSiteInfo.longitude) >= 1}-->
<script src="//maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript">//<![CDATA[
$(function() {
$("#maps").css({
'margin-top': '15px',
'margin-left': 'auto',
'margin-right': 'auto',
'width': '98%',
'height': '300px'
});
var lat = "<!--{$arrSiteInfo.latitude|escape:'javascript'}-->";
var lng = "<!--{$arrSiteInfo.longitude|escape:'javascript'}-->";
var latlng = new google.maps.LatLng(lat, lng);
var mapOptions = {
zoom: 15,
center: latlng,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
var map = new google.maps.Map($("#maps").get(0), mapOptions);
var marker = new google.maps.Marker({map: map, position: latlng});
});
//]]></script>
<div id="maps"></div>
<!--{/if}-->
</section>

<!--{include file= 'frontparts/search_area.tpl'}-->
Expand Down

0 comments on commit 745c0e0

Please sign in to comment.