From 6d412211314c5bef1c6817a59cbade5eb733b7ab Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sat, 16 Feb 2013 10:46:02 +0100
Subject: [PATCH] finish changes for #179. Fixes #179, fixes #49.

Please look for regressions.
---
 code/boot.js                  |  2 +-
 code/chat.js                  | 23 ++++++++++++-----------
 code/portal_detail_display.js |  2 +-
 main.js                       |  6 +++++-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 9ef90ec7..d71874eb 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -29,7 +29,7 @@ window.setupStyles = function() {
     [ '#largepreview.enl img { border:2px solid '+COLORS[TEAM_ENL]+'; } ',
       '#largepreview.res img { border:2px solid '+COLORS[TEAM_RES]+'; } ',
       '#largepreview.none img { border:2px solid '+COLORS[TEAM_NONE]+'; } ',
-      '#chatcontrols { bottom: '+(CHAT_SHRINKED+24)+'px; }',
+      '#chatcontrols { bottom: '+(CHAT_SHRINKED+22)+'px; }',
       '#chat { height: '+CHAT_SHRINKED+'px; } ',
       '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ',
       '#updatestatus { width:'+(SIDEBAR_WIDTH+2)+'px;  } ',
diff --git a/code/chat.js b/code/chat.js
index d570decc..6be7c1ce 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -320,13 +320,14 @@ window.chat.renderData = function(data, element, likelyWereOldMsgs) {
   });
 
   var scrollBefore = scrollBottom(elm);
-  elm.html(msgs);
+  elm.html('<table>' + msgs + '</table>');
   chat.keepScrollPosition(elm, scrollBefore, likelyWereOldMsgs);
 }
 
 
 window.chat.renderDivider = function(text) {
-  return '<summary>─ '+text+' ──────────────────────────────────────────────────────────────────────────</summary>';
+  var d = '──────────────────────────────────────────────────────────────────────────';
+  return '<tr><td colspan="3" style="padding-top:3px"><summary>─ ' + text + d + '</summary></td></tr>';
 }
 
 
@@ -337,7 +338,7 @@ window.chat.renderMsg = function(msg, nick, time, team) {
   var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
   var s = 'style="color:'+COLORS[team]+'"';
   var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
-  return '<p>'+t+'<span class="invisibleseparator"> &lt;</span><mark '+s+'>'+nick+'</mark><span class="invisibleseparator">&gt; </span><span>'+msg+'</span></p>';
+  return '<tr><td>'+t+'</td><td><mark '+s+'>'+nick+'</mark></td><td>'+msg+'</td></tr>';
 }
 
 
@@ -397,7 +398,7 @@ window.chat.chooser = function(event) {
   var t = $(event.target);
   var tt = t.text();
 
-  var span = $('#chatinput span');
+  var mark = $('#chatinput mark');
 
   $('#chatcontrols .active').removeClass('active');
   t.addClass('active');
@@ -408,19 +409,19 @@ window.chat.chooser = function(event) {
 
   switch(tt) {
     case 'faction':
-      span.css('color', '');
-      span.text('tell faction:');
+      mark.css('color', '');
+      mark.text('tell faction:');
       break;
 
     case 'public':
-      span.css('cssText', 'color: red !important');
-      span.text('broadcast:');
+      mark.css('cssText', 'color: red !important');
+      mark.text('broadcast:');
       break;
 
     case 'compact':
     case 'full':
-      span.css('cssText', 'color: #bbb !important');
-      span.text('tell Jarvis:');
+      mark.css('cssText', 'color: #bbb !important');
+      mark.text('tell Jarvis:');
       break;
 
     default:
@@ -504,7 +505,7 @@ window.chat.setup = function() {
   window.requests.addRefreshFunction(chat.request);
 
   var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res';
-  $('#chatinput span').addClass(cls)
+  $('#chatinput mark').addClass(cls)
 }
 
 
diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index 92e8054e..8f0b1f49 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -12,7 +12,7 @@ window.renderPortalDetails = function(guid) {
 
   var d = window.portals[guid].options.details;
 
-  var update = selectPortal(guid);
+  selectPortal(guid);
 
   // collect some random data that’s not worth to put in an own method
   var links = {incoming: 0, outgoing: 0};
diff --git a/main.js b/main.js
index 43d4b707..04a6c0f7 100644
--- a/main.js
+++ b/main.js
@@ -79,7 +79,11 @@ document.getElementsByTagName('body')[0].innerHTML = ''
   + '  <div id="chatcompact"></div>'
   + '  <div id="chatfull"></div>'
   + '</div>'
-  + '<form id="chatinput" style="display:none"><time></time><span>tell faction:</span><input type="text"/></form>'
+  + '<form id="chatinput" style="display:none"><table><tr>'
+  + '  <td><time></time></td>'
+  + '  <td><mark>tell faction:</mark></td>'
+  + '  <td><input type="text"/></td>'
+  + '</tr></table></form>'
   + '<a id="sidebartoggle"><span class="toggle close"></span></a>'
   + '<div id="scrollwrapper">' // enable scrolling for small screens
   + '  <div id="sidebar" style="display: none">'