diff options
| author | BlueRaja <BlueRaja.admin@gmail.com> | 2012-08-25 04:59:11 -0500 |
|---|---|---|
| committer | BlueRaja <BlueRaja.admin@gmail.com> | 2012-08-25 04:59:11 -0500 |
| commit | 73d12dd8c33eb6ebeee4143707cb59f701936945 (patch) | |
| tree | 0ae171ab31dd66acbb317c40c3261cd1648bf5b2 | |
| parent | e2cfff284c4004d0d11609a22ee535fcf23dcdf9 (diff) | |
| parent | 6dbf179f94bfbd2e33c9d6284447f46fc85a7ce9 (diff) | |
| download | pathery-73d12dd8c33eb6ebeee4143707cb59f701936945.tar.xz | |
Merge branch 'master' of git.raylu.net:pathery
Conflicts:
pages/gallery.php
| -rw-r--r-- | css/maps.css | 14 | ||||
| -rw-r--r-- | images/Path1XRock.png | bin | 0 -> 4144 bytes | |||
| -rw-r--r-- | images/Path2xRock.png | bin | 0 -> 4100 bytes | |||
| -rw-r--r-- | includes/maps.php | 7 | ||||
| -rw-r--r-- | js/scores.js | 2 |
5 files changed, 21 insertions, 2 deletions
diff --git a/css/maps.css b/css/maps.css index 3b2cd85..8e49789 100644 --- a/css/maps.css +++ b/css/maps.css @@ -87,7 +87,8 @@ .grid_td_tp1_in, .grid_td_tp2_in, .grid_td_tp3_in, .grid_td_tp4_in, .grid_td_tp5_in,
.grid_td_tp1_out, .grid_td_tp2_out, .grid_td_tp3_out, .grid_td_tp4_out,.grid_td_tp5_out,
.grid_td_path0-1 , .grid_td_path0-2, .grid_td_path0-3, .grid_td_path0-4,
-.grid_td_path1-1 , .grid_td_path1-2, .grid_td_path1-3, .grid_td_path1-4
+.grid_td_path1-1 , .grid_td_path1-2, .grid_td_path1-3, .grid_td_path1-4,
+.grid_td_rockxpath1, .grid_td_rockxpath2
{
padding: 0px;
margin: 0px;
@@ -170,6 +171,17 @@ color: #fff;
}
+.grid_td_rockxpath1 {
+ background: url(../images/Path1XRock.png);
+ background-color: #666666;
+ color: #fff;
+}
+.grid_td_rockxpath2 {
+ background: url(../images/Path2XRock.png);
+ background-color: #666666;
+ color: #fff;
+}
+
.grid_td_tp1_in, .grid_td_tp2_in, .grid_td_tp3_in, .grid_td_tp4_in, .grid_td_tp5_in,
.grid_td_tp1_out, .grid_td_tp2_out,.grid_td_tp3_out, .grid_td_tp4_out,.grid_td_tp5_out,
diff --git a/images/Path1XRock.png b/images/Path1XRock.png Binary files differnew file mode 100644 index 0000000..24d84f1 --- /dev/null +++ b/images/Path1XRock.png diff --git a/images/Path2xRock.png b/images/Path2xRock.png Binary files differnew file mode 100644 index 0000000..c5a2aa5 --- /dev/null +++ b/images/Path2xRock.png diff --git a/includes/maps.php b/includes/maps.php index 3ddd82f..e322bc4 100644 --- a/includes/maps.php +++ b/includes/maps.php @@ -38,6 +38,13 @@ function DisplayMap($mapMatrix, $idprefix = 1, $style = 'normal', $speed = NULL) case 'S': $maptable .= "<td title='Start tile. Position: $j,$i' class='grid_td_startB' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
+
+ case 'X': $maptable .= "<td title='Pathable By Path 1 or 2 not sure yet. Position: $j,$i' class='grid_td_rockxpath2' id='$handle' >
+ <div id='child_$handle' class='grid_inner'></div></td>"; break;
+
+ case 'x': $maptable .= "<td title='Pathable By Path 1 or 2 not sure yet. Position: $j,$i' class='grid_td_rockxpath1' id='$handle' >
+ <div id='child_$handle' class='grid_inner'></div></td>"; break;
+
case 'f': $maptable .= "<td title='Finish tile. Position: $j,$i' class='grid_td_finish' id='$handle' >
<div id='child_$handle' class='grid_inner'></div></td>"; break;
//TP1
diff --git a/js/scores.js b/js/scores.js index 60ca249..5acc36c 100644 --- a/js/scores.js +++ b/js/scores.js @@ -148,7 +148,7 @@ function scoresFormatPage(JO) { p = p+ " </div>";
p = p+ " </div>";
p = p+ "";
- p = p+ "<span style='float:left; padding: 5px 0px 3px 3px; width:120px; overflow:hidden; text-overflow: ellipsis; '><a href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";
+ p = p+ "<span style='float:left; padding: 5px 0px 3px 3px; width:120px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; '><a href='achievements?id="+u.ID+"' style='color:"+u.displayColor+"'>"+u.display+"</a></span>";
p = p+ "</td>";
p = p+ "<td style='text-align:right;'>"+u.moves+"</td>";
p = p+ "</tr>";
|
