Mercurial > hg > batmud > maputils
changeset 1491:5811aef4872f
Sync.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 01 Jan 2015 20:56:21 +0200 |
parents | 639fd1dc4b7f |
children | 6660ca874cb5 |
files | www/common.inc.php www/config.inc.php www/faq.xml www/index.php www/urchin.inc.php www/wizards.txt |
diffstat | 6 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/www/common.inc.php Thu Jan 01 20:44:43 2015 +0200 +++ b/www/common.inc.php Thu Jan 01 20:56:21 2015 +0200 @@ -1,5 +1,5 @@ <? -require "mcommon.inc.php"; +require "msitegen.inc.php"; $wizFileList = array( "wizards.txt"
--- a/www/config.inc.php Thu Jan 01 20:44:43 2015 +0200 +++ b/www/config.inc.php Thu Jan 01 20:56:21 2015 +0200 @@ -4,9 +4,9 @@ $pageGMapURL = "http://jeskko.pupunen.net/gmap2/"; //$pageGMapURL = "http://tnsp.org/gmap2/"; $batQuestURL = "http://www.bat.org/help/quests?str="; -$pageIndex = "index.php"; //$pageCSS = "maps.css"; $pageCSS = "new.css"; +$pageIndex = "index.php"; //$pageIndex = "maps.php"; $protocolPrefix = (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] == "off" || $_SERVER["HTTPS"] == "") ? "http" : "https";
--- a/www/faq.xml Thu Jan 01 20:44:43 2015 +0200 +++ b/www/faq.xml Thu Jan 01 20:56:21 2015 +0200 @@ -270,6 +270,11 @@ <li><b>09 Sep 2012</b> - Jeskko ascends to immortality as well. </li><br /> + + <li><b>?? March 2014</b> - <a href="http://pupunen.net/hg/gmap2/">GMapsNG project</a> is finally finished by Ggr + (or at least brought to state that it is usable and mostly on feature + parity with the old version), and replaces the old BatMUD GMaps hack. + </li><br /> </ul> More to come...
--- a/www/index.php Thu Jan 01 20:44:43 2015 +0200 +++ b/www/index.php Thu Jan 01 20:56:21 2015 +0200 @@ -72,14 +72,13 @@ <div id="contents"> <h1><? echo $pageTitle; ?></h1> -<div class="advert"> -<a href="https://www.hdd.fi/">hdd.fi - Edullista etälevytilaa</a> +<div style="text-align: center;"> +<a href="https://www.hdd.fi/"><img src="http://tnsp.org/luk/img/hdd_fi.gif" alt="hdd.fi - Edullista etälevytilaa" /></a> </div> - <div id="intro"> Maps and information about <a href="http://www.bat.org/">BatMUD realm</a>, including maps of the continents, some areas and cities. As an alternative for the continent maps, -<? burl("Jeskko") ?> has an interesting <a href="http://jeskko.pupunen.net/map/">Google Maps-style world map</a>. +<? burl("Jeskko") ?> has an interesting <a href="<? echo $pageGMapURL; ?>">Google Maps-style world map</a>. You can also add <a href="#" onclick="window.external.AddSearchProvider('http://www.tnsp.org/maps/opensearch.xml');">PupuMaps Search Engine</a> to your browser. </div>
--- a/www/urchin.inc.php Thu Jan 01 20:44:43 2015 +0200 +++ b/www/urchin.inc.php Thu Jan 01 20:56:21 2015 +0200 @@ -1,13 +1,10 @@ -<script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-1985738-1']); - _gaq.push(['_trackPageview']); +<script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); + ga('create', 'UA-1985738-1', 'tnsp.org'); + ga('send', 'pageview'); </script>
--- a/www/wizards.txt Thu Jan 01 20:44:43 2015 +0200 +++ b/www/wizards.txt Thu Jan 01 20:56:21 2015 +0200 @@ -470,12 +470,16 @@ AI for NPC ships, etc. $ + + ################################## WIP ###################################### ################################## WIP ###################################### ################################## WIP ###################################### - +Amd;;; + Legendary player as mortal, immorted 15 Jul 2014. + $ Zhaman;;zhaman.jpg;