From 25092daa46f40c351f43689dd359ce88df62aa75 Mon Sep 17 00:00:00 2001
From: Yuxin Wu <ppwwyyxxc@gmail.com>
Date: Tue, 16 Jun 2015 23:45:13 +0800
Subject: [PATCH] Revert "Changed the formatting of the generated HTML"

---
 wechat/render.py            |  2 +-
 wechat/static/TP_INDEX.html |  2 +-
 wechat/static/wx.css        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wechat/render.py b/wechat/render.py
index 777f21b..d408c5d 100644
--- a/wechat/render.py
+++ b/wechat/render.py
@@ -162,7 +162,7 @@ class HTMLRender(object):
             nowtime = slice[0].createTime
             if idx == 0 or \
                slices[idx - 1][0].createTime.date() != nowtime.date():
-                timestr = nowtime.strftime("%Y-%m-%d %H:%M:%S")
+                timestr = nowtime.strftime("%m/%d %H:%M:%S")
             else:
                 timestr = nowtime.strftime("%H:%M:%S")
             blocks.append(self.time_html.format(time=timestr))
diff --git a/wechat/static/TP_INDEX.html b/wechat/static/TP_INDEX.html
index 4f5126e..c429a49 100644
--- a/wechat/static/TP_INDEX.html
+++ b/wechat/static/TP_INDEX.html
@@ -16,7 +16,7 @@
         </div>
       </div>
       <div class="chatScorll" style="position: relative; font-family:initial;">
-        <div id="chat_chatmsglist" class="chatContent">
+        <div id="chat_chatmsglist" class="chatContent" style="position: absolute;">
           {messages}
         </div>
       </div>
diff --git a/wechat/static/wx.css b/wechat/static/wx.css
index 3a82347..7deb270 100644
--- a/wechat/static/wx.css
+++ b/wechat/static/wx.css
@@ -137,7 +137,7 @@ table {
 /* Elements */
 html,
 body {
-  /* height: 100%; */
+  height: 100%;
   background: #4e5359 repeat 0 0;
   color: #666;
   font: 14px/1.5 Helvetica, Arial, Tahoma;
@@ -1233,7 +1233,7 @@ a.btnSecondary:active {
   box-shadow: 0 2px 6px #313131;
   z-index: 20;
   /*ie hack*/
-  /* _height: 400px; */
+  _height: 400px;
 }
 .chatPanel {
   /*background:#fff;*/
@@ -1242,7 +1242,7 @@ a.btnSecondary:active {
   -webkit-border-radius: 2px 2px 6px 6px;
   -moz-border-radius: 2px 2px 6px 6px;
   border: 1px solid #424448;
-  /* _height: 400px; */
+  _height: 400px;
   overflow: hidden;
 }
 /*窗体头部标题*/
@@ -1278,11 +1278,11 @@ a.btnSecondary:active {
 }
 /*会话内容窗体*/
 .chatPanel .chatScorll {
-  /* height: 100%; */
+  height: 100%;
   width: 100%;
   min-height: 200px;
-  /* overflow: hidden; */
-  /* overflow-y: auto; */
+  overflow: hidden;
+  overflow-y: auto;
   /*border-bottom:1px solid #bebebe;*/
   background-color: #EFF3F7;
 }