Permalink
Browse files

DJPhil Patch. /map is now /worldmap

  • Loading branch information...
1 parent bd03d37 commit 687058b30b44869ce289adaedf5ca09170eecab1 @keverw keverw committed Apr 22, 2013
No changes.
View
File renamed without changes.
@@ -35,11 +35,12 @@
body {
font-family: verdana, helvetica, sans-serif;
- font-size: 11px;
+ font-size: 12px;
background-color: #ffffff;
color: #546368;
}
+/*
a {
color: #4378a4;
text-decoration: underline;
@@ -54,12 +55,11 @@ a:hover {
color: #ff7900;
text-decoration: none;
}
+*/
-a img { border: 0px #FFFFFF none; }
-
-a:active img { border: 0px #FFFFFF none; }
-
-a:hover img { border: 0px #FFFFFF none; }
+a img {border: 0px #FFFFFF none;}
+a:active img {border: 0px #FFFFFF none;}
+a:hover img {border: 0px #FFFFFF none;}
.headline-big {
color: #346080;
@@ -86,7 +86,7 @@ a:hover img { border: 0px #FFFFFF none; }
display: block;
width: 92px;
height: 23px;
- background: url('teleport_btn.gif') no-repeat left top;
+ background: url('../images/teleport_btn.gif') no-repeat left top;
text-indent:-2000em;
float:right;
}
@@ -138,14 +138,14 @@ p.copyright{ float: right; width: 15%; }
}
/* error */
-#map-error{
+#map-error {
position: absolute;
width: 100%;
height: 100%;
z-index: 200;
}
-#error-content{
+#error-content {
margin: 100px auto 0 auto;
position:static;
z-index: 500;
@@ -155,9 +155,9 @@ p.copyright{ float: right; width: 15%; }
padding: 20px;
}
-img.error-close{
+img.error-close {
float: right;
- margin: 0 0 10px 10px;
+ margin: 0px 0px 10px 10px;
cursor: pointer;
}
@@ -166,48 +166,48 @@ img.error-close{
html {
height: 100%;
max-height: 100%;
- padding: 0 0px;
- margin: 0;
- border: 0;
+ padding: 0px 0px;
+ margin: 0px;
+ border: 0px;
background: #fff;
}
body {
height: 100%;
max-height: 100%;
- padding: 0;
- margin: 0;
- border: 0;
+ padding: 0px;
+ margin: 0px;
+ border: 0px;
/* overflow: hidden; */
}
body#slurl-about,
body#slurl-builder{
height: auto;
- border: 0;
+ border: 0px;
overflow: visible;
}
#head {
position: relative;
background-color: #fff;
z-index: 100;
- top: 0;
- left: 0;
- margin: 0;
- padding: 0;
+ top: 0px;
+ left: 0px;
+ margin: 0px;
+ padding: 0px;
height: 75px;
width: 100%;
- border-width: 0 1px;
+ border-width: 0px 1px;
border-style: solid;
border-color: #ccc;
}
/*
#content {
top: 75px;
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding: 0px;
height: 100%;
width: 100%;
border: 1px #4378a4 solid;
@@ -224,10 +224,10 @@ body#slurl-builder{
#foot {
position: absolute;
z-index: 100;
- bottom: 0;
- left: 0;
- margin: 0;
- padding: 0;
+ bottom: 0px;
+ left: 0px;
+ margin: 0px;
+ padding: 0px;
height: 25px;
width: 100%;
background-color: #fff;
@@ -243,46 +243,46 @@ body#slurl-builder{
/* BOXES: */
#sl-logo {
- margin:5px 0 0 5px;
+ margin:5px 0px 0px 5px;
float: left;
width: 300px;
}
#sl-logo h1,
#sl-logo h2 {
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding: 0px;
text-indent: -2000em;
}
#sl-logo h2 {
height:1px;
position: absolute;
- top: 0;
- left: 0;
+ top: 0px;
+ left: 0px;
}
#sl-logo h1 a {
display: block;
- background: #fff url('logo.png') no-repeat scroll top left;
+ background: #fff url('../images/logo.png') no-repeat scroll top left;
width: 286px;
height: 63px;
}
.slurl-info {
float: right;
width: 26.5em; /* not ideal, not based on anything concrete. if you change body units, this will change too... FYI */
- margin:0 5px 0 0;
+ margin:0px 5px 0px 0px;
}
.slurl-info .build-slurls {
- margin: 18px 10px 0 0;
+ margin: 18px 10px 0px 0px;
float: left;
}
.slurl-info .join-button {
float: right;
- margin:6px 5px 0 0;
- padding: 0 0 0 10px;
+ margin:6px 5px 0px 0px;
+ padding: 0px 0px 0px 10px;
border-left: 1px solid #CCC;
}
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
No changes.
No changes.
File renamed without changes
File renamed without changes
View
No changes.
@@ -12,8 +12,8 @@
<link rel="shortcut icon" href="../images/icons/favicon.ico" />
<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key="></script>
<script type="text/javascript" src="../javascripts/jquery/jquery.min.js"></script>
- <script src="../map/slmapapi.php"></script>
- <link rel="stylesheet" type="text/css" href="../map/slmapapi.css" />
+ <script src="../worldmap/slmapapi.php"></script>
+ <link rel="stylesheet" type="text/css" href="../worldmap/css/slmapapi.css" />
<style type="text/css">#map-container {width: 100%; height: 100%;}</style>
<script type="text/javascript">
File renamed without changes.
No changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
No changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
No changes.
View
@@ -1,4 +1,4 @@
-<?
+<?php
include("../settings/config.php");
?>
@@ -137,7 +137,7 @@ function(){
getRegionNameByCoords : function(x, y, onLoadHandler, variable){
variable = variable || 'slRegionName';
SLURL.loadScript(
- '<? echo WEBUI_MAPAPI_SERVICE; ?>/get-region-name-by-coords?var=' + encodeURIComponent(variable) + '&grid_x=' + encodeURIComponent(x) + '&grid_y=' + encodeURIComponent(y),
+ '<?php echo WEBUI_MAPAPI_SERVICE; ?>/get-region-name-by-coords?var=' + encodeURIComponent(variable) + '&grid_x=' + encodeURIComponent(x) + '&grid_y=' + encodeURIComponent(y),
function(){
onLoadHandler(window[variable]);
}
@@ -233,8 +233,8 @@ function mapWindow(regionName, gridX, gridY){
// Add 2 hosts so that we get faster performance on clients with lots
// of bandwidth but possible browser limits on number of open files
//
- "<?=WEBUI_MAP_SERVICE?>",
- "<?=WEBUI_MAP_SERVICE?>"
+ "<?php echo WEBUI_MAP_SERVICE; ?>",
+ "<?php echo WEBUI_MAP_SERVICE; ?>"
][((x / regions_per_tile_edge) % 2)] // Pick a server
+ ["/map", sl_zoom, x, y, "objects.jpg"].join("-") // Get image tiles from Amazon S3
);
No changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.

0 comments on commit 687058b

Please sign in to comment.