Merge remote-tracking branch 'flames/master'

web/chat_style.css

@@ -29,7 +29,7 @@
 	color: white;
 	border: 0px;
 	background: rgba(0, 0, 0, 0.6);
-	background: url(chat_cursor.png) rgba(0,0,0,0.6); background-repeat: no-repeat; background-position:left;
+	background: url(images/chat_cursor.png) rgba(0,0,0,0.6); background-repeat: no-repeat; background-position:left;
 	outline: none;
 }
 .messagelist {

web/dynmap_style.css

@@ -182,8 +182,8 @@ body {
 
     text-align: center;
 
-    background: url(sidebar_hint.png) rgb(0,0,0);
-    background: url(sidebar_hint.png) rgba(0,0,0,0.6);
+    background: url(images/sidebar_hint.png) rgb(0,0,0);
+    background: url(images/sidebar_hint.png) rgba(0,0,0,0.6);
     background-repeat: no-repeat;
     background-position:center;
 
@@ -223,19 +223,19 @@ body {
     width: 16px;
     height: 16px;
 
-    background-image: url(window_close.png);
+    background-image: url(images/window_close.png);
 }
 
 .dynmap .sidebar .panel > .pin:hover {
-    background-image: url(window_pinned_hover.png);
+    background-image: url(images/window_pinned_hover.png);
 }
 
 .dynmap .sidebar.pinned .panel > .pin:hover {
-    background-image: url(window_close_hover.png);
+    background-image: url(images/window_close_hover.png);
 }
 
 .dynmap .sidebar.pinned .panel > .pin {
-    background-image: url(window_pinned.png);
+    background-image: url(images/window_pinned.png);
 }
 
 
@@ -260,12 +260,12 @@ body {
 }
 
 .clock.night {
-    /* background-image: url(clock_night.png); */
+    /* background-image: url(images/clock_night.png); */
     color: #dff;
 }
 
 .clock.day {
-    /* background-image: url(clock_day.png); */
+    /* background-image: url(images/clock_day.png); */
     color: #fd3;
 }
 
@@ -299,11 +299,11 @@ body {
 }
 
 .timeofday.sun {
-    background-image: url(sun.png);
+    background-image: url(images/sun.png);
 }
 
 .timeofday.moon {
-    background-image: url(moon.png);
+    background-image: url(images/moon.png);
 }
 
 /*******************
@@ -418,11 +418,11 @@ body {
 }
 
 .dynmap .playerlist .player:hover .playericon {
-    background: url(player_follow_off.png) no-repeat;
+    background: url(images/player_follow_off.png) no-repeat;
 }
 
 .dynmap .playerlist .player.following .playericon {
-    background: url(player_follow_on.gif) no-repeat;
+    background: url(images/player_follow_on.gif) no-repeat;
 }
 
 .dynmap .playerlist .player.following .playericon > *,
@@ -465,7 +465,7 @@ body {
     width: 83px;
 
     background-repeat: no-repeat;
-    background-image: url(compass.png);
+    background-image: url(images/compass.png);
 }
 
 /*******************
@@ -499,7 +499,7 @@ body {
 
 	border: 0px;
 	background: rgba(0, 0, 0, 0.6);
-	background: url(chat_cursor.png) rgba(0,0,0,0.6);
+	background: url(images/chat_cursor.png) rgba(0,0,0,0.6);
 	background-repeat: no-repeat;
 	background-position: 1px center;
 

web/index.html

@@ -8,7 +8,7 @@
 	<meta name="keywords" content="minecraft, map, dynamic" />
 	<meta name="description" content="Minecraft Dynamic Map" />
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-	<link rel="icon" href="dynmap.ico" type="image/ico" />
+	<link rel="icon" href="images/dynmap.ico" type="image/ico" />
 
 	<link rel="stylesheet" type="text/css" href="dynmap_style.css" media="screen" />
 	<!-- <link rel="stylesheet" type="text/css" href="override.css" media="screen" /> -->

web/map.js

@@ -491,7 +491,7 @@ DynMap.prototype = {
 				.addClass('Marker')
 				.addClass('playerMarker')
 				.append(playerImage = $('<img/>')
-						.attr({ src: 'player.png' }))
+						.attr({ src: 'images/player.png' }))
 				.append($('<span/>')
 					.addClass('playerName')
 					.text(player.name));
@@ -512,7 +512,7 @@ DynMap.prototype = {
 			.addClass('player')
 			.append(playerIconContainer = $('<span/>')
 					.addClass('playerIcon')
-					.append($('<img/>').attr({ src: 'player_face.png' }))
+					.append($('<img/>').attr({ src: 'images/player_face.png' }))
 					.attr({ title: 'Follow ' + player.name })
 					.click(function() {
 						var follow = player !== me.followingPlayer;

web/override_example.css

@@ -22,7 +22,7 @@
     height: 50px;
     width: 50px;
 
-    background-image: url(compass_alt.png);
+    background-image: url(images/compass_alt.png);
 }
 
 /* These next two keep the DynMap sidebar open... */