diff options
| author | BlueRaja <BlueRaja.admin@gmail.com> | 2013-03-19 03:26:48 -0500 |
|---|---|---|
| committer | BlueRaja <BlueRaja.admin@gmail.com> | 2013-03-19 03:26:48 -0500 |
| commit | b6680dd405fdf6cd2784facfe799742cfaf805ab (patch) | |
| tree | e9cd81aebfc67c76053792583efb0a1fe942ff6c /js/scores.js | |
| parent | a600bd24aa5272dfd3b9f178ef9e2c81ec0525b9 (diff) | |
| parent | bc57b007dfa5e6e723946143671a9db68a82f348 (diff) | |
| download | pathery-b6680dd405fdf6cd2784facfe799742cfaf805ab.tar.xz | |
Merge branch 'master' of git.raylu.net:pathery
Conflicts:
globe.php
pages/login.php
Diffstat (limited to 'js/scores.js')
| -rw-r--r-- | js/scores.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/js/scores.js b/js/scores.js index 0e81213..3e01ca8 100644 --- a/js/scores.js +++ b/js/scores.js @@ -188,7 +188,7 @@ function scoresFormatPage(JO) { }
p = p+ i+ "</td>";
p = p+ "<td style='vertical-align: middle;'>";
- p = p+ " <div class='grid_td' style='float:left; width:35px; height:35px; background:"+u.wallColor+" url(images/marks/"+u.wallEmblem+");'>";
+ p = p+ " <div class='grid_td' style='float:left; width:35px; height:35px; background:"+u.wallColor+" url("+linkEmblem(u.wallEmblem, u.wallOrientation)+");'>";
p = p+ " <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";
p = p+ " </div>";
p = p+ " </div>";
@@ -443,19 +443,20 @@ function membersFormatPage(JO) { var styleClass = '';
- if (previousI != i + 1)
- if (previousI < i - 1 && previousI != 0)
+ if (previousI != i + 1) {
+ if (previousI < i - 1 && previousI != 0) {
styleClass = 'border-top: 6px solid #777799;';
+ }
+ }
- if (u.wallEmblem == undefined)
- u.wallEmblem = 'blank.png';
+ if (u.wallEmblem == undefined) u.wallEmblem = 'blank.png';
p = p+ "<tr style='"+styleClass+" background-color: "+u.background+"; color:"+u.displayColor+";' title=''>";
p = p+ "<td style='text-align:left;'>";
p = p+ i+ "</td>";
p = p+ "<td style='vertical-align: middle;width:180px;'>";
- p = p+ " <div class='grid_td' style='float:left; width:35px; height:35px; background:"+u.wallColor+" url(images/marks/"+u.wallEmblem+");'>";
+ p = p+ " <div class='grid_td' style='float:left; width:35px; height:35px; background:"+u.wallColor+" url("+linkEmblem(u.wallEmblem, u.wallOrientation)+");'>";
p = p+ " <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";
p = p+ " </div>";
p = p+ " </div>";
|