From 913c3c455d193a8c6e0da5805933178fa5e2e79a Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Mon, 22 Aug 2011 13:14:59 +0100
Subject: [PATCH] fixed merge conflicts

---
 static/css/pad.css | 8 --------
 static/js/chat.js  | 7 -------
 static/pad.html    | 7 ++-----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/static/css/pad.css b/static/css/pad.css
index 69747fbb..2d500805 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1138,14 +1138,6 @@ width:33px !important;
   display:none;
 }
 
-#showhistorylabel{
-  position:absolute;
-  left:58px;
-  top:4px;
-  cursor: hand;
-  cursor: pointer;
-}
-
 #online_count{
   color: #999;
 }
diff --git a/static/js/chat.js b/static/js/chat.js
index 57895635..c3eddacb 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -44,13 +44,6 @@ var chat = (function()
         });
       });
     },
-    showHistory: function()
-    {
-      // this is a placeholder for the showHistory function
-      // load the messages from the server
-      // append them to the UI using addMessage
-      self.scrollDown(); // scroll down to the bottom of the chat
-    },
     hide: function () 
     {
       $("#chatcounter").text("0");
diff --git a/static/pad.html b/static/pad.html
index 33e51308..e1c7912d 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -237,17 +237,14 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
 <div id="chaticon">
 <a onClick="chat.show();return false;"
 	title="Open the chat for this pad">
-	  <span id="chatlabel">Chat</span> 
+	  <span id="chatlabel">Chat</span>
           <div class="buttonicon" style="background-position:0px -102px;display:inline-block;"></div>
 </a>
 <span id="chatcounter">0</span>
 </div>
 
 <div id="chatbox">
-  <div id="titlebar"><span id="titlelabel">Chat |</span>
-    <a id="showhistorylabel" onClick="chat.showHistory();return false;">Show History</a>
-    <a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a>
-  </div>
+  <div id="titlebar"><span id ="titlelabel">Chat</span><a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a></div>
   <div id="chattext" class="authorColors"></div>
   <div id="chatinputbox">
     <form>