地圖產生器 v3.10

happyman · Jul 2, 2023 · 8c531af · 8c531af
1 parent 3deeab6
commit 8c531af
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 54 deletions.
diff --git a/twmap_gen/VERSION b/twmap_gen/VERSION
@@ -1 +1 @@
-3.03
+3.1
diff --git a/twmap_gen/pages/about.html b/twmap_gen/pages/about.html
@@ -31,6 +31,7 @@
 <a href='https://www.facebook.com/twmapgen/' target="_blank" class="ui-state-default ui-corner-all hp">建議或討論</a>
 <p><b>更新紀錄</b>
 <pre> 
+2023/07/02 地圖產生器 v3.10 老花救星加上4x6,3x4,2x3格式輸出。修正list的排序等。
 2023/06/13 地圖瀏覽器 v4.35 移除評價功能,修正下載範圍內圖資
 2023/06/07 地圖產生器 v3.03 出圖狀態改用beanstalkd架構順更新jquery前端lib
 2023/05/30 地圖產生器 v3.02 移除經建一版出圖

diff --git a/twmap_gen/pages/list.html b/twmap_gen/pages/list.html
@@ -34,35 +34,6 @@
 var ps = {$ps};
 var info = "{$psinfo}";
 $(document).ready(function(){
-	/*
-	var dt = $("#mapTable").dataTable( {
-	"bFilter": false,
-		"bInfo": false,
-		"bJQueryUI": false,
-			"iDisplayLength": 10,
-			"bProcessing": true,
-			"bServerSide":  true,
-		 	"bStateSave": true, // 記住狀態
-			"sAjaxSource": "list.php",
-			"sPaginationType": "full",
-			"aLengthMenu": [[10,20,30,-1],[10,20,30,"all"]],
-			"sDom": '<"top"pl>rt<"bottom"p>',
-			"bScrollCollapse": true,
-			"bAutoWidth": false,
-			"aoColumns": [
-			{ "sTitle": "序號" , "bSortable": false , "sWidth": "40px"},
-			{ "sTitle": "mid"  },
-			{ "sTitle": "日期", "sWidth": "100px" },
-			{ "sTitle": "標題" ,"sWidth": "220px"},
-			{ "sTitle": "X" },
-			{ "sTitle": "Y" },
-			{ "sTitle": "格", "sWidth": "20px" },
-			//{ "sTitle": "張" , "sWidth": "30px"},
-			{ "sTitle": "版", "sWidth": "10px"},
-			{ "sTitle": "空間" },
-			{ "sTitle": "操作" , "bSortable": false }
-			]});
-		*/
 		var dt = $("#mapTable").DataTable( {
 			ajax: {
 				url: 'list.php?ajax=1'
@@ -75,10 +46,7 @@
 			"columnDefs": [
     		{ "searchable": false, "targets": [0,1,6,7,8,9] },
 			{ "orderable": false, "targets": 9 }
-  ]
-
-
-
+ 			 ]
 		});
 	$(window).resize(function() {
 	//	  console.log("resized");
@@ -89,10 +57,11 @@
 	});
 	var progressbar = $( "#progressbar" );
 	progressbar.progressbar({ value: ps });
+	// 須配合上面 dataTables dom option
 	progressbar.appendTo(".top");
 	// label
 	progressbar.children().css("background","lightgreen");
-	// progress bar
+	// progress bar, -20px 是把綠色色塊搬到正確位置。
 	progressbar.children().eq(1).css('position','relative').css('top','-20px');
 	$( ".progressLabel" ).text(info).css("background","").css("background-color", "transparent").css('z-index',"100");
 	// $.fn.DataTable.ext.pager.numbers_length = 5;

diff --git a/twmap_gen/pages/show_ok.html b/twmap_gen/pages/show_ok.html
@@ -1,27 +1,23 @@
 <table id="bigbox">
-	<tr><td width=400 valign="top" align="left">
+	<tr><td width=400 valign="top" style='text-align: left;'>
 			<ul>
 				<li>標題: <b class="ui-state-default">{$map.title}</b>
 				{if $map.keepon_id && $map.keepon_id != 'NULL' && !is_numeric($map.keepon_id)}
 				<li>紀錄: <a href='http://www.keepon.com.tw/redirectMap-{$map.keepon_id}.html' target=_blank><img src='http://www.keepon.com.tw/img/ic_launcher-web.png' height='60px' border=0></a>
 				{/if}
-				<li>本頁<a href='{$links.page}'>連結</a> (張貼參考請使用下列 URL):
-				<ul><li><span class="copy">{$links.page}</span>
-					<li><img src="icons/facebook_share_icon.gif" class="fbshare" tile="分享到 facebook"> share to facebook<br/>
-			</ul>
-				{if $html_head == 1}
-				<!-- AddThis Button BEGIN -->
-				<li><div class="addthis_toolbox addthis_default_style ">分享
-					<a class="addthis_button_facebook"></a>
-					<a class="addthis_button_plurk"></a>
-					<a class="addthis_button_twitter"></a>
-					<a class="addthis_button_google"></a>
-					<a class="addthis_button_compact"></a>
-					<a class="addthis_counter addthis_bubble_style"></a>
-				</div>
-				<script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4ef97c3d467e0504"></script>
-				<!-- AddThis Button END -->
-				{/if}
+				<li>點選下列連結分享: 
+					<a href="{$links.page}">{$links.page}</a>
+					<!-- AddToAny -->
+					<div class="a2a_kit a2a_kit_size_32 a2a_default_style data-a2a-url='{$links.page}' data-a2a-title='show'">
+						<a class="a2a_button_twitter"></a>
+						<a class="a2a_button_line"></a>
+						<a class="a2a_button_facebook"></a>
+						<a class="a2a_button_telegram"></a>
+						<a class="a2a_button_email"></a>
+						<a class="a2a_button_copy_link"></a>
+					</div>
+					<script async src="https://static.addtoany.com/menu/page.js"></script>
+						<!-- AddToAny END -->
 				<li>本圖左上角座標 X={$map.locX},Y={$map.locY}
 				<li>延伸 東方 {$map.shiftX} 與 南方 {$map.shiftY} 公里
 				<li id="calc"></li>
@@ -81,7 +77,7 @@
 					{/if}
 			</ul><!-- 總 -->
 			</td>
-			<td valign="top" align="right" height="800">
+			<td valign="top" style='text-align:right; height:800px'>
 				 {if isset($links.pdf) }
 				 <iframe src="{$links.pdf}" width="512" style="border: none;" height="800"></iframe>
 				 {else}
@@ -90,6 +86,7 @@
 			</td>
 		</tr>
 	</table>
+
 	<script>
 		$(document).ready(function() {