Mercurial > hg > batmud > maputils

changeset 1702:dd123d0a75d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 22 Sep 2017 15:14:31 +0300
parents 036b1feca422
children aa03f11ebcc7
files www/common.inc.php www/faq.xml www/index.php www/loc.php www/menu.inc.php
diffstat 5 files changed, 27 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/www/common.inc.php	Mon Sep 18 19:44:02 2017 +0300
+++ b/www/common.inc.php	Fri Sep 22 15:14:31 2017 +0300
@@ -36,7 +36,8 @@
 
 function mpPrintPageHeader($title, $extra = "")
 {
-  global $pageTitle;
+  global $pageTitle, $pageMapURL;
+
   cmPrintPageHeader($title,
     "  <meta name=\"keywords\" content=\"batmud,map,laenor,lucentium,rothikgen,desolathya,furnachia,mud,mush,mmorpg,mmo,massively,multiplayer,online,network,game,ggr,pupunen\"/>\n".
     "  <link rel=\"shortcut icon\" href=\"/maps/favicon.ico\" type=\"image/x-icon\" />\n".
@@ -46,11 +47,13 @@
   
   echo "<div id=\"contents\">\n";
 
+/*
   // CETA banner expires on 27.8.2017
   if (time() < mktime(0, 0, 0, 8, 27, 2017))
   {
     echo "<div style=\"text-align: center;\"><a href=\"https://suomiceta.wordpress.com/\"><img src=\"/cropped-suomiceta_nettisivubanneri.png\" alt=\"Suomi-CETA\" /></a></div>\n";
   }
+*/
 }
 
 
--- a/www/faq.xml	Mon Sep 18 19:44:02 2017 +0300
+++ b/www/faq.xml	Fri Sep 22 15:14:31 2017 +0300
@@ -304,7 +304,7 @@
 
 <p>
 Currently this data is available through the Mercurial repository of
-<a href="http://pupunen.net/hg/maputils/file/tip/maps">Ggr's MapUtils</a>
+<a href="http://pupunen.net/hg/maputils/file/tip/world">Ggr's MapUtils</a>.
 You may also be interested in the utilities themselves
 <a href="http://pupunen.net/hg/maputils/">http://pupunen.net/hg/maputils/</a>
 and especially the file "README.loc", which contains some documentation
--- a/www/index.php	Mon Sep 18 19:44:02 2017 +0300
+++ b/www/index.php	Fri Sep 22 15:14:31 2017 +0300
@@ -21,8 +21,15 @@
       printf("%d</b>kB", $q / 1024);
     else
       printf("%1.2f</b>MB", $q / (1024.0*1024.0));
+      
+    $mtime = filemtime($filename);
   }
+  else
+    $mtime = -1;
+
   if ($useTD) echo "</td>\n";
+
+  return $mtime;
 }
 
 
@@ -39,6 +46,8 @@
   $mtime = -1;
   if (file_exists($filename) && ($mtime = filemtime($filename)) > $lastMTime)
     $lastMTime = $mtime;
+  
+  return $mtime;
 }
 
 
@@ -66,8 +75,9 @@
 
   if ($noExtra)
   {
-    mpPrintFileTD($filename.".map", "ASCII");
-    echo "  <td>".mpGetMTimeStr($mtime)."</td>\n";
+    if (($mtime = mpPrintFileTD($filename.".map", "ASCII")) > 0 ||
+        ($mtime = mpCheckMTime($filename.".loc")) > 0)
+      echo "  <td>".mpGetMTimeStr($mtime)."</td>\n";
   }
   else
   {
@@ -96,8 +106,7 @@
 echo
   "<h1>".$pageTitle."</h1>\n".
   "<div class=\"advert\">".
-//  "<a href=\"https://www.hdd.fi/\"><img src=\"/luk/img/hdd_fi.gif\" alt=\"hdd.fi - Edullista etälevytilaa\" /></a>".
-  "<a href=\"http://tnsp.org/u/IqM\"><img src=\"/luk/img/skrolli.png\" alt=\"Skrolli\" /></a>".
+  "<a href=\"http://tnsp.org/u/IqM\"><img src=\"img/skrolli.png\" alt=\"Skrolli\" /></a>".
   "</div>\n".
   mpSpecialDate("index", 1);
  
@@ -137,7 +146,8 @@
 
 echo
   "</table>\n".
-  "<p>(*) = Maps without JavaScript and with 'embedded' labels. Data last updated: <b>".mpGetMTimeStr($lastMTime)."</b>.</p>\n".
+  "<p>(*) = Maps without JavaScript and with 'embedded' labels. Data last updated: <b>".
+  mpGetMTimeStr($lastMTime)."</b>.</p>\n".
   "\n".
   mpSpecialDate("index", 2).
   "<h2>Miscellaneous maps</h2>\n".
--- a/www/loc.php	Mon Sep 18 19:44:02 2017 +0300
+++ b/www/loc.php	Fri Sep 22 15:14:31 2017 +0300
@@ -355,8 +355,12 @@
         }
           
         echo
-          " ".$urlBegin."<img src=\"img/question.png\" onmouseover=\"stt(".$totalLoc.
-          ");\" onmouseout=\"htt();\" alt=\"(?)\" />".$urlEnd;
+          " ".$urlBegin.
+//          "<img src=\"img/question.png\" onmouseover=\"stt(".$totalLoc.
+//          ");\" onmouseout=\"htt();\" alt=\"(?)\" />".
+          "<span onmouseover=\"stt(".$totalLoc.
+          ");\" onmouseout=\"htt();\">&#x1F354;</span>".
+          $urlEnd;
           
         $locationTips[$totalLoc] = [
           "title" => $iv["name"],
--- a/www/menu.inc.php	Mon Sep 18 19:44:02 2017 +0300
+++ b/www/menu.inc.php	Fri Sep 22 15:14:31 2017 +0300
@@ -10,5 +10,5 @@
   <a class="menuItem" href="info.php">List of Wizards</a>
   <a class="menuItem" href="simple.php">Simple location list</a>
   <a class="menuItem" href="faq.php">FAQ</a>
-  <div class="batmud"><a href="http://www.bat.org/play"><img src="/luk/img/batmud.png" alt="BatMUD - 25 Years of Adventure" /></a></div>
+  <div class="batmud"><a href="http://www.bat.org/play"><img src="img/batmud.png" alt="BatMUD - 25 Years of Adventure" /></a></div>
 </div>